Skip to content

Commit 0b1b943

Browse files
sriniocisrinioci
authored
Merge pull request #2483 from oracle/release_gh
hotfix 7.26.1 OCI TF provider
2 parents fdaad63 + 019a18c commit 0b1b943

File tree

57 files changed

+698
-742
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+698
-742
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 7.26.1 (November 13, 2025)
2+
- Reverted Support for Passing TF CLI context to Go SDK
3+
14
## 7.26.0 (November 12, 2025)
25

36
### Added

‎internal/globalvar/version.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"log"
88
)
99

10-
const Version = "7.26.0"
11-
const ReleaseDate = "2025-11-12"
10+
const Version = "7.26.1"
11+
const ReleaseDate = "2025-11-13"
1212

1313
func PrintVersion() {
1414
log.Printf("[INFO] terraform-provider-oci %s\n", Version)

‎internal/service/datascience/datascience_data_science_private_endpoint_data_source.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package datascience
66
import (
77
"context"
88

9-
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
109
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1110
oci_datascience "github.com/oracle/oci-go-sdk/v65/datascience"
1211

@@ -20,15 +19,15 @@ func DatasciencePrivateEndpointDataSource() *schema.Resource {
2019
Type: schema.TypeString,
2120
Required: true,
2221
}
23-
return tfresource.GetSingularDataSourceItemSchemaWithContext(DatasciencePrivateEndpointResource(), fieldMap, readSingularDatascienceDataSciencePrivateEndpointWithContext)
22+
return tfresource.GetSingularDataSourceItemSchema(DatasciencePrivateEndpointResource(), fieldMap, readSingularDatascienceDataSciencePrivateEndpoint)
2423
}
2524

26-
func readSingularDatascienceDataSciencePrivateEndpointWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
25+
func readSingularDatascienceDataSciencePrivateEndpoint(d *schema.ResourceData, m interface{}) error {
2726
sync := &DatascienceDataSciencePrivateEndpointDataSourceCrud{}
2827
sync.D = d
2928
sync.Client = m.(*client.OracleClients).DataScienceClient()
3029

31-
return tfresource.HandleDiagError(m, tfresource.ReadResourceWithContext(ctx, sync))
30+
return tfresource.ReadResource(sync)
3231
}
3332

3433
type DatascienceDataSciencePrivateEndpointDataSourceCrud struct {
@@ -41,7 +40,7 @@ func (s *DatascienceDataSciencePrivateEndpointDataSourceCrud) VoidState() {
4140
s.D.SetId("")
4241
}
4342

44-
func (s *DatascienceDataSciencePrivateEndpointDataSourceCrud) GetWithContext(ctx context.Context) error {
43+
func (s *DatascienceDataSciencePrivateEndpointDataSourceCrud) Get() error {
4544
request := oci_datascience.GetDataSciencePrivateEndpointRequest{}
4645

4746
if dataSciencePrivateEndpointId, ok := s.D.GetOkExists("data_science_private_endpoint_id"); ok {
@@ -51,7 +50,7 @@ func (s *DatascienceDataSciencePrivateEndpointDataSourceCrud) GetWithContext(ctx
5150

5251
request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "datascience")
5352

54-
response, err := s.Client.GetDataSciencePrivateEndpoint(ctx, request)
53+
response, err := s.Client.GetDataSciencePrivateEndpoint(context.Background(), request)
5554
if err != nil {
5655
return err
5756
}

‎internal/service/datascience/datascience_data_science_private_endpoint_resource.go‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"strings"
1111
"time"
1212

13-
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1413
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
1514
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
15+
1616
oci_common "github.com/oracle/oci-go-sdk/v65/common"
1717
oci_datascience "github.com/oracle/oci-go-sdk/v65/datascience"
1818

@@ -25,11 +25,11 @@ func DatasciencePrivateEndpointResource() *schema.Resource {
2525
Importer: &schema.ResourceImporter{
2626
State: schema.ImportStatePassthrough,
2727
},
28-
Timeouts: tfresource.DefaultTimeout,
29-
CreateContext: createDatascienceDataSciencePrivateEndpointWithContext,
30-
ReadContext: readDatascienceDataSciencePrivateEndpointWithContext,
31-
UpdateContext: updateDatascienceDataSciencePrivateEndpointWithContext,
32-
DeleteContext: deleteDatascienceDataSciencePrivateEndpointWithContext,
28+
Timeouts: tfresource.DefaultTimeout,
29+
Create: createDatascienceDataSciencePrivateEndpoint,
30+
Read: readDatascienceDataSciencePrivateEndpoint,
31+
Update: updateDatascienceDataSciencePrivateEndpoint,
32+
Delete: deleteDatascienceDataSciencePrivateEndpoint,
3333
Schema: map[string]*schema.Schema{
3434
// Required
3535
"compartment_id": {
@@ -121,37 +121,37 @@ func DatasciencePrivateEndpointResource() *schema.Resource {
121121
}
122122
}
123123

124-
func createDatascienceDataSciencePrivateEndpointWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
124+
func createDatascienceDataSciencePrivateEndpoint(d *schema.ResourceData, m interface{}) error {
125125
sync := &DatascienceDataSciencePrivateEndpointResourceCrud{}
126126
sync.D = d
127127
sync.Client = m.(*client.OracleClients).DataScienceClient()
128128

129-
return tfresource.HandleDiagError(m, tfresource.CreateResourceWithContext(ctx, d, sync))
129+
return tfresource.CreateResource(d, sync)
130130
}
131131

132-
func readDatascienceDataSciencePrivateEndpointWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
132+
func readDatascienceDataSciencePrivateEndpoint(d *schema.ResourceData, m interface{}) error {
133133
sync := &DatascienceDataSciencePrivateEndpointResourceCrud{}
134134
sync.D = d
135135
sync.Client = m.(*client.OracleClients).DataScienceClient()
136136

137-
return tfresource.HandleDiagError(m, tfresource.ReadResourceWithContext(ctx, sync))
137+
return tfresource.ReadResource(sync)
138138
}
139139

140-
func updateDatascienceDataSciencePrivateEndpointWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
140+
func updateDatascienceDataSciencePrivateEndpoint(d *schema.ResourceData, m interface{}) error {
141141
sync := &DatascienceDataSciencePrivateEndpointResourceCrud{}
142142
sync.D = d
143143
sync.Client = m.(*client.OracleClients).DataScienceClient()
144144

145-
return tfresource.HandleDiagError(m, tfresource.UpdateResourceWithContext(ctx, d, sync))
145+
return tfresource.UpdateResource(d, sync)
146146
}
147147

148-
func deleteDatascienceDataSciencePrivateEndpointWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
148+
func deleteDatascienceDataSciencePrivateEndpoint(d *schema.ResourceData, m interface{}) error {
149149
sync := &DatascienceDataSciencePrivateEndpointResourceCrud{}
150150
sync.D = d
151151
sync.Client = m.(*client.OracleClients).DataScienceClient()
152152
sync.DisableNotFoundRetries = true
153153

154-
return tfresource.HandleDiagError(m, tfresource.DeleteResourceWithContext(ctx, d, sync))
154+
return tfresource.DeleteResource(d, sync)
155155
}
156156

157157
type DatascienceDataSciencePrivateEndpointResourceCrud struct {
@@ -190,7 +190,7 @@ func (s *DatascienceDataSciencePrivateEndpointResourceCrud) DeletedTarget() []st
190190
}
191191
}
192192

193-
func (s *DatascienceDataSciencePrivateEndpointResourceCrud) CreateWithContext(ctx context.Context) error {
193+
func (s *DatascienceDataSciencePrivateEndpointResourceCrud) Create() error {
194194
request := oci_datascience.CreateDataSciencePrivateEndpointRequest{}
195195

196196
if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
@@ -250,7 +250,7 @@ func (s *DatascienceDataSciencePrivateEndpointResourceCrud) CreateWithContext(ct
250250

251251
request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "datascience")
252252

253-
response, err := s.Client.CreateDataSciencePrivateEndpoint(ctx, request)
253+
response, err := s.Client.CreateDataSciencePrivateEndpoint(context.Background(), request)
254254
if err != nil {
255255
return err
256256
}
@@ -259,7 +259,7 @@ func (s *DatascienceDataSciencePrivateEndpointResourceCrud) CreateWithContext(ct
259259
return nil
260260
}
261261

262-
func (s *DatascienceDataSciencePrivateEndpointResourceCrud) getDataSciencePrivateEndpointFromWorkRequest(ctx context.Context, workId *string, retryPolicy *oci_common.RetryPolicy,
262+
func (s *DatascienceDataSciencePrivateEndpointResourceCrud) getDataSciencePrivateEndpointFromWorkRequest(workId *string, retryPolicy *oci_common.RetryPolicy,
263263
actionTypeEnum oci_datascience.WorkRequestResourceActionTypeEnum, timeout time.Duration) error {
264264

265265
// Wait until it finishes
@@ -283,7 +283,7 @@ func (s *DatascienceDataSciencePrivateEndpointResourceCrud) getDataSciencePrivat
283283
}
284284
s.D.SetId(*dataSciencePrivateEndpointId)
285285

286-
return s.GetWithContext(ctx)
286+
return s.Get()
287287
}
288288

289289
func dataSciencePrivateEndpointWorkRequestShouldRetryFunc(timeout time.Duration) func(response oci_common.OCIOperationResponse) bool {
@@ -386,15 +386,15 @@ func getErrorFromDatascienceDataSciencePrivateEndpointWorkRequest(client *oci_da
386386
return workRequestErr
387387
}
388388

389-
func (s *DatascienceDataSciencePrivateEndpointResourceCrud) GetWithContext(ctx context.Context) error {
389+
func (s *DatascienceDataSciencePrivateEndpointResourceCrud) Get() error {
390390
request := oci_datascience.GetDataSciencePrivateEndpointRequest{}
391391

392392
tmp := s.D.Id()
393393
request.DataSciencePrivateEndpointId = &tmp
394394

395395
request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "datascience")
396396

397-
response, err := s.Client.GetDataSciencePrivateEndpoint(ctx, request)
397+
response, err := s.Client.GetDataSciencePrivateEndpoint(context.Background(), request)
398398
if err != nil {
399399
return err
400400
}
@@ -403,7 +403,7 @@ func (s *DatascienceDataSciencePrivateEndpointResourceCrud) GetWithContext(ctx c
403403
return nil
404404
}
405405

406-
func (s *DatascienceDataSciencePrivateEndpointResourceCrud) UpdateWithContext(ctx context.Context) error {
406+
func (s *DatascienceDataSciencePrivateEndpointResourceCrud) Update() error {
407407
if compartment, ok := s.D.GetOkExists("compartment_id"); ok && s.D.HasChange("compartment_id") {
408408
oldRaw, newRaw := s.D.GetChange("compartment_id")
409409
if newRaw != "" && oldRaw != "" {
@@ -456,7 +456,7 @@ func (s *DatascienceDataSciencePrivateEndpointResourceCrud) UpdateWithContext(ct
456456

457457
request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "datascience")
458458

459-
response, err := s.Client.UpdateDataSciencePrivateEndpoint(ctx, request)
459+
response, err := s.Client.UpdateDataSciencePrivateEndpoint(context.Background(), request)
460460
if err != nil {
461461
return err
462462
}
@@ -465,15 +465,15 @@ func (s *DatascienceDataSciencePrivateEndpointResourceCrud) UpdateWithContext(ct
465465
return nil
466466
}
467467

468-
func (s *DatascienceDataSciencePrivateEndpointResourceCrud) DeleteWithContext(ctx context.Context) error {
468+
func (s *DatascienceDataSciencePrivateEndpointResourceCrud) Delete() error {
469469
request := oci_datascience.DeleteDataSciencePrivateEndpointRequest{}
470470

471471
tmp := s.D.Id()
472472
request.DataSciencePrivateEndpointId = &tmp
473473

474474
request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "datascience")
475475

476-
_, err := s.Client.DeleteDataSciencePrivateEndpoint(ctx, request)
476+
_, err := s.Client.DeleteDataSciencePrivateEndpoint(context.Background(), request)
477477
return err
478478
}
479479

‎internal/service/datascience/datascience_data_science_private_endpoints_data_source.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package datascience
66
import (
77
"context"
88

9-
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
109
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1110
oci_datascience "github.com/oracle/oci-go-sdk/v65/datascience"
1211

@@ -16,7 +15,7 @@ import (
1615

1716
func DatasciencePrivateEndpointsDataSource() *schema.Resource {
1817
return &schema.Resource{
19-
ReadContext: readDatascienceDataSciencePrivateEndpointsWithContext,
18+
Read: readDatascienceDataSciencePrivateEndpoints,
2019
Schema: map[string]*schema.Schema{
2120
"filter": tfresource.DataSourceFiltersSchema(),
2221
"compartment_id": {
@@ -48,12 +47,12 @@ func DatasciencePrivateEndpointsDataSource() *schema.Resource {
4847
}
4948
}
5049

51-
func readDatascienceDataSciencePrivateEndpointsWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
50+
func readDatascienceDataSciencePrivateEndpoints(d *schema.ResourceData, m interface{}) error {
5251
sync := &DatascienceDataSciencePrivateEndpointsDataSourceCrud{}
5352
sync.D = d
5453
sync.Client = m.(*client.OracleClients).DataScienceClient()
5554

56-
return tfresource.HandleDiagError(m, tfresource.ReadResourceWithContext(ctx, sync))
55+
return tfresource.ReadResource(sync)
5756
}
5857

5958
type DatascienceDataSciencePrivateEndpointsDataSourceCrud struct {
@@ -66,7 +65,7 @@ func (s *DatascienceDataSciencePrivateEndpointsDataSourceCrud) VoidState() {
6665
s.D.SetId("")
6766
}
6867

69-
func (s *DatascienceDataSciencePrivateEndpointsDataSourceCrud) GetWithContext(ctx context.Context) error {
68+
func (s *DatascienceDataSciencePrivateEndpointsDataSourceCrud) Get() error {
7069
request := oci_datascience.ListDataSciencePrivateEndpointsRequest{}
7170

7271
if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
@@ -94,7 +93,7 @@ func (s *DatascienceDataSciencePrivateEndpointsDataSourceCrud) GetWithContext(ct
9493

9594
request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "datascience")
9695

97-
response, err := s.Client.ListDataSciencePrivateEndpoints(ctx, request)
96+
response, err := s.Client.ListDataSciencePrivateEndpoints(context.Background(), request)
9897
if err != nil {
9998
return err
10099
}
@@ -103,7 +102,7 @@ func (s *DatascienceDataSciencePrivateEndpointsDataSourceCrud) GetWithContext(ct
103102
request.Page = s.Res.OpcNextPage
104103

105104
for request.Page != nil {
106-
listResponse, err := s.Client.ListDataSciencePrivateEndpoints(ctx, request)
105+
listResponse, err := s.Client.ListDataSciencePrivateEndpoints(context.Background(), request)
107106
if err != nil {
108107
return err
109108
}

‎internal/service/datascience/datascience_fast_launch_job_configs_data_source.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package datascience
66
import (
77
"context"
88

9-
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
109
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1110
oci_datascience "github.com/oracle/oci-go-sdk/v65/datascience"
1211

@@ -16,7 +15,7 @@ import (
1615

1716
func DatascienceFastLaunchJobConfigsDataSource() *schema.Resource {
1817
return &schema.Resource{
19-
ReadContext: readDatascienceFastLaunchJobConfigsWithContext,
18+
Read: readDatascienceFastLaunchJobConfigs,
2019
Schema: map[string]*schema.Schema{
2120
"filter": tfresource.DataSourceFiltersSchema(),
2221
"compartment_id": {
@@ -64,12 +63,12 @@ func DatascienceFastLaunchJobConfigsDataSource() *schema.Resource {
6463
}
6564
}
6665

67-
func readDatascienceFastLaunchJobConfigsWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
66+
func readDatascienceFastLaunchJobConfigs(d *schema.ResourceData, m interface{}) error {
6867
sync := &DatascienceFastLaunchJobConfigsDataSourceCrud{}
6968
sync.D = d
7069
sync.Client = m.(*client.OracleClients).DataScienceClient()
7170

72-
return tfresource.HandleDiagError(m, tfresource.ReadResourceWithContext(ctx, sync))
71+
return tfresource.ReadResource(sync)
7372
}
7473

7574
type DatascienceFastLaunchJobConfigsDataSourceCrud struct {
@@ -82,7 +81,7 @@ func (s *DatascienceFastLaunchJobConfigsDataSourceCrud) VoidState() {
8281
s.D.SetId("")
8382
}
8483

85-
func (s *DatascienceFastLaunchJobConfigsDataSourceCrud) GetWithContext(ctx context.Context) error {
84+
func (s *DatascienceFastLaunchJobConfigsDataSourceCrud) Get() error {
8685
request := oci_datascience.ListFastLaunchJobConfigsRequest{}
8786

8887
if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
@@ -92,7 +91,7 @@ func (s *DatascienceFastLaunchJobConfigsDataSourceCrud) GetWithContext(ctx conte
9291

9392
request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "datascience")
9493

95-
response, err := s.Client.ListFastLaunchJobConfigs(ctx, request)
94+
response, err := s.Client.ListFastLaunchJobConfigs(context.Background(), request)
9695
if err != nil {
9796
return err
9897
}
@@ -101,7 +100,7 @@ func (s *DatascienceFastLaunchJobConfigsDataSourceCrud) GetWithContext(ctx conte
101100
request.Page = s.Res.OpcNextPage
102101

103102
for request.Page != nil {
104-
listResponse, err := s.Client.ListFastLaunchJobConfigs(ctx, request)
103+
listResponse, err := s.Client.ListFastLaunchJobConfigs(context.Background(), request)
105104
if err != nil {
106105
return err
107106
}

‎internal/service/datascience/datascience_job_data_source.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ package datascience
66
import (
77
"context"
88

9-
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
10-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
11-
oci_datascience "github.com/oracle/oci-go-sdk/v65/datascience"
12-
139
"github.com/oracle/terraform-provider-oci/internal/client"
1410
"github.com/oracle/terraform-provider-oci/internal/tfresource"
11+
12+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
13+
oci_datascience "github.com/oracle/oci-go-sdk/v65/datascience"
1514
)
1615

1716
func DatascienceJobDataSource() *schema.Resource {
@@ -20,15 +19,15 @@ func DatascienceJobDataSource() *schema.Resource {
2019
Type: schema.TypeString,
2120
Required: true,
2221
}
23-
return tfresource.GetSingularDataSourceItemSchemaWithContext(DatascienceJobResource(), fieldMap, readSingularDatascienceJobWithContext)
22+
return tfresource.GetSingularDataSourceItemSchema(DatascienceJobResource(), fieldMap, readSingularDatascienceJob)
2423
}
2524

26-
func readSingularDatascienceJobWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
25+
func readSingularDatascienceJob(d *schema.ResourceData, m interface{}) error {
2726
sync := &DatascienceJobDataSourceCrud{}
2827
sync.D = d
2928
sync.Client = m.(*client.OracleClients).DataScienceClient()
3029

31-
return tfresource.HandleDiagError(m, tfresource.ReadResourceWithContext(ctx, sync))
30+
return tfresource.ReadResource(sync)
3231
}
3332

3433
type DatascienceJobDataSourceCrud struct {
@@ -41,7 +40,7 @@ func (s *DatascienceJobDataSourceCrud) VoidState() {
4140
s.D.SetId("")
4241
}
4342

44-
func (s *DatascienceJobDataSourceCrud) GetWithContext(ctx context.Context) error {
43+
func (s *DatascienceJobDataSourceCrud) Get() error {
4544
request := oci_datascience.GetJobRequest{}
4645

4746
if jobId, ok := s.D.GetOkExists("job_id"); ok {
@@ -51,7 +50,7 @@ func (s *DatascienceJobDataSourceCrud) GetWithContext(ctx context.Context) error
5150

5251
request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "datascience")
5352

54-
response, err := s.Client.GetJob(ctx, request)
53+
response, err := s.Client.GetJob(context.Background(), request)
5554
if err != nil {
5655
return err
5756
}

0 commit comments

Comments
 (0)