Merge pull request #233 from yossig-aquasec/drift_detection

bug: Drift Detection and recreation for deleted resources
aquasecurity · Feb 15, 2023 · 9beb0cc · 9beb0cc
2 parents a23ff32 + 28c6a4f
commit 9beb0cc
Show file tree

Hide file tree

Showing 23 changed files with 35 additions and 26 deletions.
diff --git a/aquasec/resource_acknowledge.go b/aquasec/resource_acknowledge.go
@@ -229,7 +229,7 @@ func resourceAcknowledgeRead(d *schema.ResourceData, m interface{}) error {
 	currentAcknowledges, err := ac.AcknowledgeRead()
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_application_scope.go b/aquasec/resource_application_scope.go
@@ -407,7 +407,7 @@ func resourceApplicationScopeRead(d *schema.ResourceData, m interface{}) error {
 
 	iap, err := ac.GetApplicationScope(d.Id())
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_aqua_labels.go b/aquasec/resource_aqua_labels.go
@@ -69,7 +69,7 @@ func resourceAquaLabelRead(d *schema.ResourceData, m interface{}) error {
 	r, err := c.GetAquaLabel(d.Id())
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_container_runtime_policy.go b/aquasec/resource_container_runtime_policy.go
@@ -512,7 +512,7 @@ func resourceContainerRuntimePolicyRead(ctx context.Context, d *schema.ResourceD
 	crp, err := c.GetRuntimePolicy(d.Id())
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_enforcer_group.go b/aquasec/resource_enforcer_group.go
@@ -438,7 +438,7 @@ func resourceEnforcerGroupRead(d *schema.ResourceData, m interface{}) error {
 	r, err := ac.GetEnforcerGroup(name)
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_firewall_policy.go b/aquasec/resource_firewall_policy.go
@@ -148,7 +148,7 @@ func resourceFirewallPolicyRead(ctx context.Context, d *schema.ResourceData, m i
 	firewallPolicy, err := c.GetFirewallPolicy(d.Id())
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_function_assurance_policy.go b/aquasec/resource_function_assurance_policy.go
@@ -680,7 +680,7 @@ func resourceFunctionAssurancePolicyRead(d *schema.ResourceData, m interface{})
 	iap, err := ac.GetAssurancePolicy(d.Id(), assurance_type)
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_function_runtime_policy.go b/aquasec/resource_function_runtime_policy.go
@@ -168,7 +168,7 @@ func resourceFunctionRuntimePolicyRead(ctx context.Context, d *schema.ResourceDa
 	crp, err := c.GetRuntimePolicy(d.Id())
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_group.go b/aquasec/resource_group.go
@@ -70,7 +70,7 @@ func resourceGroupRead(d *schema.ResourceData, m interface{}) error {
 	r, err := ac.GetGroup(id)
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_host_assurance_policy.go b/aquasec/resource_host_assurance_policy.go
@@ -680,7 +680,7 @@ func resourceHostAssurancePolicyRead(d *schema.ResourceData, m interface{}) erro
 	iap, err := ac.GetAssurancePolicy(d.Id(), assurance_type)
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_host_runtime_policy.go b/aquasec/resource_host_runtime_policy.go
@@ -518,7 +518,7 @@ func resourceHostRuntimePolicyRead(ctx context.Context, d *schema.ResourceData,
 	crp, err := c.GetRuntimePolicy(d.Id())
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_image.go b/aquasec/resource_image.go
@@ -720,7 +720,7 @@ func resourceImageRead(ctx context.Context, d *schema.ResourceData, m interface{
 	newImage, err := c.GetImage(id)
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}
@@ -730,7 +730,7 @@ func resourceImageRead(ctx context.Context, d *schema.ResourceData, m interface{
 	vulnerabilities, err := c.GetVulnerabilities(newImage)
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_image_assurance_policy.go b/aquasec/resource_image_assurance_policy.go
@@ -681,7 +681,7 @@ func resourceImageAssurancePolicyRead(d *schema.ResourceData, m interface{}) err
 	iap, err := ac.GetAssurancePolicy(d.Id(), assurance_type)
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_image_test.go b/aquasec/resource_image_test.go
@@ -19,7 +19,7 @@ func newTestImage() client.Image {
 }
 
 func TestResourceAquasecImageCreate(t *testing.T) {
-	t.Parallel()
+	//t.Parallel()
 	image := newTestImage()
 	rootRef := imageResourceRef("test")
 	resource.Test(t, resource.TestCase{
@@ -61,7 +61,7 @@ func TestResourceAquasecImageCreate(t *testing.T) {
 }
 
 func TestResourceAquasecImageAllow(t *testing.T) {
-	t.Parallel()
+	//t.Parallel()
 	image := newTestImage()
 	rootRef := imageResourceRef("test")
 	resource.Test(t, resource.TestCase{
@@ -92,7 +92,7 @@ func TestResourceAquasecImageAllow(t *testing.T) {
 }
 
 func TestResourceAquasecImageBlock(t *testing.T) {
-	t.Parallel()
+	//t.Parallel()
 	image := newTestImage()
 	rootRef := imageResourceRef("test")
 	resource.Test(t, resource.TestCase{
@@ -123,7 +123,7 @@ func TestResourceAquasecImageBlock(t *testing.T) {
 }
 
 func TestResourceAquasecImageAllowAndBlock(t *testing.T) {
-	t.Parallel()
+	//t.Parallel()
 	image := newTestImage()
 	rootRef := imageResourceRef("test")
 	resource.Test(t, resource.TestCase{

diff --git a/aquasec/resource_kubernetes_assurance_policy.go b/aquasec/resource_kubernetes_assurance_policy.go
@@ -683,7 +683,7 @@ func resourceKubernetesAssurancePolicyRead(d *schema.ResourceData, m interface{}
 	iap, err := ac.GetAssurancePolicy(d.Id(), assurance_type)
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_notification.go b/aquasec/resource_notification.go
@@ -119,7 +119,7 @@ func resourceNotificationRead(d *schema.ResourceData, m interface{}) error {
 
 	r, err := ac.SlackNotificationRead()
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_permission_set.go b/aquasec/resource_permission_set.go
@@ -108,7 +108,7 @@ func resourcePermissionSetRead(d *schema.ResourceData, m interface{}) error {
 	iap, err := ac.GetPermissionsSet(d.Id())
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_registry.go b/aquasec/resource_registry.go
@@ -232,7 +232,7 @@ func resourceRegistryRead(d *schema.ResourceData, m interface{}) error {
 
 	r, err := ac.GetRegistry(d.Id())
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_role.go b/aquasec/resource_role.go
@@ -81,7 +81,7 @@ func resourceRoleRead(d *schema.ResourceData, m interface{}) error {
 	r, err := ac.GetRole(d.Id())
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_service.go b/aquasec/resource_service.go
@@ -199,7 +199,7 @@ func resourceServiceRead(ctx context.Context, d *schema.ResourceData, m interfac
 	service, err := c.GetService(d.Id())
 
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_user.go b/aquasec/resource_user.go
@@ -145,7 +145,7 @@ func resourceUserRead(d *schema.ResourceData, m interface{}) error {
 
 	r, err := ac.GetUser(d.Id())
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/resource_user_saas.go b/aquasec/resource_user_saas.go
@@ -208,7 +208,7 @@ func resourceUserSaasRead(d *schema.ResourceData, m interface{}) error {
 	ac := m.(*client.Client)
 	r, err := ac.GetUser(d.Id())
 	if err != nil {
-		if strings.Contains(fmt.Sprintf("%s", err), "404 Not Found") {
+		if strings.Contains(fmt.Sprintf("%s", err), "404") {
 			d.SetId("")
 			return nil
 		}

diff --git a/aquasec/utils.go b/aquasec/utils.go
@@ -6,6 +6,7 @@ import (
 	"github.com/aquasecurity/terraform-provider-aquasec/client"
 	"github.com/aquasecurity/terraform-provider-aquasec/consts"
 	os "os"
+	"strings"
 )
 
 func convertStringArr(ifaceArr []interface{}) []string {
@@ -186,3 +187,11 @@ func isSaasEnv() bool {
 		return false
 	}
 }
+
+func isResourceExist(response string) bool {
+	if strings.Contains(response, "404") {
+		return false
+	} else {
+		return true
+	}
+}