Merge branch 'main' into aws-retry

Author: willdavsmith

.devcontainer/contributor/devcontainer.json renamed to .devcontainer/devcontainer.json

@@ -17,7 +17,7 @@ updates:
         patterns:
           - "*"
   - package-ecosystem: "devcontainers"
-    directory: "/.devcontainer/contributor"
+    directory: "/"
     schedule:
       interval: weekly
     groups:

.github/dependabot.yml

@@ -758,6 +758,13 @@ jobs:
             }
           }
           EOF
+      - name: Restore Bicep artifacts before running functional tests
+      # The exact files chosen to run the command can be changed, but we need 1 that uses the Radius extension and 1 that uses the AWS extension so we can restore both Bicep artifacts before the tests start
+        run: |
+          # Restore Radius Bicep types
+          bicep restore ./test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep --force
+          # Restore AWS Bicep types 
+          bicep restore ./test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep --force
       - name: Run functional tests
         run: |
           # Ensure rad cli is in path before running tests.

.github/workflows/functional-test-cloud.yaml

@@ -374,7 +374,7 @@ jobs:
           BICEP_RECIPE_TAG_VERSION: ${{ env.REL_VERSION }}
           TEMP_CERT_DIR: ${{ steps.create-local-registry.outputs.temp-cert-dir }}
           SSL_CERT_FILE: ${{ steps.create-local-registry.outputs.temp-cert-dir }}/certs/${{ env.LOCAL_REGISTRY_SERVER }}/client.crt
-      
+
       - name: Run functional tests
         run: |
           # Ensure rad cli is in path before running tests.