fix: better error messages

ec/armada/data_source_armada.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/nitrado/terraform-provider-ec/ec"
 	"github.com/nitrado/terraform-provider-ec/pkg/resource"
+	apierrors "gitlab.com/nitrado/b2b/ec/apicore/api/errors"
 	metav1 "gitlab.com/nitrado/b2b/ec/apicore/apis/meta/v1"
 )
 
@@ -32,6 +33,9 @@ func dataSourceArmadaRead(ctx context.Context, d *schema.ResourceData, m any) di
 
 	obj, err := clientSet.ArmadaV1().Armadas(env).Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return diag.Errorf("Armada %q not found in environment %q", name, env)
+		}
 		return diag.FromErr(err)
 	}
 

ec/armada/data_source_armadaset.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/nitrado/terraform-provider-ec/ec"
 	"github.com/nitrado/terraform-provider-ec/pkg/resource"
+	apierrors "gitlab.com/nitrado/b2b/ec/apicore/api/errors"
 	metav1 "gitlab.com/nitrado/b2b/ec/apicore/apis/meta/v1"
 )
 
@@ -32,6 +33,9 @@ func dataSourceArmadaSetRead(ctx context.Context, d *schema.ResourceData, m any)
 
 	obj, err := clientSet.ArmadaV1().ArmadaSets(env).Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return diag.Errorf("ArmadaSet %q not found in environment %q", name, env)
+		}
 		return diag.FromErr(err)
 	}
 

ec/container/data_source_branch.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/nitrado/terraform-provider-ec/ec"
 	"github.com/nitrado/terraform-provider-ec/pkg/resource"
+	apierrors "gitlab.com/nitrado/b2b/ec/apicore/api/errors"
 	metav1 "gitlab.com/nitrado/b2b/ec/apicore/apis/meta/v1"
 )
 
@@ -31,6 +32,9 @@ func dataSourceBranchRead(ctx context.Context, d *schema.ResourceData, m any) di
 
 	obj, err := clientSet.ContainerV1().Branches().Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return diag.Errorf("Branch %q not found", name)
+		}
 		return diag.FromErr(err)
 	}
 

ec/container/data_source_image.go

@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/nitrado/terraform-provider-ec/ec"
 	"github.com/nitrado/terraform-provider-ec/pkg/resource"
+	apierrors "gitlab.com/nitrado/b2b/ec/apicore/api/errors"
 	metav1 "gitlab.com/nitrado/b2b/ec/apicore/apis/meta/v1"
 	containerv1 "gitlab.com/nitrado/b2b/ec/core/pkg/api/container/v1"
 )
@@ -39,6 +40,9 @@ func dataSourceImageRead(ctx context.Context, d *schema.ResourceData, m any) dia
 	case hasName:
 		obj, err = clientSet.ContainerV1().Images(branch).Get(ctx, name.(string), metav1.GetOptions{})
 		if err != nil {
+			if apierrors.IsNotFound(err) {
+				return diag.Errorf("Image %q not found in branch %q", name, branch)
+			}
 			return diag.FromErr(err)
 		}
 	case hasImage:
@@ -53,12 +57,7 @@ func dataSourceImageRead(ctx context.Context, d *schema.ResourceData, m any) dia
 			return diag.FromErr(err)
 		}
 		if len(list.Items) == 0 {
-			return diag.Diagnostics{
-				diag.Diagnostic{
-					Severity: diag.Error,
-					Summary:  "image not found",
-				},
-			}
+			return diag.Errorf("Image %q not found in branch %q", name, branch)
 		}
 		latestImg := slices.MaxFunc(list.Items, func(a, b containerv1.Image) int {
 			switch {

ec/core/data_source_core_environment.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/nitrado/terraform-provider-ec/ec"
 	"github.com/nitrado/terraform-provider-ec/pkg/resource"
+	apierrors "gitlab.com/nitrado/b2b/ec/apicore/api/errors"
 	metav1 "gitlab.com/nitrado/b2b/ec/apicore/apis/meta/v1"
 )
 
@@ -31,6 +32,9 @@ func dataSourceEnvironmentRead(ctx context.Context, d *schema.ResourceData, m an
 
 	obj, err := clientSet.CoreV1().Environments().Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return diag.Errorf("Environment %q not found", name)
+		}
 		return diag.FromErr(err)
 	}
 

ec/core/data_source_core_location.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/nitrado/terraform-provider-ec/ec"
 	"github.com/nitrado/terraform-provider-ec/pkg/resource"
+	apierrors "gitlab.com/nitrado/b2b/ec/apicore/api/errors"
 	metav1 "gitlab.com/nitrado/b2b/ec/apicore/apis/meta/v1"
 	corev1 "gitlab.com/nitrado/b2b/ec/core/pkg/api/core/v1"
 )
@@ -32,6 +33,9 @@ func dataSourceLocationRead(ctx context.Context, d *schema.ResourceData, m any)
 	var obj *corev1.Location
 	obj, err = clientSet.CoreV1().Locations().Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return diag.Errorf("Location %q not found", name)
+		}
 		return diag.FromErr(err)
 	}
 

ec/core/data_source_core_region.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/nitrado/terraform-provider-ec/ec"
 	"github.com/nitrado/terraform-provider-ec/pkg/resource"
+	apierrors "gitlab.com/nitrado/b2b/ec/apicore/api/errors"
 	metav1 "gitlab.com/nitrado/b2b/ec/apicore/apis/meta/v1"
 )
 
@@ -32,6 +33,9 @@ func dataSourceRegionRead(ctx context.Context, d *schema.ResourceData, m any) di
 
 	obj, err := clientSet.CoreV1().Regions(env).Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return diag.Errorf("Region %q not found in environment %q", name, env)
+		}
 		return diag.FromErr(err)
 	}
 

ec/core/data_source_core_site.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/nitrado/terraform-provider-ec/ec"
 	"github.com/nitrado/terraform-provider-ec/pkg/resource"
+	apierrors "gitlab.com/nitrado/b2b/ec/apicore/api/errors"
 	metav1 "gitlab.com/nitrado/b2b/ec/apicore/apis/meta/v1"
 )
 
@@ -31,6 +32,9 @@ func dataSourceSiteRead(ctx context.Context, d *schema.ResourceData, m any) diag
 
 	obj, err := clientSet.CoreV1().Sites().Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return diag.Errorf("Site %q not found", name)
+		}
 		return diag.FromErr(err)
 	}
 

ec/formation/data_source_formation.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/nitrado/terraform-provider-ec/ec"
 	"github.com/nitrado/terraform-provider-ec/pkg/resource"
+	apierrors "gitlab.com/nitrado/b2b/ec/apicore/api/errors"
 	metav1 "gitlab.com/nitrado/b2b/ec/apicore/apis/meta/v1"
 )
 
@@ -32,6 +33,9 @@ func dataSourceFormationRead(ctx context.Context, d *schema.ResourceData, m any)
 
 	obj, err := clientSet.FormationV1Beta1().Formations(env).Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return diag.Errorf("Formation %q not found in environment %q", name, env)
+		}
 		return diag.FromErr(err)
 	}
 

ec/formation/data_source_vessel.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/nitrado/terraform-provider-ec/ec"
 	"github.com/nitrado/terraform-provider-ec/pkg/resource"
+	apierrors "gitlab.com/nitrado/b2b/ec/apicore/api/errors"
 	metav1 "gitlab.com/nitrado/b2b/ec/apicore/apis/meta/v1"
 )
 
@@ -37,6 +38,9 @@ func dataSourceVesselRead(ctx context.Context, d *schema.ResourceData, m any) di
 
 	data, err := ec.Converter().Flatten(obj, vesselSchema())
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return diag.Errorf("Vessel %q not found in environment %q", name, env)
+		}
 		return diag.FromErr(err)
 	}
 

ec/protection/data_source_gatewaypolicy.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/nitrado/terraform-provider-ec/ec"
 	"github.com/nitrado/terraform-provider-ec/pkg/resource"
+	apierrors "gitlab.com/nitrado/b2b/ec/apicore/api/errors"
 	metav1 "gitlab.com/nitrado/b2b/ec/apicore/apis/meta/v1"
 )
 
@@ -36,6 +37,9 @@ func dataSourceGatewayPolicyRead(ctx context.Context, d *schema.ResourceData, m
 
 	data, err := ec.Converter().Flatten(obj, gatewayPolicySchema())
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return diag.Errorf("Gateway Policy %q not found", name)
+		}
 		return diag.FromErr(err)
 	}
 

ec/protection/data_source_migration.go

@@ -8,6 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/nitrado/terraform-provider-ec/ec"
 	"github.com/nitrado/terraform-provider-ec/pkg/resource"
+	apierrors "gitlab.com/nitrado/b2b/ec/apicore/api/errors"
 	metav1 "gitlab.com/nitrado/b2b/ec/apicore/apis/meta/v1"
 )
 
@@ -40,6 +41,9 @@ func dataSourceMigrationRead(ctx context.Context, d *schema.ResourceData, m any)
 
 	data, err := ec.Converter().Flatten(obj, migrationSchema())
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return diag.Errorf("Migration %q not found", name)
+		}
 		return diag.FromErr(err)
 	}
 

ec/protection/data_source_protocol.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/nitrado/terraform-provider-ec/ec"
 	"github.com/nitrado/terraform-provider-ec/pkg/resource"
+	apierrors "gitlab.com/nitrado/b2b/ec/apicore/api/errors"
 	metav1 "gitlab.com/nitrado/b2b/ec/apicore/apis/meta/v1"
 )
 
@@ -36,6 +37,9 @@ func dataSourceProtocolRead(ctx context.Context, d *schema.ResourceData, m any)
 
 	data, err := ec.Converter().Flatten(obj, protocolSchema())
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return diag.Errorf("Protocol %q not found", name)
+		}
 		return diag.FromErr(err)
 	}