update: using Terraform context

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/hashicorp/go-uuid v1.0.3
 	github.com/hashicorp/terraform-plugin-docs v0.14.1
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.26.1
-	github.com/theobori/go-neuvector v0.0.0-20230601221153-733f8f469c11
+	github.com/theobori/go-neuvector v0.0.0-20230613115838-e68300cd24c2
 )
 
 require (

go.sum

@@ -177,8 +177,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/theobori/go-neuvector v0.0.0-20230601221153-733f8f469c11 h1:r3HI4k6vEKmlfdlRQwje3MQbTva7qY/NpjuPw/pRvn8=
-github.com/theobori/go-neuvector v0.0.0-20230601221153-733f8f469c11/go.mod h1:hlyYv/f1EEHuslIbCr52FoY4zWQMjvS6PmLU2zBIXK8=
+github.com/theobori/go-neuvector v0.0.0-20230613115838-e68300cd24c2 h1:kULJByxXKSf1f61t5RxDllXpbFT142fb0ceUDKvcyuE=
+github.com/theobori/go-neuvector v0.0.0-20230613115838-e68300cd24c2/go.mod h1:hlyYv/f1EEHuslIbCr52FoY4zWQMjvS6PmLU2zBIXK8=
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=

internal/resources/neuvector/data_source_eula.go

@@ -25,10 +25,12 @@ func DataSourceEULA() *schema.Resource {
 	}
 }
 
-func dataSourceEULARead(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func dataSourceEULARead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
-	eula, err := APIClient.GetEULA()
+	eula, err := APIClient.
+		WithContext(ctx).
+		GetEULA()
 
 	if err != nil {
 		return diag.FromErr(err)

internal/resources/neuvector/data_source_group_services.go

@@ -32,13 +32,15 @@ func DataSourceGroupServices() *schema.Resource {
 	}
 }
 
-func dataSourceGroupServicesRead(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func dataSourceGroupServicesRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	var services []string
 
 	APIClient := meta.(*goneuvector.Client)
 
 	name := d.Get("name").(string)
-	group, err := APIClient.GetGroup(name)
+	group, err := APIClient.
+		WithContext(ctx).
+		GetGroup(name)
 
 	if err != nil {
 		return diag.FromErr(err)

internal/resources/neuvector/data_source_policy_ids.go

@@ -77,12 +77,14 @@ func DataSourcePolicyIDs() *schema.Resource {
 	}
 }
 
-func dataSourcePolicyIDsRead(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func dataSourcePolicyIDsRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
 	var ids []int
 
-	policies, err := APIClient.GetPolicies()
+	policies, err := APIClient.
+		WithContext(ctx).
+		GetPolicies()
 
 	if err != nil {
 		return diag.FromErr(err)

internal/resources/neuvector/data_source_registry.go

@@ -184,11 +184,13 @@ func DataSourceRegistry() *schema.Resource {
 	}
 }
 
-func dataSourceRegistryRead(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func dataSourceRegistryRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
 	name := d.Get("name").(string)
-	registrySummary, err := APIClient.GetRegistry(name)
+	registrySummary, err := APIClient.
+		WithContext(ctx).
+		GetRegistry(name)
 
 	if err != nil {
 		return diag.FromErr(err)

internal/resources/neuvector/data_source_registry_names.go

@@ -31,12 +31,14 @@ func DataSourceRegistryNames() *schema.Resource {
 	}
 }
 
-func dataSourceRegistryNamesRead(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func dataSourceRegistryNamesRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	var names []string
 
 	APIClient := meta.(*goneuvector.Client)
 
-	registriesSummaries, err := APIClient.GetRegistries()
+	registriesSummaries, err := APIClient.
+		WithContext(ctx).
+		GetRegistries()
 
 	if err != nil {
 		return diag.FromErr(err)

internal/resources/neuvector/resource_admission_rule.go

@@ -116,7 +116,9 @@ func resourceAdmissionRuleCreate(ctx context.Context, d *schema.ResourceData, me
 
 	body.Criteria = criterias
 
-	rule, err := APIClient.CreateAdmissionRule(body)
+	rule, err := APIClient.
+		WithContext(ctx).
+		CreateAdmissionRule(body)
 
 	if err != nil {
 		return diag.FromErr(err)
@@ -144,7 +146,7 @@ func getCriteria(criterias []goneuvector.AdmissionRuleCriterion) []map[string]an
 	return ret
 }
 
-func resourceAdmissionRuleRead(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourceAdmissionRuleRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
 	id, err := strconv.Atoi(d.Id())
@@ -153,7 +155,9 @@ func resourceAdmissionRuleRead(_ context.Context, d *schema.ResourceData, meta a
 		return diag.FromErr(err)
 	}
 
-	adm, err := APIClient.GetAdmissionRule(id)
+	adm, err := APIClient.
+		WithContext(ctx).
+		GetAdmissionRule(id)
 
 	if err != nil {
 		d.SetId("")
@@ -190,7 +194,7 @@ func resourceAdmissionRuleUpdate(ctx context.Context, d *schema.ResourceData, me
 	return resourceAdmissionRuleCreate(ctx, d, meta)
 }
 
-func resourceAdmissionRuleDelete(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourceAdmissionRuleDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
 	var err error
@@ -201,7 +205,7 @@ func resourceAdmissionRuleDelete(_ context.Context, d *schema.ResourceData, meta
 		return diag.FromErr(err)
 	}
 
-	if err := APIClient.DeleteAdmissionRule(id); err != nil {
+	if err := APIClient.WithContext(ctx).DeleteAdmissionRule(id); err != nil {
 		return diag.FromErr(err)
 	}
 

internal/resources/neuvector/resource_eula.go

@@ -41,7 +41,7 @@ func resourceEULACreate(ctx context.Context, d *schema.ResourceData, meta any) d
 		d,
 	)
 
-	if err := APIClient.AcceptEULA(eula); err != nil {
+	if err := APIClient.WithContext(ctx).AcceptEULA(eula); err != nil {
 		return diag.FromErr(err)
 	}
 
@@ -64,17 +64,19 @@ func resourceEULAUpdate(ctx context.Context, d *schema.ResourceData, meta any) d
 		d,
 	)
 
-	if err := APIClient.AcceptEULA(eula); err != nil {
+	if err := APIClient.WithContext(ctx).AcceptEULA(eula); err != nil {
 		return diag.FromErr(err)
 	}
 
 	return nil
 }
 
-func resourceEULARead(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourceEULARead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
-	eula, err := APIClient.GetEULA()
+	eula, err := APIClient.
+		WithContext(ctx).	
+		GetEULA()
 
 	if err != nil {
 		return diag.FromErr(err)
@@ -85,18 +87,20 @@ func resourceEULARead(_ context.Context, d *schema.ResourceData, meta any) diag.
 	return nil
 }
 
-func resourceEULADelete(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourceEULADelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
 	eula := helper.FromSchemas[goneuvector.EULA](
 		resourceEULASchema,
 		d,
 	)
 
-	err := APIClient.AcceptEULA(
-		goneuvector.EULA{
-			Accepted: !eula.Accepted,
-		},
+	err := APIClient.
+		WithContext(ctx).
+		AcceptEULA(
+			goneuvector.EULA{
+				Accepted: !eula.Accepted,
+			},
 	)
 
 	if err != nil {

internal/resources/neuvector/resource_group.go

@@ -95,7 +95,7 @@ func resourceGroupCreate(ctx context.Context, d *schema.ResourceData, meta any)
 
 	group := readGroup(d)
 
-	if err := APIClient.CreateGroup(*group); err != nil {
+	if err := APIClient.WithContext(ctx).CreateGroup(*group); err != nil {
 		return diag.FromErr(err)
 	}
 
@@ -113,7 +113,7 @@ func resourceGroupUpdate(ctx context.Context, d *schema.ResourceData, meta any)
 
 	group := readGroup(d)
 
-	if err := APIClient.PatchGroup(group.Name, *group); err != nil {
+	if err := APIClient.WithContext(ctx).PatchGroup(group.Name, *group); err != nil {
 		return diag.FromErr(err)
 	}
 
@@ -143,11 +143,13 @@ func resourceGroupRead(_ context.Context, d *schema.ResourceData, meta any) diag
 	return nil
 }
 
-func resourceGroupDelete(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourceGroupDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
-	err := APIClient.DeleteGroup(
-		d.Get("name").(string),
+	err := APIClient.
+		WithContext(ctx).
+		DeleteGroup(
+			d.Get("name").(string),
 	)
 
 	if err != nil {

internal/resources/neuvector/resource_policy.go

@@ -265,6 +265,8 @@ func resourcePolicyCreate(ctx context.Context, d *schema.ResourceData, meta any)
 		Rules: readPolicyRules(rulesRaw),
 	}
 
+	APIClient.WithContext(ctx)
+
 	// Patching policy handling the configuration scope
 	err = patchPolicy(
 		APIClient,
@@ -302,12 +304,14 @@ func resourcePolicyUpdate(ctx context.Context, d *schema.ResourceData, meta any)
 	return nil
 }
 
-func resourcePolicyRead(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourcePolicyRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	var rules []map[string]any
 
 	APIClient := meta.(*goneuvector.Client)
 
-	policies, err := APIClient.GetPolicies()
+	policies, err := APIClient.
+		WithContext(ctx).
+		GetPolicies()
 
 	if err != nil {
 		return diag.FromErr(err)
@@ -364,7 +368,7 @@ func resourcePolicyDelete(_ context.Context, d *schema.ResourceData, meta any) d
 	return nil
 }
 
-func resourcePolicyImport(_ context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
+func resourcePolicyImport(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
 	APIClient := meta.(*goneuvector.Client)
 
 	ruleID, err := strconv.Atoi(d.Id())
@@ -373,7 +377,9 @@ func resourcePolicyImport(_ context.Context, d *schema.ResourceData, meta any) (
 		return nil, err
 	}
 
-	p, err := APIClient.GetPolicy(ruleID)
+	p, err := APIClient.
+		WithContext(ctx).
+		GetPolicy(ruleID)
 
 	if err != nil {
 		return nil, err

internal/resources/neuvector/resource_promote.go

@@ -58,7 +58,7 @@ func resourcePromoteCreate(ctx context.Context, d *schema.ResourceData, meta any
 
 	body.MasterRestInfo = masterRestInfo
 
-	if err := APIClient.Promote(body); err != nil {
+	if err := APIClient.WithContext(ctx).Promote(body); err != nil {
 		return diag.FromErr(err)
 	}
 
@@ -75,10 +75,10 @@ func resourcePromoteRead(_ context.Context, d *schema.ResourceData, meta any) di
 	return nil
 }
 
-func resourcePromoteDelete(_ context.Context, _ *schema.ResourceData, meta any) diag.Diagnostics {
+func resourcePromoteDelete(ctx context.Context, _ *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
-	if err := APIClient.Demote(); err != nil {
+	if err := APIClient.WithContext(ctx).Demote(); err != nil {
 		return diag.FromErr(err)
 	}
 

internal/resources/neuvector/resource_registry.go

@@ -130,7 +130,7 @@ func readRegistry(d *schema.ResourceData) (*goneuvector.CreateRegistryBody, erro
 	return &ret, nil
 }
 
-func resourceRegistryCreate(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourceRegistryCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
 	body, err := readRegistry(d)
@@ -139,7 +139,7 @@ func resourceRegistryCreate(_ context.Context, d *schema.ResourceData, meta any)
 		return diag.FromErr(err)
 	}
 
-	if err := APIClient.CreateRegistry(*body); err != nil {
+	if err := APIClient.WithContext(ctx).CreateRegistry(*body); err != nil {
 		return diag.FromErr(err)
 	}
 
@@ -166,7 +166,7 @@ func resourceRegistryCreate(_ context.Context, d *schema.ResourceData, meta any)
 	return nil
 }
 
-func resourceRegistryUpdate(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourceRegistryUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
 	if d.HasChanges("name", "registry_type") {
@@ -179,19 +179,21 @@ func resourceRegistryUpdate(_ context.Context, d *schema.ResourceData, meta any)
 		return diag.FromErr(err)
 	}
 
-	if err := APIClient.PatchRegistry(*body, body.Name); err != nil {
+	if err := APIClient.WithContext(ctx).PatchRegistry(*body, body.Name); err != nil {
 		return diag.FromErr(err)
 	}
 
 	return nil
 }
 
-func resourceRegistryRead(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourceRegistryRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	var err error
 
 	APIClient := meta.(*goneuvector.Client)
 
-	r, err := APIClient.GetRegistry(d.Id())
+	r, err := APIClient.
+		WithContext(ctx).
+		GetRegistry(d.Id())
 
 	if err != nil {
 		return diag.FromErr(err)
@@ -210,10 +212,10 @@ func resourceRegistryRead(_ context.Context, d *schema.ResourceData, meta any) d
 	return nil
 }
 
-func resourceRegistryDelete(_ context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+func resourceRegistryDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	APIClient := meta.(*goneuvector.Client)
 
-	if err := APIClient.DeleteRegistry(d.Id()); err != nil {
+	if err := APIClient.WithContext(ctx).DeleteRegistry(d.Id()); err != nil {
 		return diag.FromErr(err)
 	}