fix(mnq): delete sdk-go v1 in validate cassette

Author: jremy42

internal/acctest/validate_cassettes_test.go

@@ -9,10 +9,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/aws/aws-sdk-go/service/sqs"
+	"gopkg.in/dnaeon/go-vcr.v3/cassette"
+
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/mnq"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/dnaeon/go-vcr.v3/cassette"
 )
 
 func exceptionsCassettesCases() map[string]struct{} {
@@ -77,12 +78,10 @@ func checkErrCodeExcept(i *cassette.Interaction, c *cassette.Cassette, codes ...
 	if isException {
 		return isException
 	}
-
 	// SQS returns 400 when the queue does not exist
-	if strings.Contains(i.Response.Body, sqs.ErrCodeQueueDoesNotExist) && i.Response.Code == 400 {
+	if strings.Contains(i.Response.Body, mnq.AWSErrNonExistentQueue) && i.Response.Code == 400 {
 		return true
 	}
-
 	if i.Response.Code >= 400 {
 		for _, httpCode := range codes {
 			if i.Response.Code == httpCode {
@@ -91,7 +90,6 @@ func checkErrCodeExcept(i *cassette.Interaction, c *cassette.Cassette, codes ...
 		}
 		return false
 	}
-
 	return true
 }
 

internal/services/mnq/helpers_mnq.go

@@ -14,6 +14,11 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
 )
 
+const (
+	AWSErrQueueDeletedRecently = "AWS.SimpleQueueService.QueueDeletedRecently"
+	AWSErrNonExistentQueue     = "AWS.SimpleQueueService.NonExistentQueue"
+)
+
 func newMNQNatsAPI(d *schema.ResourceData, m interface{}) (*mnq.NatsAPI, scw.Region, error) {
 	api := mnq.NewNatsAPI(meta.ExtractScwClient(m))
 	region, err := meta.ExtractRegion(d, m)

internal/services/mnq/sns_topic_test.go

@@ -193,7 +193,6 @@ func isSNSTopicDestroyed(ctx context.Context, tt *acctest.TestTools) resource.Te
 			if err != nil {
 				var apiErr *smithy.GenericAPIError
 				if errors.As(err, &apiErr) && apiErr.Code == "AccessDeniedException" {
-					// L'erreur AccessDenied signifie que la ressource est supprimée ou inaccessible
 					return nil
 				}
 				return err

internal/services/mnq/sqs_queue.go

@@ -168,7 +168,7 @@ func ResourceMNQSQSQueueCreate(ctx context.Context, d *schema.ResourceData, m in
 		Attributes: attributes,
 		QueueName:  scw.StringPtr(queueName),
 	}
-	_, err = transport.RetryWhenAWSErrCodeEquals(ctx, []string{"AWS.SimpleQueueService.QueueDeletedRecently"}, &transport.RetryWhenConfig[*sqs.CreateQueueOutput]{
+	_, err = transport.RetryWhenAWSErrCodeEquals(ctx, []string{AWSErrQueueDeletedRecently}, &transport.RetryWhenConfig[*sqs.CreateQueueOutput]{
 		Timeout:  d.Timeout(schema.TimeoutCreate),
 		Interval: defaultMNQQueueRetryInterval,
 		Function: func() (*sqs.CreateQueueOutput, error) {
@@ -195,7 +195,7 @@ func ResourceMNQSQSQueueRead(ctx context.Context, d *schema.ResourceData, m inte
 		return diag.FromErr(err)
 	}
 
-	queue, err := transport.RetryWhenAWSErrCodeEquals(ctx, []string{"AWS.SimpleQueueService.NonExistentQueue"}, &transport.RetryWhenConfig[*sqs.GetQueueUrlOutput]{
+	queue, err := transport.RetryWhenAWSErrCodeEquals(ctx, []string{AWSErrNonExistentQueue}, &transport.RetryWhenConfig[*sqs.GetQueueUrlOutput]{
 		Timeout:  d.Timeout(schema.TimeoutRead),
 		Interval: defaultMNQQueueRetryInterval,
 		Function: func() (*sqs.GetQueueUrlOutput, error) {
@@ -244,7 +244,7 @@ func ResourceMNQSQSQueueUpdate(ctx context.Context, d *schema.ResourceData, m in
 		return diag.FromErr(err)
 	}
 
-	queue, err := transport.RetryWhenAWSErrCodeEquals(ctx, []string{"AWS.SimpleQueueService.NonExistentQueue"}, &transport.RetryWhenConfig[*sqs.GetQueueUrlOutput]{
+	queue, err := transport.RetryWhenAWSErrCodeEquals(ctx, []string{AWSErrNonExistentQueue}, &transport.RetryWhenConfig[*sqs.GetQueueUrlOutput]{
 		Timeout:  d.Timeout(schema.TimeoutUpdate),
 		Interval: defaultMNQQueueRetryInterval,
 		Function: func() (*sqs.GetQueueUrlOutput, error) {
@@ -288,7 +288,7 @@ func ResourceMNQSQSQueueDelete(ctx context.Context, d *schema.ResourceData, m in
 		QueueName: &queueName,
 	})
 	if err != nil {
-		if IsAWSErrorCode(err, "AWS.SimpleQueueService.NonExistentQueue") {
+		if IsAWSErrorCode(err, AWSErrNonExistentQueue) {
 			return nil
 		}
 
@@ -299,13 +299,13 @@ func ResourceMNQSQSQueueDelete(ctx context.Context, d *schema.ResourceData, m in
 		QueueUrl: queue.QueueUrl,
 	})
 	if err != nil {
-		if IsAWSErrorCode(err, "AWS.SimpleQueueService.NonExistentQueue") {
+		if IsAWSErrorCode(err, AWSErrNonExistentQueue) {
 			return nil
 		}
 		return diag.Errorf("failed to delete SQS Queue (%s): %s", d.Id(), err)
 	}
 
-	_, _ = transport.RetryWhenAWSErrCodeNotEquals(ctx, []string{"AWS.SimpleQueueService.NonExistentQueue"}, &transport.RetryWhenConfig[*sqs.GetQueueUrlOutput]{
+	_, _ = transport.RetryWhenAWSErrCodeNotEquals(ctx, []string{AWSErrNonExistentQueue}, &transport.RetryWhenConfig[*sqs.GetQueueUrlOutput]{
 		Timeout:  d.Timeout(schema.TimeoutCreate),
 		Interval: defaultMNQQueueRetryInterval,
 		Function: func() (*sqs.GetQueueUrlOutput, error) {

internal/services/mnq/sqs_queue_test.go

@@ -246,7 +246,7 @@ func isSQSQueueDestroyed(ctx context.Context, tt *acctest.TestTools) resource.Te
 				QueueName: aws.String(queueName),
 			})
 			if err != nil {
-				if mnq.IsAWSErrorCode(err, "AWS.SimpleQueueService.NonExistentQueue") || mnq.IsAWSErrorCode(err, "AccessDeniedException") {
+				if mnq.IsAWSErrorCode(err, mnq.AWSErrNonExistentQueue) || mnq.IsAWSErrorCode(err, "AccessDeniedException") {
 					return nil
 				}