From 6aeb77a2506e4584a483252de512cf8a3a8d361e Mon Sep 17 00:00:00 2001
From: Shruthi Kumar <shruthikumar@microsoft.com>
Date: Mon, 22 Jul 2024 12:59:54 -0700
Subject: [PATCH] Update validate bicep workflow (#7702)

Update validate bicep workflow

<!--

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 fixes a bug in Radius and has an approved issue
(issue link required).
- This pull request adds or changes features of Radius and has an
approved issue (issue link required).
- 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: #issue_number

---------

Signed-off-by: sk593 <shruthikumar@microsoft.com>
---
 .github/workflows/build.yaml                     |  5 +++--
 .github/workflows/validate-bicep.yaml            | 16 +++++++---------
 bicepconfig.json                                 | 11 +++++++++++
 build/validate-bicep.sh                          | 13 +++++++------
 hack/bicep-types-radius/generated/index.json     |  2 +-
 .../src/generator/src/cmd/generate.ts            |  2 +-
 ...rerp-kubernetes-cli-app-empty-resources.bicep |  2 +-
 .../corerp-kubernetes-cli-parameters.bicep       |  2 +-
 .../corerp-kubernetes-cli-run-portforward.bicep  |  2 +-
 .../testdata/corerp-kubernetes-cli-run.bicep     |  2 +-
 .../corerp-kubernetes-cli-with-resources.bicep   |  2 +-
 ...ernetes-cli-with-unassociated-resources.bicep |  2 +-
 .../testdata/corerp-kubernetes-cli.bicep         |  2 +-
 .../testdata/corerp-resources-recipe-env.bicep   |  2 +-
 ...-withcreateandwritepropertyupdate.step1.bicep |  2 +-
 ...-withcreateandwritepropertyupdate.step2.bicep |  2 +-
 ...nics-redeploy-withupdatedresource.step1.bicep |  2 +-
 ...nics-redeploy-withupdatedresource.step2.bicep |  2 +-
 .../testdata/aws-multi-identifier.bicep          |  2 +-
 .../testdata/aws-s3-bucket-existing.bicep        |  2 +-
 .../cloud/resources/testdata/aws-s3-bucket.bicep |  2 +-
 ...orerp-azure-connection-database-service.bicep |  2 +-
 .../corerp-resources-container-workload.bicep    |  2 +-
 ...corerp-resources-extender-aws-s3-recipe.bicep |  2 +-
 ...corerp-resources-terraform-azurestorage.bicep |  2 +-
 ...ources-terraform-private-git-repo-redis.bicep |  2 +-
 .../corerp-resources-volume-azure-keyvault.bicep |  2 +-
 .../corerp-mechanics-communication-cycle.bicep   |  2 +-
 .../corerp-mechanics-invalid-resourceids.bicep   |  2 +-
 .../corerp-mechanics-nestedmodules.bicep         |  2 +-
 ...nics-redeploy-withanotherresource.step1.bicep |  2 +-
 ...nics-redeploy-withanotherresource.step2.bicep |  2 +-
 ...-redeploy-withtwoseparateresource.step1.bicep |  2 +-
 ...-redeploy-withtwoseparateresource.step2.bicep |  2 +-
 ...nics-redeploy-withupdatedresource.step1.bicep |  2 +-
 ...nics-redeploy-withupdatedresource.step2.bicep |  2 +-
 .../k8s-extensibility/connection-string.bicep    |  4 ++--
 ...corerp-mechanics-nestedmodules-innerapp.bicep |  2 +-
 ...corerp-mechanics-nestedmodules-outerapp.bicep |  2 +-
 ...-resources-friendly-container-version-1.bicep |  4 ++--
 ...-resources-friendly-container-version-2.bicep |  2 +-
 .../corerp-azure-container-manualscale.bicep     |  2 +-
 .../testdata/corerp-resources-app-env.bicep      |  2 +-
 .../corerp-resources-application-graph.bicep     |  2 +-
 .../testdata/corerp-resources-application.bicep  |  2 +-
 ...erp-resources-container-bad-healthprobe.bicep |  2 +-
 .../corerp-resources-container-cmd-args.bicep    |  2 +-
 ...-resources-container-liveness-readiness.bicep |  2 +-
 ...rp-resources-container-manifest-sidecar.bicep |  2 +-
 .../corerp-resources-container-manifest.bicep    |  2 +-
 ...-multiple-containers-multiple-ports-dns.bicep |  2 +-
 ...rerp-resources-container-multiple-ports.bicep |  2 +-
 ...s-container-nonexistent-container-image.bicep |  2 +-
 ...esources-container-optional-port-scheme.bicep |  2 +-
 ...corerp-resources-container-pod-patching.bicep |  2 +-
 ...-resources-container-single-dns-request.bicep |  2 +-
 ...s-container-single-dns-service-creation.bicep |  2 +-
 ...-resources-container-two-containers-dns.bicep |  2 +-
 .../testdata/corerp-resources-container.bicep    |  2 +-
 .../testdata/corerp-resources-environment.bicep  |  2 +-
 .../corerp-resources-extender-recipe.bicep       |  8 +++++---
 .../testdata/corerp-resources-extender.bicep     | 11 ++++++-----
 .../testdata/corerp-resources-gateway-dns.bicep  |  2 +-
 .../corerp-resources-gateway-failure.bicep       |  2 +-
 ...rp-resources-gateway-kubernetesmetadata.bicep |  2 +-
 ...corerp-resources-gateway-sslpassthrough.bicep |  6 +++---
 ...corerp-resources-gateway-tlstermination.bicep |  2 +-
 ...-resources-httproute-kubernetesmetadata.bicep |  2 +-
 .../corerp-resources-kubemetadata-cascade.bicep  |  2 +-
 ...corerp-resources-kubemetadata-container.bicep |  2 +-
 ...ces-recipe-bicep-resourcecreation.step0.bicep |  2 +-
 ...ces-recipe-bicep-resourcecreation.step1.bicep |  2 +-
 .../testdata/corerp-resources-recipe-bicep.bicep |  2 +-
 .../corerp-resources-recipe-notfound.bicep       |  2 +-
 .../testdata/corerp-resources-simulatedenv.bicep |  2 +-
 .../corerp-resources-terraform-context.bicep     |  2 +-
 .../corerp-resources-terraform-postgres.bicep    |  2 +-
 ...rp-resources-terraform-recipe-terraform.bicep |  2 +-
 .../corerp-resources-terraform-redis.bicep       |  2 +-
 ...aprrp-resources-component-name-conflict.bicep |  2 +-
 .../daprrp-resources-pubsub-broker-manual.bicep  |  2 +-
 .../daprrp-resources-pubsub-broker-recipe.bicep  |  2 +-
 .../daprrp-resources-secretstore-manual.bicep    |  2 +-
 .../daprrp-resources-secretstore-recipe.bicep    |  2 +-
 .../daprrp-resources-serviceinvocation.bicep     |  2 +-
 .../daprrp-resources-statestore-manual.bicep     |  2 +-
 .../daprrp-resources-statestore-recipe.bicep     |  2 +-
 .../datastoresrp-resources-microsoft-sql.bicep   |  4 ++--
 .../datastoresrp-resources-mongodb-recipe.bicep  |  4 ++--
 ...storesrp-resources-redis-default-recipe.bicep |  2 +-
 .../datastoresrp-resources-redis-manual.bicep    |  4 ++--
 .../datastoresrp-resources-redis-recipe.bicep    |  2 +-
 ...astoresrp-resources-simulatedenv-recipe.bicep |  4 ++--
 .../datastoresrp-resources-sqldb-manual.bicep    |  4 ++--
 .../datastoresrp-resources-sqldb-recipe.bicep    |  4 ++--
 .../datastoresrp-rs-mongodb-manual.bicep         |  4 ++--
 .../noncloud/testdata/tutorial-environment.bicep |  2 +-
 .../msgrp-resources-rabbitmq-recipe.bicep        |  2 +-
 .../testdata/msgrp-resources-rabbitmq.bicep      |  2 +-
 .../noncloud/testdata/tutorial-environment.bicep |  2 +-
 .../modules/ama-metrics-setting-configmap.bicep  |  2 +-
 test/testrecipes/modules/redis-selfhost.bicep    |  4 ++--
 .../test-bicep-recipes/_resource-creation.bicep  |  2 +-
 .../test-bicep-recipes/dapr-pubsub-broker.bicep  |  4 ++--
 .../test-bicep-recipes/dapr-secret-store.bicep   |  4 ++--
 .../test-bicep-recipes/dapr-state-store.bicep    |  4 ++--
 .../test-bicep-recipes/extender-recipe.bicep     |  4 ++--
 .../extenders-aws-s3-recipe.bicep                |  2 +-
 .../test-bicep-recipes/language-failure.bicep    |  2 +-
 .../mongodb-recipe-kubernetes.bicep              |  4 ++--
 .../test-bicep-recipes/rabbitmq-recipe.bicep     |  4 ++--
 .../redis-recipe-value-backed.bicep              |  6 +++---
 .../resource-creation-failure.bicep              |  2 +-
 .../test-bicep-recipes/resource-creation.bicep   |  2 +-
 .../test-bicep-recipes/sqldb-recipe.bicep        |  4 ++--
 115 files changed, 169 insertions(+), 155 deletions(-)
 create mode 100644 bicepconfig.json

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 18756e0082..7f626c9a47 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -283,7 +283,7 @@ jobs:
           node-version: '18'
       - name: Generate Bicep extensibility types from OpenAPI specs
         run: |
-          make generate-bicep-types VERSION=${{ env.REL_VERSION == 'edge' && 'latest' || env.REL_VERSION }}
+          make generate-bicep-types VERSION=${{ env.REL_CHANNEL == 'edge' && 'latest' || env.REL_CHANNEL }}
       - name: Upload Radius Bicep types artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -300,11 +300,12 @@ jobs:
         run: |
           curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64
           chmod +x ./bicep
+          sudo mv ./bicep /usr/local/bin/bicep
           bicep --version
       - name: Publish bicep types 
         if: github.repository == 'radius-project/radius' && ((startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main'))
         run: |
-          bicep publish-provider ./hack/bicep-types-radius/generated/index.json --target br:${{ env.BICEP_TYPES_REGISTRY }}/radius:${{ env.REL_VERSION == 'edge' && 'latest' || env.REL_VERSION }} --force
+          bicep publish-extension ./hack/bicep-types-radius/generated/index.json --target br:${{ env.BICEP_TYPES_REGISTRY }}/radius:${{ env.REL_CHANNEL == 'edge' && 'latest' || env.REL_CHANNEL }} --force
 
   publish-release:
     name: Publish GitHub Release
diff --git a/.github/workflows/validate-bicep.yaml b/.github/workflows/validate-bicep.yaml
index cfcb5e045e..4db2c85865 100644
--- a/.github/workflows/validate-bicep.yaml
+++ b/.github/workflows/validate-bicep.yaml
@@ -33,17 +33,15 @@ jobs:
     name: Validate Bicep Code
     runs-on: ubuntu-latest
     steps:
+      - name: Setup and verify bicep CLI
+        run: |
+          curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64
+          chmod +x ./bicep
+          sudo mv ./bicep /usr/local/bin/bicep
+          bicep --version
       - name: Check out repo
         uses: actions/checkout@v4
-      - name: Parse release version and set environment variables
-        run: python ./.github/scripts/get_release_version.py
-      - uses: oras-project/setup-oras@main
-      - name: Download rad-bicep
-        run: |
-          oras pull ghcr.io/radius-project/radius/bicep/rad-bicep/linux-x64:latest -o ./
-          chmod +x rad-bicep
-          ./rad-bicep --version
       - name: Verify Bicep files
         run: ./build/validate-bicep.sh
         env:
-          BICEP_PATH: './rad-bicep'
+          BICEP_PATH: 'bicep'
diff --git a/bicepconfig.json b/bicepconfig.json
new file mode 100644
index 0000000000..65aa584422
--- /dev/null
+++ b/bicepconfig.json
@@ -0,0 +1,11 @@
+{
+	"experimentalFeaturesEnabled": {
+		"extensibility": true,
+		"extensionRegistry": true,
+		"dynamicTypeLoading": true
+	},
+	"extensions": {
+		"radius": "br:biceptypes.azurecr.io/radius:latest",
+		"aws": "br:biceptypes.azurecr.io/aws:latest"
+	}
+}
\ No newline at end of file
diff --git a/build/validate-bicep.sh b/build/validate-bicep.sh
index 2d52a61c58..6fe122f18d 100755
--- a/build/validate-bicep.sh
+++ b/build/validate-bicep.sh
@@ -5,22 +5,23 @@ then
     exit 1
 fi
 
+WARNING_MSG="WARNING: The following experimental Bicep features"
 FILES=$(find . -type f -name "*.bicep")
 FAILURES=()
 for F in $FILES
 do
     echo "validating $F"
-    # We need to run the rad-bicep and fail in one of two cases:
+    # We need to run bicep and fail in one of two cases:
     # - non-zero exit code
     # - non-empty stderr 
     #
     # We also don't want to dirty any files on disk.
     #
     # This complicated little block does that:
-    # - Compiled output (ARM templates) go to rad-bicep's stdout
-    # - rad-bicep's stdout goes to /dev/null
-    # - rad-bicep's stderr goes to the variable
-    if grep -q "import radius as radius" $F
+    # - Compiled output (ARM templates) go to bicep's stdout
+    # - bicep's stdout goes to /dev/null
+    # - bicep's stderr goes to the variable
+    if grep -q "extension radius" $F
     then
         exec 3>&1
         echo "running: $BICEP_PATH build $F"
@@ -29,7 +30,7 @@ do
         exec 3>&-
     fi
     
-    if [[ ! $EXITCODE -eq 0 || ! -z $STDERR ]]
+    if [[ ! $EXITCODE -eq 0 || (! -z $STDERR && ! $STDERR == $WARNING_MSG* ) ]]
     then
         echo $STDERR
         FAILURES+=$F
diff --git a/hack/bicep-types-radius/generated/index.json b/hack/bicep-types-radius/generated/index.json
index 40e1e105d8..9d872bf378 100644
--- a/hack/bicep-types-radius/generated/index.json
+++ b/hack/bicep-types-radius/generated/index.json
@@ -45,7 +45,7 @@
   },
   "resourceFunctions": {},
   "settings": {
-    "name": "radius",
+    "name": "Radius",
     "version": "latest",
     "isSingleton": false
   }
diff --git a/hack/bicep-types-radius/src/generator/src/cmd/generate.ts b/hack/bicep-types-radius/src/generator/src/cmd/generate.ts
index aeeb0fdd7c..e3507a5368 100644
--- a/hack/bicep-types-radius/src/generator/src/cmd/generate.ts
+++ b/hack/bicep-types-radius/src/generator/src/cmd/generate.ts
@@ -256,7 +256,7 @@ async function buildTypeIndex(logger: ILogger, baseDir: string, version: string)
       types: readTypesJson(content),
     });
   }
-  const indexContent = await buildIndex(typeFiles,  log => logOut(logger, log), {name: "radius", version: version, isSingleton: false} as TypeSettings);
+  const indexContent = await buildIndex(typeFiles,  log => logOut(logger, log), {name: "Radius", version: version, isSingleton: false} as TypeSettings);
 
   await writeFile(`${baseDir}/index.json`, writeIndexJson(indexContent));
   await writeFile(`${baseDir}/index.md`, writeIndexMarkdown(indexContent));
diff --git a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-app-empty-resources.bicep b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-app-empty-resources.bicep
index dc16d2772a..0b46ad4080 100644
--- a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-app-empty-resources.bicep
+++ b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-app-empty-resources.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-parameters.bicep b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-parameters.bicep
index d2cfe4fd67..ea29b9e22c 100644
--- a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-parameters.bicep
+++ b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-parameters.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-run-portforward.bicep b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-run-portforward.bicep
index 09fab41a0f..5c25c82107 100644
--- a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-run-portforward.bicep
+++ b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-run-portforward.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param application string
 
diff --git a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-run.bicep b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-run.bicep
index 9a5c4f4396..1536685781 100644
--- a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-run.bicep
+++ b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-run.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param application string
 
diff --git a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-with-resources.bicep b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-with-resources.bicep
index d233c4931f..19a01c83b4 100644
--- a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-with-resources.bicep
+++ b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-with-resources.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-with-unassociated-resources.bicep b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-with-unassociated-resources.bicep
index 7851aa4046..5823db5c2c 100644
--- a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-with-unassociated-resources.bicep
+++ b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-with-unassociated-resources.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli.bicep b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli.bicep
index 59dc9771eb..2ea15947b1 100644
--- a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli.bicep
+++ b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/cli/noncloud/testdata/corerp-resources-recipe-env.bicep b/test/functional-portable/cli/noncloud/testdata/corerp-resources-recipe-env.bicep
index 9076ae069c..c265a4b7a2 100644
--- a/test/functional-portable/cli/noncloud/testdata/corerp-resources-recipe-env.bicep
+++ b/test/functional-portable/cli/noncloud/testdata/corerp-resources-recipe-env.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withcreateandwritepropertyupdate.step1.bicep b/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withcreateandwritepropertyupdate.step1.bicep
index 62261fd452..8a14d32797 100644
--- a/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withcreateandwritepropertyupdate.step1.bicep
+++ b/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withcreateandwritepropertyupdate.step1.bicep
@@ -1,4 +1,4 @@
-import aws as aws
+extension aws
 
 param creationTimestamp string
 param dbSubnetGroupName string
diff --git a/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withcreateandwritepropertyupdate.step2.bicep b/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withcreateandwritepropertyupdate.step2.bicep
index c8bdde1a7a..08a445b0b1 100644
--- a/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withcreateandwritepropertyupdate.step2.bicep
+++ b/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withcreateandwritepropertyupdate.step2.bicep
@@ -1,4 +1,4 @@
-import aws as aws
+extension aws
 
 param creationTimestamp string
 param dbSubnetGroupName string
diff --git a/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withupdatedresource.step1.bicep b/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withupdatedresource.step1.bicep
index 52c56f9127..b3597c6d92 100644
--- a/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withupdatedresource.step1.bicep
+++ b/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withupdatedresource.step1.bicep
@@ -1,4 +1,4 @@
-import aws as aws
+extension aws
 
 param creationTimestamp string
 param bucketName string
diff --git a/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withupdatedresource.step2.bicep b/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withupdatedresource.step2.bicep
index 109f502a2d..09732f64f0 100644
--- a/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withupdatedresource.step2.bicep
+++ b/test/functional-portable/corerp/cloud/mechanics/testdata/aws-mechanics-redeploy-withupdatedresource.step2.bicep
@@ -1,4 +1,4 @@
-import aws as aws
+extension aws
 
 param creationTimestamp string
 param bucketName string
diff --git a/test/functional-portable/corerp/cloud/resources/testdata/aws-multi-identifier.bicep b/test/functional-portable/corerp/cloud/resources/testdata/aws-multi-identifier.bicep
index 0498c8d3b9..2ca905ec60 100644
--- a/test/functional-portable/corerp/cloud/resources/testdata/aws-multi-identifier.bicep
+++ b/test/functional-portable/corerp/cloud/resources/testdata/aws-multi-identifier.bicep
@@ -1,4 +1,4 @@
-import aws as aws
+extension aws
 
 param creationTimestamp string
 param filterName string
diff --git a/test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket-existing.bicep b/test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket-existing.bicep
index b4bc4cd954..b942e44b7d 100644
--- a/test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket-existing.bicep
+++ b/test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket-existing.bicep
@@ -1,4 +1,4 @@
-import aws as aws
+extension aws
 
 param bucketName string
 
diff --git a/test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep b/test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep
index 52c56f9127..b3597c6d92 100644
--- a/test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep
+++ b/test/functional-portable/corerp/cloud/resources/testdata/aws-s3-bucket.bicep
@@ -1,4 +1,4 @@
-import aws as aws
+extension aws
 
 param creationTimestamp string
 param bucketName string
diff --git a/test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep b/test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep
index 0dde82220d..da644dc82a 100644
--- a/test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep
+++ b/test/functional-portable/corerp/cloud/resources/testdata/corerp-azure-connection-database-service.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param magpieimage string
 
diff --git a/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-container-workload.bicep b/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-container-workload.bicep
index fd2490f273..13ade6ed20 100644
--- a/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-container-workload.bicep
+++ b/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-container-workload.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'eastus'
diff --git a/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-extender-aws-s3-recipe.bicep b/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-extender-aws-s3-recipe.bicep
index d2c4fec050..aba651ece7 100644
--- a/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-extender-aws-s3-recipe.bicep
+++ b/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-extender-aws-s3-recipe.bicep
@@ -1,4 +1,4 @@
-import radius as rad
+extension radius
 
 param bucketName string
 param creationTimestamp string
diff --git a/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-terraform-azurestorage.bicep b/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-terraform-azurestorage.bicep
index e560de7606..46ad6ee876 100644
--- a/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-terraform-azurestorage.bicep
+++ b/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-terraform-azurestorage.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param location string = resourceGroup().location
 
diff --git a/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-terraform-private-git-repo-redis.bicep b/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-terraform-private-git-repo-redis.bicep
index c9c071d188..f477b81c2d 100644
--- a/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-terraform-private-git-repo-redis.bicep
+++ b/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-terraform-private-git-repo-redis.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Name of the Redis Cache resource.')
 param redisCacheName string
diff --git a/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-volume-azure-keyvault.bicep b/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-volume-azure-keyvault.bicep
index f7d91569e0..ad7d69ffa3 100644
--- a/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-volume-azure-keyvault.bicep
+++ b/test/functional-portable/corerp/cloud/resources/testdata/corerp-resources-volume-azure-keyvault.bicep
@@ -5,7 +5,7 @@
 // 3. Create Keyvault volume.
 // 4. Create container which associated keyvault volume.
 
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-communication-cycle.bicep b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-communication-cycle.bicep
index 67fe42378e..f3e9d196ff 100644
--- a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-communication-cycle.bicep
+++ b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-communication-cycle.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-invalid-resourceids.bicep b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-invalid-resourceids.bicep
index fd99bba623..e396ed85c9 100644
--- a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-invalid-resourceids.bicep
+++ b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-invalid-resourceids.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-nestedmodules.bicep b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-nestedmodules.bicep
index 3547809612..755c516139 100644
--- a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-nestedmodules.bicep
+++ b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-nestedmodules.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withanotherresource.step1.bicep b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withanotherresource.step1.bicep
index 97b5b7c34e..fbfbaa3b8d 100644
--- a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withanotherresource.step1.bicep
+++ b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withanotherresource.step1.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withanotherresource.step2.bicep b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withanotherresource.step2.bicep
index 6d4c99baa6..64690ea855 100644
--- a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withanotherresource.step2.bicep
+++ b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withanotherresource.step2.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withtwoseparateresource.step1.bicep b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withtwoseparateresource.step1.bicep
index 08f1e295c9..a67f10a0d7 100644
--- a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withtwoseparateresource.step1.bicep
+++ b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withtwoseparateresource.step1.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withtwoseparateresource.step2.bicep b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withtwoseparateresource.step2.bicep
index aae6c2fdb7..aa5fe6e61e 100644
--- a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withtwoseparateresource.step2.bicep
+++ b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withtwoseparateresource.step2.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withupdatedresource.step1.bicep b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withupdatedresource.step1.bicep
index 7c6f7e7cb7..38d5d375a3 100644
--- a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withupdatedresource.step1.bicep
+++ b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withupdatedresource.step1.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withupdatedresource.step2.bicep b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withupdatedresource.step2.bicep
index 1638af4f6c..d882dd9381 100644
--- a/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withupdatedresource.step2.bicep
+++ b/test/functional-portable/corerp/noncloud/mechanics/testdata/corerp-mechanics-redeploy-withupdatedresource.step2.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/mechanics/testdata/k8s-extensibility/connection-string.bicep b/test/functional-portable/corerp/noncloud/mechanics/testdata/k8s-extensibility/connection-string.bicep
index 6f66d3812c..411b672b9f 100644
--- a/test/functional-portable/corerp/noncloud/mechanics/testdata/k8s-extensibility/connection-string.bicep
+++ b/test/functional-portable/corerp/noncloud/mechanics/testdata/k8s-extensibility/connection-string.bicep
@@ -1,7 +1,7 @@
-import kubernetes as kubernetes {
+extension kubernetes with {
   namespace: 'corerp-mechanics-k8s-extensibility'
   kubeConfig: ''
-}
+} as kubernetes
 
 resource redisService 'core/Service@v1' existing = {
   metadata: {
diff --git a/test/functional-portable/corerp/noncloud/mechanics/testdata/modules/corerp-mechanics-nestedmodules-innerapp.bicep b/test/functional-portable/corerp/noncloud/mechanics/testdata/modules/corerp-mechanics-nestedmodules-innerapp.bicep
index de0bc2d0e8..ca36f118f7 100644
--- a/test/functional-portable/corerp/noncloud/mechanics/testdata/modules/corerp-mechanics-nestedmodules-innerapp.bicep
+++ b/test/functional-portable/corerp/noncloud/mechanics/testdata/modules/corerp-mechanics-nestedmodules-innerapp.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param location string
 param environment string
diff --git a/test/functional-portable/corerp/noncloud/mechanics/testdata/modules/corerp-mechanics-nestedmodules-outerapp.bicep b/test/functional-portable/corerp/noncloud/mechanics/testdata/modules/corerp-mechanics-nestedmodules-outerapp.bicep
index b63904d2c5..c359c147ce 100644
--- a/test/functional-portable/corerp/noncloud/mechanics/testdata/modules/corerp-mechanics-nestedmodules-outerapp.bicep
+++ b/test/functional-portable/corerp/noncloud/mechanics/testdata/modules/corerp-mechanics-nestedmodules-outerapp.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param location string
 param environment string
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/containers/corerp-resources-friendly-container-version-1.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/containers/corerp-resources-friendly-container-version-1.bicep
index 1d89e6aa23..865cbcb717 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/containers/corerp-resources-friendly-container-version-1.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/containers/corerp-resources-friendly-container-version-1.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param magpieimage string
 param environment string
@@ -19,7 +19,7 @@ resource webapp 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: magpieimage
       env: {
-        DBCONNECTION: redis.connectionString()
+        DBCONNECTION: redis.listSecrets().connectionString
       }
       readinessProbe: {
         kind: 'httpGet'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/containers/corerp-resources-friendly-container-version-2.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/containers/corerp-resources-friendly-container-version-2.bicep
index 8fa0362d7a..a4567993d3 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/containers/corerp-resources-friendly-container-version-2.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/containers/corerp-resources-friendly-container-version-2.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param magpieimage string
 param environment string
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-azure-container-manualscale.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-azure-container-manualscale.bicep
index 4b15f58401..ce6f56f52f 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-azure-container-manualscale.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-azure-container-manualscale.bicep
@@ -1,5 +1,5 @@
 
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-app-env.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-app-env.bicep
index 2c9b4facef..47ee428373 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-app-env.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-app-env.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-application-graph.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-application-graph.bicep
index 94f5a75522..da91e467f3 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-application-graph.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-application-graph.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'local'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-application.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-application.bicep
index f978ddd412..08dfcabc65 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-application.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-application.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'local'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-bad-healthprobe.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-bad-healthprobe.bicep
index c256c3fba6..ae8eeebdee 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-bad-healthprobe.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-bad-healthprobe.bicep
@@ -1,5 +1,5 @@
 
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-cmd-args.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-cmd-args.bicep
index 7b1c3966f2..b7ac37688c 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-cmd-args.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-cmd-args.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-liveness-readiness.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-liveness-readiness.bicep
index b720fe546a..02d1395c0d 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-liveness-readiness.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-liveness-readiness.bicep
@@ -1,5 +1,5 @@
 
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-manifest-sidecar.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-manifest-sidecar.bicep
index d96ee99879..c1a0ee2a9f 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-manifest-sidecar.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-manifest-sidecar.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-manifest.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-manifest.bicep
index 224545e716..a0366edf49 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-manifest.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-manifest.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-multiple-containers-multiple-ports-dns.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-multiple-containers-multiple-ports-dns.bicep
index efb48cd786..85615ce2dd 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-multiple-containers-multiple-ports-dns.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-multiple-containers-multiple-ports-dns.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-multiple-ports.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-multiple-ports.bicep
index 89f7db3b10..6030ca6896 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-multiple-ports.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-multiple-ports.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-nonexistent-container-image.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-nonexistent-container-image.bicep
index ec9ee95450..4e234f7c09 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-nonexistent-container-image.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-nonexistent-container-image.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-optional-port-scheme.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-optional-port-scheme.bicep
index e43cef321e..550cb816a2 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-optional-port-scheme.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-optional-port-scheme.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-pod-patching.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-pod-patching.bicep
index 399b85ca57..ffba7eb692 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-pod-patching.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-pod-patching.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-single-dns-request.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-single-dns-request.bicep
index feb0eec926..dad8f20c39 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-single-dns-request.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-single-dns-request.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-single-dns-service-creation.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-single-dns-service-creation.bicep
index 49240bdc1f..6f93fbb5b8 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-single-dns-service-creation.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-single-dns-service-creation.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-two-containers-dns.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-two-containers-dns.bicep
index 71be712c6b..14b6cdbf8e 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-two-containers-dns.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container-two-containers-dns.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container.bicep
index 412f540cee..52cd8470c4 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-container.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-environment.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-environment.bicep
index 26d4c83ea4..87e3ee7858 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-environment.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-environment.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-extender-recipe.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-extender-recipe.bicep
index bca6d696ed..cb83a62f6d 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-extender-recipe.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-extender-recipe.bicep
@@ -1,13 +1,15 @@
-import radius as radius
+extension radius
 
 @description('The OCI registry for test Bicep recipes.')
 param registry string
 @description('The OCI tag for test Bicep recipes.')
 param version string
+@description('Specifies the location for resources.')
+param location string = 'global'
 
 resource env 'Applications.Core/environments@2023-10-01-preview' = {
   name: 'corerp-resources-extender-recipe-env'
-  location: 'global'
+  location: location
   properties: {
     compute: {
       kind: 'kubernetes'
@@ -30,7 +32,7 @@ resource env 'Applications.Core/environments@2023-10-01-preview' = {
 
 resource app 'Applications.Core/applications@2023-10-01-preview' = {
   name: 'corerp-resources-extender-recipe'
-  location: 'global'
+  location: location
   properties: {
     environment: env.id
     extensions: [
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-extender.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-extender.bicep
index bbd81118b9..70143fdcc5 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-extender.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-extender.bicep
@@ -1,11 +1,12 @@
-import radius as radius
+extension radius
 
 param magpieimage string
 param environment string 
+param location string = 'global'
 
 resource app 'Applications.Core/applications@2023-10-01-preview' = {
   name: 'corerp-resources-extender'
-  location: 'global'
+  location: location
   properties: {
     environment: environment
   }
@@ -26,15 +27,15 @@ resource twilio 'Applications.Core/extenders@2023-10-01-preview' = {
 
 resource container 'Applications.Core/containers@2023-10-01-preview' = {
   name: 'extr-ctnr'
-  location: 'global'
+  location: location
   properties: {
     application: app.id
     container: {
       image: magpieimage
       env: {
         TWILIO_NUMBER: twilio.properties.fromNumber
-        TWILIO_SID: twilio.secrets('accountSid')
-        TWILIO_ACCOUNT: twilio.secrets('authToken')
+        TWILIO_SID: twilio.listSecrets().accountSid
+        TWILIO_ACCOUNT: twilio.listSecrets().authToken
       }
     }
     connections: {}
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-dns.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-dns.bicep
index 55c1fb6322..298aad6acf 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-dns.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-dns.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'local'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-failure.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-failure.bicep
index 8fbecadc0e..60a338fced 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-failure.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-failure.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('ID of the Radius Environment. Passed in automatically via the rad CLI')
 param environment string
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-kubernetesmetadata.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-kubernetesmetadata.bicep
index 0f21d82eb5..4417712d88 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-kubernetesmetadata.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-kubernetesmetadata.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'local'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-sslpassthrough.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-sslpassthrough.bicep
index b922160e34..544e594f48 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-sslpassthrough.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-sslpassthrough.bicep
@@ -1,8 +1,8 @@
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: 'default'
-}
-import radius as radius
+} as kubernetes
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'local'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-tlstermination.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-tlstermination.bicep
index 4bb2b4f1dd..9553fb219e 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-tlstermination.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-tlstermination.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the environment for resources.')
 param environment string
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-httproute-kubernetesmetadata.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-httproute-kubernetesmetadata.bicep
index d09bc68513..04f07bc492 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-httproute-kubernetesmetadata.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-httproute-kubernetesmetadata.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-kubemetadata-cascade.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-kubemetadata-cascade.bicep
index 965008d940..2d583827c8 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-kubemetadata-cascade.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-kubemetadata-cascade.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-kubemetadata-container.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-kubemetadata-container.bicep
index 608c97d2ff..867ed054b5 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-kubemetadata-container.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-kubemetadata-container.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-bicep-resourcecreation.step0.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-bicep-resourcecreation.step0.bicep
index 6f6393b7fa..939e68b0bd 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-bicep-resourcecreation.step0.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-bicep-resourcecreation.step0.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('The OCI registry for test Bicep recipes.')
 param registry string
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-bicep-resourcecreation.step1.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-bicep-resourcecreation.step1.bicep
index c797819925..c66bbc3064 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-bicep-resourcecreation.step1.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-bicep-resourcecreation.step1.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('The base name of the test, used to qualify resources and namespaces. eg: corerp-resources-terraform-helloworld')
 param basename string
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-bicep.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-bicep.bicep
index cb30e86ec6..b84880bcec 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-bicep.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-bicep.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('The OCI registry for test Bicep recipes.')
 param registry string
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-notfound.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-notfound.bicep
index e18d9d39dc..3e4882c69b 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-notfound.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-recipe-notfound.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('The base name of the test, used to qualify resources and namespaces. eg: corerp-resources-terraform-helloworld')
 param basename string
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-simulatedenv.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-simulatedenv.bicep
index b0d0812b18..6c923bee3d 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-simulatedenv.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-simulatedenv.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'local'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-context.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-context.bicep
index c994f67c3a..c034454c4a 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-context.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-context.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('The URL of the server hosting test Terraform modules.')
 param moduleServer string
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-postgres.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-postgres.bicep
index d50c2a3fed..f102bdf6db 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-postgres.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-postgres.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('The URL of the server hosting test Terraform modules.')
 param moduleServer string
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-recipe-terraform.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-recipe-terraform.bicep
index 401102f47f..797b8535a8 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-recipe-terraform.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-recipe-terraform.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('The URL of the server hosting test Terraform modules.')
 param moduleServer string
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-redis.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-redis.bicep
index a5619fd0af..380d3647e7 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-redis.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-terraform-redis.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('The URL of the server hosting test Terraform modules.')
 param moduleServer string
diff --git a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-component-name-conflict.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-component-name-conflict.bicep
index 888c6ff068..9bdb5c7962 100644
--- a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-component-name-conflict.bicep
+++ b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-component-name-conflict.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param environment string
 
diff --git a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-pubsub-broker-manual.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-pubsub-broker-manual.bicep
index 39218a6580..c96ce0991f 100644
--- a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-pubsub-broker-manual.bicep
+++ b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-pubsub-broker-manual.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param magpieimage string
 param environment string
diff --git a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-pubsub-broker-recipe.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-pubsub-broker-recipe.bicep
index 04bd396d5e..ac287303db 100644
--- a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-pubsub-broker-recipe.bicep
+++ b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-pubsub-broker-recipe.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param magpieimage string
 param registry string
diff --git a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-secretstore-manual.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-secretstore-manual.bicep
index acd8f2652f..3792f745ea 100644
--- a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-secretstore-manual.bicep
+++ b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-secretstore-manual.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param magpieimage string
 
diff --git a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-secretstore-recipe.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-secretstore-recipe.bicep
index aa911c23e6..38acf00101 100644
--- a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-secretstore-recipe.bicep
+++ b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-secretstore-recipe.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param magpieimage string
 
diff --git a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-serviceinvocation.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-serviceinvocation.bicep
index 84737a9bb2..316b57d407 100644
--- a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-serviceinvocation.bicep
+++ b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-serviceinvocation.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param location string = resourceGroup().location
 param environment string
diff --git a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-statestore-manual.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-statestore-manual.bicep
index ed39af5123..c687cf3ee9 100644
--- a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-statestore-manual.bicep
+++ b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-statestore-manual.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param magpieimage string
 param environment string
diff --git a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-statestore-recipe.bicep b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-statestore-recipe.bicep
index 4054e67582..8514f5b439 100644
--- a/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-statestore-recipe.bicep
+++ b/test/functional-portable/daprrp/noncloud/resources/testdata/daprrp-resources-statestore-recipe.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param magpieimage string
 param registry string
diff --git a/test/functional-portable/datastoresrp/cloud/resources/testdata/datastoresrp-resources-microsoft-sql.bicep b/test/functional-portable/datastoresrp/cloud/resources/testdata/datastoresrp-resources-microsoft-sql.bicep
index 75ef07e1f9..66d13ab024 100644
--- a/test/functional-portable/datastoresrp/cloud/resources/testdata/datastoresrp-resources-microsoft-sql.bicep
+++ b/test/functional-portable/datastoresrp/cloud/resources/testdata/datastoresrp-resources-microsoft-sql.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'East US'
@@ -46,7 +46,7 @@ resource sqlapp 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: magpieImage
       env: {
-        CONNECTION_SQL_CONNECTIONSTRING: db.connectionString()
+        CONNECTION_SQL_CONNECTIONSTRING: db.listSecrets().connectionString
       }
       readinessProbe: {
         kind: 'httpGet'
diff --git a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-mongodb-recipe.bicep b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-mongodb-recipe.bicep
index 0cf26a0aca..1f80e4083c 100644
--- a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-mongodb-recipe.bicep
+++ b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-mongodb-recipe.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param registry string
 
@@ -53,7 +53,7 @@ resource webapp 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: magpieimage
       env: {
-        DBCONNECTION: recipedb.connectionString()
+        DBCONNECTION: recipedb.listSecrets().connectionString
       }
       readinessProbe: {
         kind: 'httpGet'
diff --git a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-redis-default-recipe.bicep b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-redis-default-recipe.bicep
index ea374b0476..a572869ffb 100644
--- a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-redis-default-recipe.bicep
+++ b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-redis-default-recipe.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param registry string
 
diff --git a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-redis-manual.bicep b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-redis-manual.bicep
index dc75968928..f453e2550c 100644
--- a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-redis-manual.bicep
+++ b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-redis-manual.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param magpieimage string
 param environment string
@@ -19,7 +19,7 @@ resource webapp 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: magpieimage
       env: {
-        DBCONNECTION: redis.connectionString()
+        DBCONNECTION: redis.listSecrets().connectionString
       }
       readinessProbe: {
         kind: 'httpGet'
diff --git a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-redis-recipe.bicep b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-redis-recipe.bicep
index 730bca5f95..75edd495a7 100644
--- a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-redis-recipe.bicep
+++ b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-redis-recipe.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param registry string
 
diff --git a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-simulatedenv-recipe.bicep b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-simulatedenv-recipe.bicep
index 8b8e867ed5..f1585f6364 100644
--- a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-simulatedenv-recipe.bicep
+++ b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-simulatedenv-recipe.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param registry string
 
@@ -54,7 +54,7 @@ resource webapp 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: magpieimage
       env: {
-        DBCONNECTION: recipedb.connectionString()
+        DBCONNECTION: recipedb.listSecrets().connectionString
       }
       readinessProbe: {
         kind: 'httpGet'
diff --git a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-sqldb-manual.bicep b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-sqldb-manual.bicep
index fdcb0bcefb..c30dd40801 100644
--- a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-sqldb-manual.bicep
+++ b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-sqldb-manual.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
@@ -46,7 +46,7 @@ resource webapp 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: magpieImage
       env: {
-        CONNECTION_SQL_CONNECTIONSTRING: db.connectionString()
+        CONNECTION_SQL_CONNECTIONSTRING: db.listSecrets().connectionString
       }
       readinessProbe: {
         kind: 'httpGet'
diff --git a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-sqldb-recipe.bicep b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-sqldb-recipe.bicep
index 9e438bf2bb..9f980e0186 100644
--- a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-sqldb-recipe.bicep
+++ b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-sqldb-recipe.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
@@ -71,7 +71,7 @@ resource webapp 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: magpieImage
       env: {
-        CONNECTION_SQL_CONNECTIONSTRING: db.connectionString()
+        CONNECTION_SQL_CONNECTIONSTRING: db.listSecrets().connectionString
       }
       readinessProbe: {
         kind: 'httpGet'
diff --git a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-rs-mongodb-manual.bicep b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-rs-mongodb-manual.bicep
index 3f472f87e9..930382836b 100644
--- a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-rs-mongodb-manual.bicep
+++ b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-rs-mongodb-manual.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Admin username for the Mongo database. Default is "admin"')
 param username string = 'admin'
@@ -43,7 +43,7 @@ resource mongoContainer 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: 'ghcr.io/radius-project/mirror/mongo:4.2'
       env: {
-        DBCONNECTION: mongo.connectionString()
+        DBCONNECTION: mongo.listSecrets().connectionString
         MONGO_INITDB_ROOT_USERNAME: username
         MONGO_INITDB_ROOT_PASSWORD: password
       }
diff --git a/test/functional-portable/kubernetes/noncloud/testdata/tutorial-environment.bicep b/test/functional-portable/kubernetes/noncloud/testdata/tutorial-environment.bicep
index 5c38e0074f..1097692274 100644
--- a/test/functional-portable/kubernetes/noncloud/testdata/tutorial-environment.bicep
+++ b/test/functional-portable/kubernetes/noncloud/testdata/tutorial-environment.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param name string
 param namespace string
diff --git a/test/functional-portable/messagingrp/noncloud/resources/testdata/msgrp-resources-rabbitmq-recipe.bicep b/test/functional-portable/messagingrp/noncloud/resources/testdata/msgrp-resources-rabbitmq-recipe.bicep
index a7860e9264..7924a5b488 100644
--- a/test/functional-portable/messagingrp/noncloud/resources/testdata/msgrp-resources-rabbitmq-recipe.bicep
+++ b/test/functional-portable/messagingrp/noncloud/resources/testdata/msgrp-resources-rabbitmq-recipe.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/messagingrp/noncloud/resources/testdata/msgrp-resources-rabbitmq.bicep b/test/functional-portable/messagingrp/noncloud/resources/testdata/msgrp-resources-rabbitmq.bicep
index a556218cf1..df2d9ecc6b 100644
--- a/test/functional-portable/messagingrp/noncloud/resources/testdata/msgrp-resources-rabbitmq.bicep
+++ b/test/functional-portable/messagingrp/noncloud/resources/testdata/msgrp-resources-rabbitmq.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
diff --git a/test/functional-portable/samples/noncloud/testdata/tutorial-environment.bicep b/test/functional-portable/samples/noncloud/testdata/tutorial-environment.bicep
index 3301e213fb..eb0ffc4ea6 100644
--- a/test/functional-portable/samples/noncloud/testdata/tutorial-environment.bicep
+++ b/test/functional-portable/samples/noncloud/testdata/tutorial-environment.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param registry string
 param version string
diff --git a/test/infra/azure/modules/ama-metrics-setting-configmap.bicep b/test/infra/azure/modules/ama-metrics-setting-configmap.bicep
index 2c5eb9c046..56bfb82c68 100644
--- a/test/infra/azure/modules/ama-metrics-setting-configmap.bicep
+++ b/test/infra/azure/modules/ama-metrics-setting-configmap.bicep
@@ -22,7 +22,7 @@ param prefix string = 'radius'
 
 var podAnnotationNamespaceRegex = 'podannotationnamespaceregex = "${prefix}.*"'
 
-import 'kubernetes@1.0.0' with {
+extension kubernetes with {
   namespace: 'default'
   kubeConfig: kubeConfig
 }
diff --git a/test/testrecipes/modules/redis-selfhost.bicep b/test/testrecipes/modules/redis-selfhost.bicep
index f463388288..80b9b88fff 100644
--- a/test/testrecipes/modules/redis-selfhost.bicep
+++ b/test/testrecipes/modules/redis-selfhost.bicep
@@ -1,7 +1,7 @@
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: namespace
-}
+} as kubernetes
 
 param namespace string
 param name string
diff --git a/test/testrecipes/test-bicep-recipes/_resource-creation.bicep b/test/testrecipes/test-bicep-recipes/_resource-creation.bicep
index 57fd43d280..013804d035 100644
--- a/test/testrecipes/test-bicep-recipes/_resource-creation.bicep
+++ b/test/testrecipes/test-bicep-recipes/_resource-creation.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param context object
 
diff --git a/test/testrecipes/test-bicep-recipes/dapr-pubsub-broker.bicep b/test/testrecipes/test-bicep-recipes/dapr-pubsub-broker.bicep
index 88c6ab7de5..075fbc87f3 100644
--- a/test/testrecipes/test-bicep-recipes/dapr-pubsub-broker.bicep
+++ b/test/testrecipes/test-bicep-recipes/dapr-pubsub-broker.bicep
@@ -1,7 +1,7 @@
-import kubernetes as kubernetes {
+extension kubernetes with {
   namespace: context.runtime.kubernetes.namespace
   kubeConfig: ''
-}
+} as kubernetes
 
 param context object
 
diff --git a/test/testrecipes/test-bicep-recipes/dapr-secret-store.bicep b/test/testrecipes/test-bicep-recipes/dapr-secret-store.bicep
index e1ef5d466b..d773959f4d 100644
--- a/test/testrecipes/test-bicep-recipes/dapr-secret-store.bicep
+++ b/test/testrecipes/test-bicep-recipes/dapr-secret-store.bicep
@@ -1,7 +1,7 @@
-import kubernetes as kubernetes {
+extension kubernetes with {
   namespace: context.runtime.kubernetes.namespace
   kubeConfig: ''
-}
+} as kubernetes
 
 param context object
 
diff --git a/test/testrecipes/test-bicep-recipes/dapr-state-store.bicep b/test/testrecipes/test-bicep-recipes/dapr-state-store.bicep
index 6d0b8c5bc8..8bfc70af02 100644
--- a/test/testrecipes/test-bicep-recipes/dapr-state-store.bicep
+++ b/test/testrecipes/test-bicep-recipes/dapr-state-store.bicep
@@ -1,7 +1,7 @@
-import kubernetes as kubernetes {
+extension kubernetes with {
   namespace: context.runtime.kubernetes.namespace
   kubeConfig: ''
-}
+} as kubernetes
 
 param context object
 
diff --git a/test/testrecipes/test-bicep-recipes/extender-recipe.bicep b/test/testrecipes/test-bicep-recipes/extender-recipe.bicep
index 9b957b4675..6c75b3b73d 100644
--- a/test/testrecipes/test-bicep-recipes/extender-recipe.bicep
+++ b/test/testrecipes/test-bicep-recipes/extender-recipe.bicep
@@ -1,7 +1,7 @@
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
-}
+} as kubernetes
 
 param context object
 param containerImage string
diff --git a/test/testrecipes/test-bicep-recipes/extenders-aws-s3-recipe.bicep b/test/testrecipes/test-bicep-recipes/extenders-aws-s3-recipe.bicep
index aa7e9d0b99..9805a8b624 100644
--- a/test/testrecipes/test-bicep-recipes/extenders-aws-s3-recipe.bicep
+++ b/test/testrecipes/test-bicep-recipes/extenders-aws-s3-recipe.bicep
@@ -1,4 +1,4 @@
-import aws as aws 
+extension aws
 
 param creationTimestamp string
 param bucketName string
diff --git a/test/testrecipes/test-bicep-recipes/language-failure.bicep b/test/testrecipes/test-bicep-recipes/language-failure.bicep
index e35fde96b4..94a3ac0863 100644
--- a/test/testrecipes/test-bicep-recipes/language-failure.bicep
+++ b/test/testrecipes/test-bicep-recipes/language-failure.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param context object
 
diff --git a/test/testrecipes/test-bicep-recipes/mongodb-recipe-kubernetes.bicep b/test/testrecipes/test-bicep-recipes/mongodb-recipe-kubernetes.bicep
index f8d59749d7..1658f7dcff 100644
--- a/test/testrecipes/test-bicep-recipes/mongodb-recipe-kubernetes.bicep
+++ b/test/testrecipes/test-bicep-recipes/mongodb-recipe-kubernetes.bicep
@@ -1,7 +1,7 @@
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
-}
+} as kubernetes
 
 param context object
 
diff --git a/test/testrecipes/test-bicep-recipes/rabbitmq-recipe.bicep b/test/testrecipes/test-bicep-recipes/rabbitmq-recipe.bicep
index e59b91a4cf..7b041b1dec 100644
--- a/test/testrecipes/test-bicep-recipes/rabbitmq-recipe.bicep
+++ b/test/testrecipes/test-bicep-recipes/rabbitmq-recipe.bicep
@@ -1,7 +1,7 @@
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
-}
+} as kubernetes
 
 param context object
 
diff --git a/test/testrecipes/test-bicep-recipes/redis-recipe-value-backed.bicep b/test/testrecipes/test-bicep-recipes/redis-recipe-value-backed.bicep
index 014b6d0bfc..4674c924c5 100644
--- a/test/testrecipes/test-bicep-recipes/redis-recipe-value-backed.bicep
+++ b/test/testrecipes/test-bicep-recipes/redis-recipe-value-backed.bicep
@@ -1,7 +1,7 @@
-import kubernetes as kubernetes {
+extension kubernetes with {
+  namespace: 'default'
   kubeConfig: ''
-  namespace: context.runtime.kubernetes.namespace
-}
+} as kubernetes
 
 param context object
 
diff --git a/test/testrecipes/test-bicep-recipes/resource-creation-failure.bicep b/test/testrecipes/test-bicep-recipes/resource-creation-failure.bicep
index f4e37f52db..3bf47816eb 100644
--- a/test/testrecipes/test-bicep-recipes/resource-creation-failure.bicep
+++ b/test/testrecipes/test-bicep-recipes/resource-creation-failure.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param context object
 
diff --git a/test/testrecipes/test-bicep-recipes/resource-creation.bicep b/test/testrecipes/test-bicep-recipes/resource-creation.bicep
index 389fb83624..8b3dcbb085 100644
--- a/test/testrecipes/test-bicep-recipes/resource-creation.bicep
+++ b/test/testrecipes/test-bicep-recipes/resource-creation.bicep
@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param context object
 
diff --git a/test/testrecipes/test-bicep-recipes/sqldb-recipe.bicep b/test/testrecipes/test-bicep-recipes/sqldb-recipe.bicep
index 1851af37c3..42e29ceeca 100644
--- a/test/testrecipes/test-bicep-recipes/sqldb-recipe.bicep
+++ b/test/testrecipes/test-bicep-recipes/sqldb-recipe.bicep
@@ -1,7 +1,7 @@
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
-}
+} as kubernetes
 
 param context object