fix: using context.Context in every resource

theobori · Jul 4, 2023 · c07a801 · c07a801
1 parent 028e25c
commit c07a801
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Provider metadata and versionning
 PROVIDER = neuvector
-VERSION = 0.4.3
+VERSION = 0.4.4
 RELEASE_VERSION ?= v$(VERSION)
 
 # Terraform metadata for installation

diff --git a/internal/resources/neuvector/resource_group.go b/internal/resources/neuvector/resource_group.go
@@ -120,10 +120,12 @@ func resourceGroupUpdate(ctx context.Context, d *schema.ResourceData, meta any)
 	return nil
 }
 
-func resourceGroupRead(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourceGroupRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
-	groupData, err := APIClient.GetGroup(d.Id())
+	groupData, err := APIClient.
+		WithContext(ctx).
+		GetGroup(d.Id())
 
 	if err != nil {
 		return diag.FromErr(err)

diff --git a/internal/resources/neuvector/resource_policy.go b/internal/resources/neuvector/resource_policy.go
@@ -346,7 +346,7 @@ func resourcePolicyRead(ctx context.Context, d *schema.ResourceData, meta any) d
 	return nil
 }
 
-func resourcePolicyDelete(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourcePolicyDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
 	params := GetScopeChanges(d.Get("rules_scope").(string))
@@ -358,12 +358,14 @@ func resourcePolicyDelete(_ context.Context, d *schema.ResourceData, meta any) d
 		return diag.FromErr(err)
 	}
 
-	APIClient.PatchPolicy(
-		goneuvector.PatchPolicyBody{
-			Delete: delete,
-		},
-		params.IsFed,
-	)
+	APIClient.
+		WithContext(ctx).
+		PatchPolicy(
+			goneuvector.PatchPolicyBody{
+				Delete: delete,
+			},
+			params.IsFed,
+		)
 
 	return nil
 }

diff --git a/internal/resources/neuvector/resource_service.go b/internal/resources/neuvector/resource_service.go
@@ -68,7 +68,7 @@ func resolveGroupName(d *schema.ResourceData) string {
 	return name
 }
 
-func resourceServiceCreate(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourceServiceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
 	body := helper.FromSchemas[goneuvector.CreateServiceBody](
@@ -85,7 +85,7 @@ func resourceServiceCreate(_ context.Context, d *schema.ResourceData, meta any)
 	return nil
 }
 
-func resourceServiceUpdate(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourceServiceUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	if !d.HasChanges(
 		"policy_mode",
 		"baseline_profile",
@@ -103,7 +103,7 @@ func resourceServiceUpdate(_ context.Context, d *schema.ResourceData, meta any)
 
 	body.Services = []string{d.Id()}
 
-	if err := APIClient.PatchServiceConfig(body); err != nil {
+	if err := APIClient.WithContext(ctx).PatchServiceConfig(body); err != nil {
 		return diag.FromErr(err)
 	}