create addSaasResourceWarning function

Author: MosenzonTal

aquasec/resource_application_scope.go

@@ -19,18 +19,11 @@ func resourceApplicationScope() *schema.Resource {
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {
-				Type:        schema.TypeString,
-				Description: "Name of an application scope.",
-				Required:    true,
-				ForceNew:    true,
-				ValidateFunc: func(val interface{}, key string) ([]string, []error) {
-					if isSaasEnv() {
-						return []string{
-							"You are using aquasec_application_scope with an Aqua SaaS instance. Please migrate to aquasec_application_scope_saas, designed specifically for Aqua SaaS customers and supporting the entire SaaS platform beyond workload protection.",
-						}, nil
-					}
-					return nil, nil
-				},
+				Type:         schema.TypeString,
+				Description:  "Name of an application scope.",
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validateSaasResourceWarning("aquasec_application_scope", "aquasec_application_scope_saas"),
 			},
 			"description": {
 				Type:        schema.TypeString,

aquasec/utils.go

@@ -6,10 +6,9 @@ import (
 	os "os"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-
 	"github.com/aquasecurity/terraform-provider-aquasec/client"
 	"github.com/aquasecurity/terraform-provider-aquasec/consts"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func convertStringArr(ifaceArr []interface{}) []string {
@@ -244,13 +243,16 @@ func isResourceExist(response string) bool {
 	}
 }
 
-func addSaasResourceWarning(diags diag.Diagnostics, legacyResource string, newResource string) diag.Diagnostics {
-	if isSaasEnv() {
-		return append(diags, diag.Diagnostic{
-			Severity: diag.Warning,
-			Summary:  "Legacy Resource Usage",
-			Detail:   fmt.Sprintf("You are using %s with an Aqua SaaS instance. Please migrate to %s, designed specifically for Aqua SaaS customers and supporting the entire SaaS platform beyond workload protection.", legacyResource, newResource),
-		})
+func validateSaasResourceWarning(legacyResource, newResource string) schema.SchemaValidateFunc {
+	return func(val interface{}, key string) ([]string, []error) {
+		if isSaasEnv() {
+			return []string{
+				fmt.Sprintf(
+					"You are using %s with an Aqua SaaS instance. Please migrate to %s, designed specifically for Aqua SaaS customers and supporting the entire SaaS platform beyond workload protection.",
+					legacyResource, newResource,
+				),
+			}, nil
+		}
+		return nil, nil
 	}
-	return diags
 }