Merge pull request #334 from aquasecurity/test_coverage

fix: Increase acceptance test coverage

Author: semyonmor

DEVELOPMENT.md

@@ -32,7 +32,7 @@ git clone https://github.com/aquasecurity/terraform-provider-aquasec.git
 
 cd terraform-provider-aquasec
 
-git checkout v0.9.0
+git checkout v0.10.0
 ```
 
 **Build and install the provider**

GNUmakefile

@@ -6,7 +6,7 @@ HOSTNAME	 := github.com
 NAMESPACE	 := aquasec
 NAME 		 := aquasec
 BINARY		 := terraform-provider-${NAME}
-VERSION      := 0.9.0
+VERSION      := 0.10.0
 OS_ARCH      := $(shell go env GOOS)_$(shell go env GOARCH)
 
 default: build

README.md

@@ -43,7 +43,7 @@ To quickly get started using the Aquasec provider for Terraform, configure the p
 terraform {
   required_providers {
     aquasec = {
-      version = "0.9.0"
+      version = "0.10.0"
       source  = "aquasecurity/aquasec"
     }
   }

aquasec/data_enforcer_group_test.go

@@ -57,7 +57,7 @@ func testAccCheckAquasecEnforcerGroupDataSource(enforcerGroup client.EnforcerGro
 		schedule_scan_settings {
 			disabled  = %v
 			is_custom = %v
-			days      = [0, 1, 2, 3, 4, 5, 6]
+			days      = [0,1,2,3,4,5,6]
 			time      = [3, 0]
 		}
 	}

aquasec/data_gateway.go

@@ -1,62 +1,109 @@
 package aquasec
 
 import (
+	"context"
 	"log"
 
 	"github.com/aquasecurity/terraform-provider-aquasec/client"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceGateways() *schema.Resource {
 	return &schema.Resource{
 		Description: "The data source `aquasec_gateways` provides a method to query all gateways within the Aqua ",
-		Read:        dataGatewayRead,
+		ReadContext: dataGatewayRead,
 		Schema: map[string]*schema.Schema{
 			"gateways": {
-				Type:     schema.TypeList,
+				Type:        schema.TypeList,
 				Description: "A list of existing gateways' parameters.",
-				Computed: true,
+				Computed:    true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"id": {
-							Type:     schema.TypeString,
+							Type:        schema.TypeString,
 							Description: "The ID of the gateway (for example: 8522744b25e2_gateway)",
-							Computed: true,
+							Computed:    true,
 						},
 						"logicalname": {
-							Type:     schema.TypeString,
+							Type:        schema.TypeString,
 							Description: "The logical name of the gateway (for example: 8522744b25e2)",
-							Computed: true,
+							Computed:    true,
 						},
 						"description": {
-							Type:     schema.TypeString,
+							Type:        schema.TypeString,
 							Description: "The description of the gateway.",
-							Computed: true,
+							Computed:    true,
 						},
 						"version": {
-							Type:     schema.TypeString,
+							Type:        schema.TypeString,
 							Description: "The version of the gateway.",
-							Computed: true,
+							Computed:    true,
 						},
 						"hostname": {
-							Type:     schema.TypeString,
+							Type:        schema.TypeString,
 							Description: "The name of the gateway's host.",
-							Computed: true,
+							Computed:    true,
 						},
 						"public_address": {
-							Type:     schema.TypeString,
+							Type:        schema.TypeString,
 							Description: "The public IP address of the gateway.",
-							Computed: true,
+							Computed:    true,
 						},
 						"grpc_address": {
-							Type:     schema.TypeString,
+							Type:        schema.TypeString,
 							Description: "The GRPC address of the gateway.",
-							Computed: true,
+							Computed:    true,
 						},
 						"status": {
-							Type:     schema.TypeString,
+							Type:        schema.TypeString,
 							Description: "The status of the gateway.",
-							Computed: true,
+							Computed:    true,
+						},
+						"project_id": {
+							Type:        schema.TypeInt,
+							Description: "",
+							Computed:    true,
+						},
+						"type": {
+							Type:        schema.TypeString,
+							Description: "",
+							Computed:    true,
+						},
+						"commit": {
+							Type:        schema.TypeString,
+							Description: "",
+							Computed:    true,
+						},
+						"address": {
+							Type:        schema.TypeString,
+							Description: "",
+							Computed:    true,
+						},
+						"last_update": {
+							Type:        schema.TypeInt,
+							Description: "",
+							Computed:    true,
+						},
+						"server_id": {
+							Type:        schema.TypeString,
+							Description: "",
+							Computed:    true,
+						},
+						"server_name": {
+							Type:        schema.TypeString,
+							Description: "",
+							Computed:    true,
+						},
+						"docker_version": {
+							Type:        schema.TypeString,
+							Description: "",
+							Computed:    true,
+						},
+						"host_os": {
+							Type:        schema.TypeString,
+							Description: "",
+							Computed:    true,
 						},
 					},
 				},
@@ -65,18 +112,18 @@ func dataSourceGateways() *schema.Resource {
 	}
 }
 
-func dataGatewayRead(d *schema.ResourceData, m interface{}) error {
+func dataGatewayRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Println("[DEBUG]  inside dataGateway")
 	c := m.(*client.Client)
 	result, err := c.GetGateways()
 	if err == nil {
 		gateways, id := flattenGatewaysData(&result)
 		d.SetId(id)
 		if err := d.Set("gateways", gateways); err != nil {
-			return err
+			return diag.FromErr(err)
 		}
 	} else {
-		return err
+		return diag.FromErr(err)
 	}
 
 	return nil

aquasec/data_image_assurance_policy.go

@@ -403,6 +403,22 @@ func dataImageAssurancePolicy() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
+						"imageid": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"imagedigest": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"author": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"lastupdated": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
 					},
 				},
 			},
@@ -743,7 +759,7 @@ func dataImageAssurancePolicyRead(ctx context.Context, d *schema.ResourceData, m
 		d.Set("malware_action", iap.MalwareAction)
 		d.Set("partial_results_image_fail", iap.PartialResultsImageFail)
 		d.Set("maximum_score_exclude_no_fix", iap.MaximumScoreExcludeNoFix)
-        d.Set("aggregated_vulnerability", flattenAggregatedVulnerability(iap.AggregatedVulnerability))
+		d.Set("aggregated_vulnerability", flattenAggregatedVulnerability(iap.AggregatedVulnerability))
 		d.SetId(name)
 	} else {
 		return diag.FromErr(err)

aquasec/data_integration_state.go

@@ -1,14 +1,17 @@
 package aquasec
 
 import (
+	"context"
 	"fmt"
+
 	"github.com/aquasecurity/terraform-provider-aquasec/client"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataIntegrationState() *schema.Resource {
 	return &schema.Resource{
-		Read: dataIntegrationStateRead,
+		ReadContext: dataIntegrationStateRead,
 		Schema: map[string]*schema.Schema{
 			"oidc_settings": {
 				Type:        schema.TypeBool,
@@ -29,7 +32,7 @@ func dataIntegrationState() *schema.Resource {
 	}
 }
 
-func dataIntegrationStateRead(d *schema.ResourceData, m interface{}) error {
+func dataIntegrationStateRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	ac := m.(*client.Client)
 
 	iap, err := ac.GetIntegrationState()
@@ -40,7 +43,7 @@ func dataIntegrationStateRead(d *schema.ResourceData, m interface{}) error {
 		_, id := flattenIntegrationEnablesStateData(iap)
 		d.SetId(id)
 	} else {
-		return err
+		return diag.FromErr(err)
 	}
 	return nil
 }