Added - Support for sigint context to go sdk for GoldenGate

Author: srinioci

internal/service/golden_gate/golden_gate_connection_assignment_data_source.go

@@ -6,6 +6,7 @@ package golden_gate
 import (
 	"context"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	oci_golden_gate "github.com/oracle/oci-go-sdk/v65/goldengate"
 
@@ -19,15 +20,15 @@ func GoldenGateConnectionAssignmentDataSource() *schema.Resource {
 		Type:     schema.TypeString,
 		Required: true,
 	}
-	return tfresource.GetSingularDataSourceItemSchema(GoldenGateConnectionAssignmentResource(), fieldMap, readSingularGoldenGateConnectionAssignment)
+	return tfresource.GetSingularDataSourceItemSchemaWithContext(GoldenGateConnectionAssignmentResource(), fieldMap, readSingularGoldenGateConnectionAssignmentWithContext)
 }
 
-func readSingularGoldenGateConnectionAssignment(d *schema.ResourceData, m interface{}) error {
+func readSingularGoldenGateConnectionAssignmentWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	sync := &GoldenGateConnectionAssignmentDataSourceCrud{}
 	sync.D = d
 	sync.Client = m.(*client.OracleClients).GoldenGateClient()
 
-	return tfresource.ReadResource(sync)
+	return tfresource.HandleDiagError(m, tfresource.ReadResourceWithContext(ctx, sync))
 }
 
 type GoldenGateConnectionAssignmentDataSourceCrud struct {
@@ -40,7 +41,7 @@ func (s *GoldenGateConnectionAssignmentDataSourceCrud) VoidState() {
 	s.D.SetId("")
 }
 
-func (s *GoldenGateConnectionAssignmentDataSourceCrud) Get() error {
+func (s *GoldenGateConnectionAssignmentDataSourceCrud) GetWithContext(ctx context.Context) error {
 	request := oci_golden_gate.GetConnectionAssignmentRequest{}
 
 	if connectionAssignmentId, ok := s.D.GetOkExists("connection_assignment_id"); ok {
@@ -50,7 +51,7 @@ func (s *GoldenGateConnectionAssignmentDataSourceCrud) Get() error {
 
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "golden_gate")
 
-	response, err := s.Client.GetConnectionAssignment(context.Background(), request)
+	response, err := s.Client.GetConnectionAssignment(ctx, request)
 	if err != nil {
 		return err
 	}

internal/service/golden_gate/golden_gate_connection_assignment_resource.go

@@ -6,6 +6,7 @@ package golden_gate
 import (
 	"context"
 	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"strings"
 	"time"
 
@@ -24,10 +25,10 @@ func GoldenGateConnectionAssignmentResource() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
-		Timeouts: tfresource.DefaultTimeout,
-		Create:   createGoldenGateConnectionAssignment,
-		Read:     readGoldenGateConnectionAssignment,
-		Delete:   deleteGoldenGateConnectionAssignment,
+		Timeouts:      tfresource.DefaultTimeout,
+		CreateContext: createGoldenGateConnectionAssignmentWithContext,
+		ReadContext:   readGoldenGateConnectionAssignmentWithContext,
+		DeleteContext: deleteGoldenGateConnectionAssignmentWithContext,
 		Schema: map[string]*schema.Schema{
 			// Required
 			"connection_id": {
@@ -74,29 +75,29 @@ func GoldenGateConnectionAssignmentResource() *schema.Resource {
 	}
 }
 
-func createGoldenGateConnectionAssignment(d *schema.ResourceData, m interface{}) error {
+func createGoldenGateConnectionAssignmentWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	sync := &GoldenGateConnectionAssignmentResourceCrud{}
 	sync.D = d
 	sync.Client = m.(*client.OracleClients).GoldenGateClient()
 
-	return tfresource.CreateResource(d, sync)
+	return tfresource.HandleDiagError(m, tfresource.CreateResourceWithContext(ctx, d, sync))
 }
 
-func readGoldenGateConnectionAssignment(d *schema.ResourceData, m interface{}) error {
+func readGoldenGateConnectionAssignmentWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	sync := &GoldenGateConnectionAssignmentResourceCrud{}
 	sync.D = d
 	sync.Client = m.(*client.OracleClients).GoldenGateClient()
 
-	return tfresource.ReadResource(sync)
+	return tfresource.HandleDiagError(m, tfresource.ReadResourceWithContext(ctx, sync))
 }
 
-func deleteGoldenGateConnectionAssignment(d *schema.ResourceData, m interface{}) error {
+func deleteGoldenGateConnectionAssignmentWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	sync := &GoldenGateConnectionAssignmentResourceCrud{}
 	sync.D = d
 	sync.Client = m.(*client.OracleClients).GoldenGateClient()
 	sync.DisableNotFoundRetries = true
 
-	return tfresource.DeleteResource(d, sync)
+	return tfresource.HandleDiagError(m, tfresource.DeleteResourceWithContext(ctx, d, sync))
 }
 
 type GoldenGateConnectionAssignmentResourceCrud struct {
@@ -120,7 +121,7 @@ func (s *GoldenGateConnectionAssignmentResourceCrud) DeletedTarget() []string {
 	return []string{}
 }
 
-func (s *GoldenGateConnectionAssignmentResourceCrud) Create() error {
+func (s *GoldenGateConnectionAssignmentResourceCrud) CreateWithContext(ctx context.Context) error {
 	request := oci_golden_gate.CreateConnectionAssignmentRequest{}
 
 	if connectionId, ok := s.D.GetOkExists("connection_id"); ok {
@@ -139,7 +140,7 @@ func (s *GoldenGateConnectionAssignmentResourceCrud) Create() error {
 	}
 
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "golden_gate")
-	response, err := s.Client.CreateConnectionAssignment(context.Background(), request)
+	response, err := s.Client.CreateConnectionAssignment(ctx, request)
 
 	if err != nil {
 		return err
@@ -153,15 +154,15 @@ func (s *GoldenGateConnectionAssignmentResourceCrud) Create() error {
 	}
 	// Wait until it finishes
 
-	_, err = connectionAssignmentWaitForWorkRequest(workId, "goldengateconnectionassignment",
+	_, err = connectionAssignmentWaitForWorkRequest(ctx, workId, "goldengateconnectionassignment",
 		oci_golden_gate.ActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries, s.Client)
 
 	if err != nil {
 		return err
 	}
 	s.D.SetId(*response.ConnectionAssignment.Id)
 
-	return s.Get()
+	return s.GetWithContext(ctx)
 }
 
 func connectionAssignmentWorkRequestShouldRetryFunc(timeout time.Duration) func(response oci_common.OCIOperationResponse) bool {
@@ -187,7 +188,7 @@ func connectionAssignmentWorkRequestShouldRetryFunc(timeout time.Duration) func(
 	}
 }
 
-func connectionAssignmentWaitForWorkRequest(wId *string, entityType string, action oci_golden_gate.ActionTypeEnum,
+func connectionAssignmentWaitForWorkRequest(ctx context.Context, wId *string, entityType string, action oci_golden_gate.ActionTypeEnum,
 	timeout time.Duration, disableFoundRetries bool, client *oci_golden_gate.GoldenGateClient) (*string, error) {
 	retryPolicy := tfresource.GetRetryPolicy(disableFoundRetries, "golden_gate")
 	retryPolicy.ShouldRetryOperation = connectionAssignmentWorkRequestShouldRetryFunc(timeout)
@@ -206,7 +207,7 @@ func connectionAssignmentWaitForWorkRequest(wId *string, entityType string, acti
 		},
 		Refresh: func() (interface{}, string, error) {
 			var err error
-			response, err = client.GetWorkRequest(context.Background(),
+			response, err = client.GetWorkRequest(ctx,
 				oci_golden_gate.GetWorkRequestRequest{
 					WorkRequestId: wId,
 					RequestMetadata: oci_common.RequestMetadata{
@@ -253,15 +254,15 @@ func getErrorFromGoldenGateConnectionAssignmentWorkRequest(client *oci_golden_ga
 	return workRequestErr
 }
 
-func (s *GoldenGateConnectionAssignmentResourceCrud) Get() error {
+func (s *GoldenGateConnectionAssignmentResourceCrud) GetWithContext(ctx context.Context) error {
 	request := oci_golden_gate.GetConnectionAssignmentRequest{}
 
 	tmp := s.D.Id()
 	request.ConnectionAssignmentId = &tmp
 
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "golden_gate")
 
-	response, err := s.Client.GetConnectionAssignment(context.Background(), request)
+	response, err := s.Client.GetConnectionAssignment(ctx, request)
 	if err != nil {
 		return err
 	}
@@ -270,7 +271,7 @@ func (s *GoldenGateConnectionAssignmentResourceCrud) Get() error {
 	return nil
 }
 
-func (s *GoldenGateConnectionAssignmentResourceCrud) Delete() error {
+func (s *GoldenGateConnectionAssignmentResourceCrud) DeleteWithContext(ctx context.Context) error {
 	request := oci_golden_gate.DeleteConnectionAssignmentRequest{}
 
 	tmp := s.D.Id()
@@ -283,14 +284,14 @@ func (s *GoldenGateConnectionAssignmentResourceCrud) Delete() error {
 
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "golden_gate")
 
-	response, err := s.Client.DeleteConnectionAssignment(context.Background(), request)
+	response, err := s.Client.DeleteConnectionAssignment(ctx, request)
 	if err != nil {
 		return err
 	}
 
 	workId := response.OpcWorkRequestId
 	// Wait until it finishes
-	_, delWorkRequestErr := connectionAssignmentWaitForWorkRequest(workId, "goldengateconnectionassignment",
+	_, delWorkRequestErr := connectionAssignmentWaitForWorkRequest(ctx, workId, "goldengateconnectionassignment",
 		oci_golden_gate.ActionTypeDeleted, s.D.Timeout(schema.TimeoutDelete), s.DisableNotFoundRetries, s.Client)
 	return delWorkRequestErr
 }

internal/service/golden_gate/golden_gate_connection_assignments_data_source.go

@@ -6,6 +6,7 @@ package golden_gate
 import (
 	"context"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	oci_golden_gate "github.com/oracle/oci-go-sdk/v65/goldengate"
 
@@ -15,7 +16,7 @@ import (
 
 func GoldenGateConnectionAssignmentsDataSource() *schema.Resource {
 	return &schema.Resource{
-		Read: readGoldenGateConnectionAssignments,
+		ReadContext: readGoldenGateConnectionAssignmentsWithContext,
 		Schema: map[string]*schema.Schema{
 			"filter": tfresource.DataSourceFiltersSchema(),
 			"compartment_id": {
@@ -56,12 +57,12 @@ func GoldenGateConnectionAssignmentsDataSource() *schema.Resource {
 	}
 }
 
-func readGoldenGateConnectionAssignments(d *schema.ResourceData, m interface{}) error {
+func readGoldenGateConnectionAssignmentsWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	sync := &GoldenGateConnectionAssignmentsDataSourceCrud{}
 	sync.D = d
 	sync.Client = m.(*client.OracleClients).GoldenGateClient()
 
-	return tfresource.ReadResource(sync)
+	return tfresource.HandleDiagError(m, tfresource.ReadResourceWithContext(ctx, sync))
 }
 
 type GoldenGateConnectionAssignmentsDataSourceCrud struct {
@@ -74,7 +75,7 @@ func (s *GoldenGateConnectionAssignmentsDataSourceCrud) VoidState() {
 	s.D.SetId("")
 }
 
-func (s *GoldenGateConnectionAssignmentsDataSourceCrud) Get() error {
+func (s *GoldenGateConnectionAssignmentsDataSourceCrud) GetWithContext(ctx context.Context) error {
 	request := oci_golden_gate.ListConnectionAssignmentsRequest{}
 
 	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
@@ -103,7 +104,7 @@ func (s *GoldenGateConnectionAssignmentsDataSourceCrud) Get() error {
 
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "golden_gate")
 
-	response, err := s.Client.ListConnectionAssignments(context.Background(), request)
+	response, err := s.Client.ListConnectionAssignments(ctx, request)
 	if err != nil {
 		return err
 	}
@@ -112,7 +113,7 @@ func (s *GoldenGateConnectionAssignmentsDataSourceCrud) Get() error {
 	request.Page = s.Res.OpcNextPage
 
 	for request.Page != nil {
-		listResponse, err := s.Client.ListConnectionAssignments(context.Background(), request)
+		listResponse, err := s.Client.ListConnectionAssignments(ctx, request)
 		if err != nil {
 			return err
 		}

internal/service/golden_gate/golden_gate_connection_data_source.go

@@ -5,6 +5,7 @@ package golden_gate
 
 import (
 	"context"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -20,15 +21,15 @@ func GoldenGateConnectionDataSource() *schema.Resource {
 		Type:     schema.TypeString,
 		Required: true,
 	}
-	return tfresource.GetSingularDataSourceItemSchema(GoldenGateConnectionResource(), fieldMap, readSingularGoldenGateConnection)
+	return tfresource.GetSingularDataSourceItemSchemaWithContext(GoldenGateConnectionResource(), fieldMap, readSingularGoldenGateConnectionWithContext)
 }
 
-func readSingularGoldenGateConnection(d *schema.ResourceData, m interface{}) error {
+func readSingularGoldenGateConnectionWithContext(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	sync := &GoldenGateConnectionDataSourceCrud{}
 	sync.D = d
 	sync.Client = m.(*client.OracleClients).GoldenGateClient()
 
-	return tfresource.ReadResource(sync)
+	return tfresource.HandleDiagError(m, tfresource.ReadResourceWithContext(ctx, sync))
 }
 
 type GoldenGateConnectionDataSourceCrud struct {
@@ -41,7 +42,7 @@ func (s *GoldenGateConnectionDataSourceCrud) VoidState() {
 	s.D.SetId("")
 }
 
-func (s *GoldenGateConnectionDataSourceCrud) Get() error {
+func (s *GoldenGateConnectionDataSourceCrud) GetWithContext(ctx context.Context) error {
 	request := oci_golden_gate.GetConnectionRequest{}
 
 	if connectionId, ok := s.D.GetOkExists("connection_id"); ok {
@@ -51,7 +52,7 @@ func (s *GoldenGateConnectionDataSourceCrud) Get() error {
 
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "golden_gate")
 
-	response, err := s.Client.GetConnection(context.Background(), request)
+	response, err := s.Client.GetConnection(ctx, request)
 	if err != nil {
 		return err
 	}