added import and added tests. fixed errors handling.

env0/cloud_configuration.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"github.com/env0/terraform-provider-env0/client"
+	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -29,10 +30,35 @@ func getCloudConfigurationFromSchema(d *schema.ResourceData, provider string) (i
 	return configuration, nil
 }
 
+func getCloudConfigurationByNameFromApi(apiClient client.ApiClientInterface, name string) (*client.CloudAccount, error) {
+	cloudAccounts, err := apiClient.CloudAccounts()
+	if err != nil {
+		return nil, err
+	}
+
+	for i, cloudAccount := range cloudAccounts {
+		if cloudAccount.Name == name {
+			return &cloudAccounts[i], nil
+		}
+	}
+
+	return nil, fmt.Errorf("cloud configuration called '%s' was not found", name)
+}
+
 func getCloudConfigurationFromApi(apiClient client.ApiClientInterface, id string) (*client.CloudAccount, error) {
-	cloudAccount, err := apiClient.CloudAccount(id)
+	var err error
+	var cloudAccount *client.CloudAccount
+
+	if _, parseErr := uuid.Parse(id); parseErr != nil {
+		// Get by name (used by import).
+		cloudAccount, err = getCloudConfigurationByNameFromApi(apiClient, id)
+	} else {
+		// Get by id.
+		cloudAccount, err = apiClient.CloudAccount(id)
+	}
+
 	if err != nil {
-		return nil, fmt.Errorf("failed to get clound configuration with id '%s': %w", id, err)
+		return nil, fmt.Errorf("failed to get clound configuration: %w", err)
 	}
 
 	var configuration interface{}
@@ -152,7 +178,7 @@ func importCloudConfiguration(ctx context.Context, d *schema.ResourceData, meta
 
 	cloudAccount, err := getCloudConfigurationFromApi(apiClient, d.Id())
 	if err != nil {
-		return nil, fmt.Errorf("failed to get cloud configuration with id '%s'", d.Id())
+		return nil, err
 	}
 
 	if err := writeResourceData(cloudAccount, d); err != nil {

env0/errors.go

@@ -2,6 +2,7 @@ package env0
 
 import (
 	"context"
+	"errors"
 
 	"github.com/env0/terraform-provider-env0/client"
 	"github.com/env0/terraform-provider-env0/client/http"
@@ -11,15 +12,14 @@ import (
 )
 
 func driftDetected(err error) bool {
-	if frerr, ok := err.(*http.FailedResponseError); ok && frerr.NotFound() {
+	var failedResponseError *http.FailedResponseError
+	if errors.As(err, &failedResponseError) && failedResponseError.NotFound() {
 		return true
 	}
 
-	if _, ok := err.(*client.NotFoundError); ok {
-		return true
-	}
+	var notfoundError *client.NotFoundError
 
-	return false
+	return errors.As(err, &notfoundError)
 }
 
 func ResourceGetFailure(ctx context.Context, resourceName string, d *schema.ResourceData, err error) diag.Diagnostics {