From fcd096e43bf73e47a434708d43d28d56ebb1b1ba Mon Sep 17 00:00:00 2001
From: Will Smith <willdavsmith@gmail.com>
Date: Mon, 8 Jan 2024 12:41:25 -0600
Subject: [PATCH] Restore AWS S3 tests (#6993)

# Description

AWS CloudFormation seems to have reverted the spec changes to S3 buckets
to make them non-idempotent resources. We should now be able to
re-enable our tests.

## Type of change

<!--

Please select **one** of the following options that describes your
change and delete the others. Clearly identifying the type of change you
are making will help us review your PR faster, and is used in authoring
release notes.

If you are making a bug fix or functionality change to Radius and do not
have an associated issue link please create one now.

-->

- This pull request is a minor refactor, code cleanup, test improvement,
or other maintenance task and doesn't change the functionality of Radius
(issue link optional).

<!--

Please update the following to link the associated issue. This is
required for some kinds of changes (see above).

-->

Fixes: #6948

Signed-off-by: willdavsmith <willdavsmith@gmail.com>
---
 .github/workflows/purge-aws-test-resources.yaml        | 2 +-
 test/functional/shared/mechanics/aws_mechanics_test.go | 1 -
 test/functional/shared/resources/aws_s3_bucket_test.go | 2 --
 test/functional/shared/resources/extender_test.go      | 1 -
 test/functional/ucp/aws_test.go                        | 2 --
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/purge-aws-test-resources.yaml b/.github/workflows/purge-aws-test-resources.yaml
index 9470fb2bb8..160a0f7636 100644
--- a/.github/workflows/purge-aws-test-resources.yaml
+++ b/.github/workflows/purge-aws-test-resources.yaml
@@ -39,4 +39,4 @@ jobs:
           aws-region: ${{ env.AWS_REGION }}
       - name: Delete old AWS resources
         run: |
-          ./.github/scripts/delete_aws_resources.sh ${{ env.AWS_RESOURCE_TYPES }}
+          ./.github/scripts/delete-aws-resources.sh ${{ env.AWS_RESOURCE_TYPES }}
diff --git a/test/functional/shared/mechanics/aws_mechanics_test.go b/test/functional/shared/mechanics/aws_mechanics_test.go
index a4c9f5110f..885e415cda 100644
--- a/test/functional/shared/mechanics/aws_mechanics_test.go
+++ b/test/functional/shared/mechanics/aws_mechanics_test.go
@@ -28,7 +28,6 @@ import (
 )
 
 func Test_AWSRedeployWithUpdatedResourceUpdatesResource(t *testing.T) {
-	t.Skip("Skipping until we resolve https://github.com/radius-project/radius/issues/6535")
 	templateFmt := "testdata/aws-mechanics-redeploy-withupdatedresource.step%d.bicep"
 	name := "radiusfunctionaltestbucket-" + uuid.New().String()
 	creationTimestamp := functional.GetCreationTimestamp()
diff --git a/test/functional/shared/resources/aws_s3_bucket_test.go b/test/functional/shared/resources/aws_s3_bucket_test.go
index a099a2d174..2c475da5ef 100644
--- a/test/functional/shared/resources/aws_s3_bucket_test.go
+++ b/test/functional/shared/resources/aws_s3_bucket_test.go
@@ -26,7 +26,6 @@ import (
 )
 
 func Test_AWS_S3Bucket(t *testing.T) {
-	t.Skip("Skipping until we resolve https://github.com/radius-project/radius/issues/6535")
 	template := "testdata/aws-s3-bucket.bicep"
 	name := functional.GenerateS3BucketName()
 	creationTimestamp := functional.GetCreationTimestamp()
@@ -65,7 +64,6 @@ func Test_AWS_S3Bucket(t *testing.T) {
 }
 
 func Test_AWS_S3Bucket_Existing(t *testing.T) {
-	t.Skip("Skipping until we resolve https://github.com/radius-project/radius/issues/6535")
 	template := "testdata/aws-s3-bucket.bicep"
 	templateExisting := "testdata/aws-s3-bucket-existing.bicep"
 	name := functional.GenerateS3BucketName()
diff --git a/test/functional/shared/resources/extender_test.go b/test/functional/shared/resources/extender_test.go
index 31b1020545..abbad70962 100644
--- a/test/functional/shared/resources/extender_test.go
+++ b/test/functional/shared/resources/extender_test.go
@@ -98,7 +98,6 @@ func Test_Extender_Recipe(t *testing.T) {
 }
 
 func Test_Extender_RecipeAWS(t *testing.T) {
-	t.Skip("Skipping until we resolve https://github.com/radius-project/radius/issues/6535")
 	awsAccountID := os.Getenv("AWS_ACCOUNT_ID")
 	awsRegion := os.Getenv("AWS_REGION")
 	// Error the test if the required environment variables are not set
diff --git a/test/functional/ucp/aws_test.go b/test/functional/ucp/aws_test.go
index 854676e4b5..7dd6e31064 100644
--- a/test/functional/ucp/aws_test.go
+++ b/test/functional/ucp/aws_test.go
@@ -44,7 +44,6 @@ var (
 )
 
 func Test_AWS_DeleteResource(t *testing.T) {
-	t.Skip("Skipping until we resolve https://github.com/radius-project/radius/issues/6535")
 	ctx := context.Background()
 
 	bucketName := generateS3BucketName()
@@ -106,7 +105,6 @@ func Test_AWS_DeleteResource(t *testing.T) {
 }
 
 func Test_AWS_ListResources(t *testing.T) {
-	t.Skip("Skipping until we resolve https://github.com/radius-project/radius/issues/6535")
 	ctx := context.Background()
 
 	var bucketName = generateS3BucketName()