Merge branch 'main' into youngp/enable-cli-test

radius-project · Jan 8, 2024 · 3d220a5 · 3d220a5
2 parents 8864e99 + fcd096e
commit 3d220a5
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 69 deletions.
diff --git 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
@@ -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()
@@ -92,65 +91,3 @@ func Test_AWSRedeployWithUpdatedResourceUpdatesResource(t *testing.T) {
 	})
 	test.Test(t)
 }
-
-func Test_AWSRedeployWithCreateAndWriteOnlyPropertyUpdate(t *testing.T) {
-	t.Skip("This test will fail because step 2 is updating a create-and-write-only property.")
-	name := "my-db"
-	templateFmt := "testdata/aws-mechanics-redeploy-withcreateandwriteonlypropertyupdate.step%d.bicep"
-	creationTimestamp := functional.GetCreationTimestamp()
-
-	test := shared.NewRPTest(t, name, []shared.TestStep{
-		{
-			Executor:                               step.NewDeployExecutor(fmt.Sprintf(templateFmt, 1), "creationTimestamp="+creationTimestamp),
-			SkipKubernetesOutputResourceValidation: true,
-			SkipObjectValidation:                   true,
-			SkipResourceDeletion:                   true,
-			AWSResources: &validation.AWSResourceSet{
-				Resources: []validation.AWSResource{
-					{
-						Name:       name,
-						Type:       validation.AWSRDSDBInstanceResourceType,
-						Identifier: name,
-						Properties: map[string]any{
-							"Endpoint": map[string]any{
-								"Port": 1444,
-							},
-							"Tags": []any{
-								map[string]any{
-									"Key":   "RadiusCreationTimestamp",
-									"Value": creationTimestamp,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			Executor:                               step.NewDeployExecutor(fmt.Sprintf(templateFmt, 2), "creationTimestamp="+creationTimestamp),
-			SkipKubernetesOutputResourceValidation: true,
-			SkipObjectValidation:                   true,
-			AWSResources: &validation.AWSResourceSet{
-				Resources: []validation.AWSResource{
-					{
-						Name:       name,
-						Type:       validation.AWSRDSDBInstanceResourceType,
-						Identifier: name,
-						Properties: map[string]any{
-							"Endpoint": map[string]any{
-								"Port": 1444,
-							},
-							"Tags": []any{
-								map[string]any{
-									"Key":   "RadiusCreationTimestamp",
-									"Value": creationTimestamp,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	})
-	test.Test(t)
-}
diff --git 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
@@ -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
@@ -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()