remove diag

Author: MosenzonTal

aquasec/resource_application_scope.go

@@ -1,30 +1,26 @@
 package aquasec
 
 import (
-	"context"
 	"fmt"
-	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-
 	"github.com/aquasecurity/terraform-provider-aquasec/client"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceApplicationScope() *schema.Resource {
 	return &schema.Resource{
-		CreateContext: resourceApplicationScopeCreate,
-		ReadContext:   resourceApplicationScopeRead,
-		UpdateContext: resourceApplicationScopeUpdate,
-		DeleteContext: resourceApplicationScopeDelete,
+		Create: resourceApplicationScopeCreate,
+		Read:   resourceApplicationScopeRead,
+		Update: resourceApplicationScopeUpdate,
+		Delete: resourceApplicationScopeDelete,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {
 				Type:        schema.TypeString,
-				Description: "You are using a legacy resource. Consider migrating to 'aquasec_application_scope_saas'.",
+				Description: "Name of an application scope.",
 				Required:    true,
 				ForceNew:    true,
 				ValidateFunc: func(val interface{}, key string) ([]string, []error) {
@@ -382,29 +378,22 @@ func resourceApplicationScope() *schema.Resource {
 	}
 }
 
-func resourceApplicationScopeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	result := isSaasEnv()
-	log.Printf("is SAAS envvvvvv %v", result) // TODO: DELETE
-	var diags diag.Diagnostics
-	diags = addSaasResourceWarning(diags, "aquasec_application_scope", "aquasec_application_scope_saas")
-
+func resourceApplicationScopeCreate(d *schema.ResourceData, m interface{}) error {
 	ac := m.(*client.Client)
 	name := d.Get("name").(string)
 	iap, err1 := expandApplicationScope(d)
 	if err1 != nil {
-		return diag.FromErr(fmt.Errorf("expanding applications failed with error: %w", err1))
+		return fmt.Errorf("expanding applications is failed with error: %v", err1)
 	}
 	err := ac.CreateApplicationScope(iap)
 
 	if err == nil {
 		d.SetId(name)
 	} else {
-		return diag.FromErr(fmt.Errorf("application scope resource create is failed with error: %w", err1))
+		return fmt.Errorf("application scope resource create is failed with error:  %v", err)
 	}
-	readDiags := resourceApplicationScopeRead(ctx, d, m)
-	diags = append(diags, readDiags...)
 
-	return diags
+	return resourceApplicationScopeRead(d, m)
 }
 
 func expandApplicationScope(d *schema.ResourceData) (*client.ApplicationScope, error) {
@@ -458,7 +447,7 @@ func expandApplicationScope(d *schema.ResourceData) (*client.ApplicationScope, e
 
 }
 
-func resourceApplicationScopeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func resourceApplicationScopeRead(d *schema.ResourceData, m interface{}) error {
 	ac := m.(*client.Client)
 
 	iap, err := ac.GetApplicationScope(d.Id())
@@ -467,41 +456,38 @@ func resourceApplicationScopeRead(ctx context.Context, d *schema.ResourceData, m
 			d.SetId("")
 			return nil
 		}
-		return diag.FromErr(err)
+		return err
 	}
 
 	err = d.Set("name", iap.Name)
 	if err != nil {
-		return diag.FromErr(err)
+		return err
 	}
 	err = d.Set("description", iap.Description)
 	if err != nil {
-		return diag.FromErr(err)
+		return err
 	}
 	err = d.Set("author", iap.Author)
 	if err != nil {
-		return diag.FromErr(err)
+		return err
 	}
 	err = d.Set("owner_email", iap.OwnerEmail)
 	if err != nil {
-		return diag.FromErr(err)
+		return err
 	}
 
 	err = d.Set("categories", flattenCategories(iap.Categories))
 
 	if err != nil {
-		return diag.FromErr(err)
+		return err
 	}
 
 	d.SetId(iap.Name)
 
 	return nil
 }
 
-func resourceApplicationScopeUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	var diags diag.Diagnostics
-	diags = addSaasResourceWarning(diags, "aquasec_application_scope", "aquasec_application_scope_saas")
-
+func resourceApplicationScopeUpdate(d *schema.ResourceData, m interface{}) error {
 	ac := m.(*client.Client)
 	name := d.Get("name").(string)
 
@@ -510,16 +496,16 @@ func resourceApplicationScopeUpdate(ctx context.Context, d *schema.ResourceData,
 
 		iap, err1 := expandApplicationScope(d)
 		if err1 != nil {
-			return diag.FromErr(err1)
+			return err1
 		}
 		err = ac.UpdateApplicationScope(iap, name)
 		if err != nil {
-			return diag.FromErr(err)
+			return err
 		}
-		return resourceApplicationScopeRead(ctx, d, m)
+		return resourceApplicationScopeRead(d, m)
 
 	}
-	return diags
+	return nil
 }
 
 func createCategory(a map[string]interface{}, w map[string]interface{}, i map[string]interface{}) client.Category {
@@ -635,15 +621,15 @@ func createEmptyCommonStruct() client.CommonStruct {
 	return commonStruct1
 }
 
-func resourceApplicationScopeDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func resourceApplicationScopeDelete(d *schema.ResourceData, m interface{}) error {
 	ac := m.(*client.Client)
 	name := d.Get("name").(string)
 	err := ac.DeleteApplicationScope(name)
 
 	if err == nil {
 		d.SetId("")
 	} else {
-		return diag.FromErr(err)
+		return err
 	}
 	return nil
 }