From 901d8c8c21c8873e264c689e32e35305e1f6d0ca Mon Sep 17 00:00:00 2001
From: sk593 <shruthikumar@microsoft.com>
Date: Wed, 10 Jul 2024 10:06:51 -0700
Subject: [PATCH] update to extensions

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

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 18756e0082c..e3cdde44794 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:
@@ -304,7 +304,7 @@ jobs:
       - 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/bicepconfig.json b/bicepconfig.json
index 0c267758972..65aa584422a 100644
--- a/bicepconfig.json
+++ b/bicepconfig.json
@@ -1,10 +1,10 @@
 {
 	"experimentalFeaturesEnabled": {
 		"extensibility": true,
-		"providerRegistry": true,
+		"extensionRegistry": true,
 		"dynamicTypeLoading": true
 	},
-	"providers": {
+	"extensions": {
 		"radius": "br:biceptypes.azurecr.io/radius:latest",
 		"aws": "br:biceptypes.azurecr.io/aws:latest"
 	}
diff --git a/build/validate-bicep.sh b/build/validate-bicep.sh
index 5071e7436f1..d254d91ed24 100755
--- a/build/validate-bicep.sh
+++ b/build/validate-bicep.sh
@@ -21,7 +21,7 @@ do
     # - 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 "provider radius" $F
+    if grep -q "extension radius" $F
     then
         exec 3>&1
         echo "running: $BICEP_PATH build $F"
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 ee86d8cef93..0b46ad40802 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 @@
-provider 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 91105ffdb61..ea29b9e22cd 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 @@
-provider 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 2bc809ba005..5c25c821078 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 @@
-provider 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 32b0400bad3..1536685781c 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 @@
-provider 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 a534144a675..19a01c83b4c 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 @@
-provider 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 4eef7e37fc2..5823db5c2cc 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 @@
-provider 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 dc66ef5c8f7..2ea15947b1a 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 @@
-provider 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 db127de20fc..c265a4b7a20 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 @@
-provider 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 343c27d2ff0..8a14d327970 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 @@
-provider 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 047289e35f9..08a445b0b19 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 @@
-provider 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 2cdb8cee0f3..b3597c6d920 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 @@
-provider 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 820644bd8bf..09732f64f0a 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 @@
-provider 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 4ea305719b7..2ca905ec608 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 @@
-provider 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 9754cb5784d..b942e44b7d0 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 @@
-provider 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 2cdb8cee0f3..b3597c6d920 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 @@
-provider 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 9e9fd65332c..da644dc82ad 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 @@
-provider 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 3b0e49dc6f8..13ade6ed20d 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 @@
-provider 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 5267934c1b9..aba651ece71 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 @@
-provider radius
+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 d844f6097cc..46ad6ee8762 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 @@
-provider 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 3e8e6bea192..f477b81c2d7 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 @@
-provider 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 8f7c941844c..ad7d69ffa33 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.
 
-provider 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 531498beffb..f3e9d196ff9 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 @@
-provider 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 140aeeba13e..e396ed85c9f 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 @@
-provider 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 8a58be729b2..755c516139b 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 @@
-provider 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 e36d7b40aff..fbfbaa3b8d3 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 @@
-provider 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 46f98b73b45..64690ea8556 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 @@
-provider 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 0aebabc7888..a67f10a0d7d 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 @@
-provider 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 532560d5e12..aa5fe6e61e8 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 @@
-provider 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 f05ca924614..38d5d375a31 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 @@
-provider 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 1db42b84a68..d882dd93813 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 @@
-provider 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 5ba2e8a1301..411b672b9f8 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,4 +1,4 @@
-provider kubernetes with {
+extension kubernetes with {
   namespace: 'corerp-mechanics-k8s-extensibility'
   kubeConfig: ''
 } as kubernetes
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 84d4fb58847..ca36f118f72 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 @@
-provider 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 674f8974043..c359c147ceb 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 @@
-provider 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 46abed06e36..865cbcb7174 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 @@
-provider radius
+extension radius
 
 param magpieimage string
 param environment string
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 993eefaa357..a4567993d34 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 @@
-provider 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 901b9f7d4e2..ce6f56f52f2 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 @@
 
-provider 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 48de81a5c09..47ee428373d 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 @@
-provider 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 1bb639a75db..da91e467f37 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 @@
-provider 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 7e36af963c1..08dfcabc65c 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 @@
-provider 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 7af89d83bcc..ae8eeebdee2 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 @@
 
-provider 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 99dc6001c99..b7ac37688c1 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 @@
-provider 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 27791ef0b38..02d1395c0de 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 @@
 
-provider 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 a99453a7672..c1a0ee2a9ff 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 @@
-provider 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 578da91f078..a0366edf49a 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 @@
-provider 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 94bb8f21d26..85615ce2dd0 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 @@
-provider 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 c29691c8b58..6030ca68968 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 @@
-provider 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 bb9736903d9..4e234f7c098 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 @@
-provider 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 a7d4e2d9cd4..550cb816a21 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 @@
-provider 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 8f266ec85ce..ffba7eb6925 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 @@
-provider 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 975706a540e..dad8f20c395 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 @@
-provider 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 81e06879d46..6f93fbb5b8e 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 @@
-provider 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 a8d5ee59775..14b6cdbf8ee 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 @@
-provider 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 dd02abb37ec..52cd8470c49 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 @@
-provider 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 55f5168ea93..87e3ee7858b 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 @@
-provider 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 65b41cb8ae2..cb83a62f6de 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,4 +1,4 @@
-provider 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-extender.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-extender.bicep
index d83c81e85de..70143fdcc58 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,4 +1,4 @@
-provider radius
+extension radius
 
 param magpieimage string
 param environment string 
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 a0628bc0d96..298aad6acfd 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 @@
-provider 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 3f9493dd2ad..60a338fced1 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 @@
-provider 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 35ddd3e5607..4417712d887 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 @@
-provider 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 4960fbc0bc5..544e594f488 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 @@
-provider kubernetes with {
+extension kubernetes with {
   kubeConfig: ''
   namespace: 'default'
 } as kubernetes
-provider 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-tlstermination.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-tlstermination.bicep
index 4565d9c7420..9553fb219e5 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 @@
-provider 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 ac78f7e22a6..04f07bc4923 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 @@
-provider 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 badebe6767d..2d583827c88 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 @@
-provider 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 d434bb7156b..867ed054b5a 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 @@
-provider 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 d95b5817613..939e68b0bdc 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 @@
-provider 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 e0b267fa6eb..c66bbc3064b 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 @@
-provider 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 1a9369cb4ea..b84880bcec6 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 @@
-provider 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 99f313dd097..3e4882c69b6 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 @@
-provider 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 251f29521fa..6c923bee3d9 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 @@
-provider 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 ebe857f3eed..c034454c4ab 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 @@
-provider 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 4e0cee15d45..ebae81faa8c 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 @@
-provider 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 4f820f48650..797b8535a8f 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 @@
-provider 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 2b14a05f82d..380d3647e7e 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 @@
-provider 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 9537a7084b9..9bdb5c79623 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 @@
-provider 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 0873109a9d6..c96ce0991f8 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 @@
-provider 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 6219ad61f60..ac287303dbb 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 @@
-provider 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 bd7496e5b11..3792f745ea9 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 @@
-provider 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 e4f1af216cb..38acf001010 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 @@
-provider 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 162b3deb1b4..316b57d4074 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 @@
-provider 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 bef6d01240a..c687cf3ee98 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 @@
-provider 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 294dfe80f36..8514f5b4396 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 @@
-provider 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 3bf601feee6..a8f0edb32aa 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 @@
-provider radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'East US'
diff --git a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-mongodb-recipe-context.bicep b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-mongodb-recipe-context.bicep
index c03ba86276c..aaa4278a669 100644
--- a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-mongodb-recipe-context.bicep
+++ b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-mongodb-recipe-context.bicep
@@ -1,4 +1,4 @@
-provider radius
+extension radius
 
 param rg string = resourceGroup().name
 
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 525cc68c1f8..af52deff819 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 @@
-provider radius
+extension radius
 
 param rg string = resourceGroup().name
 
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 b9e36fff43e..f533c9f5eab 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 @@
-provider radius
+extension radius
 
 param scope string = resourceGroup().id
 
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 d13e63ff578..a1712ab6460 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 @@
-provider radius
+extension radius
 
 param magpieimage string
 param environment string
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 2274116cdd4..a3e77675c19 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 @@
-provider radius
+extension radius
 
 param scope string = resourceGroup().id
 
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 f36d9611076..a022b45e3e1 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 @@
-provider radius
+extension radius
 
 param registry string 
 
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 52905d5bd9f..54b4ba37d74 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 @@
-provider radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
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 8f75acbab7c..9f980e0186a 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 @@
-provider radius
+extension radius
 
 @description('Specifies the location for resources.')
 param location string = 'global'
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 9b9b02940a0..8e5a7de9981 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 @@
-provider radius
+extension radius
 
 @description('Admin username for the Mongo database. Default is "admin"')
 param username string = 'admin'
diff --git a/test/functional-portable/kubernetes/noncloud/testdata/tutorial-environment.bicep b/test/functional-portable/kubernetes/noncloud/testdata/tutorial-environment.bicep
index a9fc237976d..10976922742 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 @@
-provider 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 2cb5cfc537e..7924a5b488f 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 @@
-provider 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 3f1355e9afe..df2d9ecc6bb 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 @@
-provider 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 bdc76bc6141..eb0ffc4ea6f 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 @@
-provider 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 4ea63a968b0..56bfb82c68f 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}.*"'
 
-provider kubernetes 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 b486d429013..80b9b88fff8 100644
--- a/test/testrecipes/modules/redis-selfhost.bicep
+++ b/test/testrecipes/modules/redis-selfhost.bicep
@@ -1,4 +1,4 @@
-provider kubernetes with {
+extension kubernetes with {
   kubeConfig: ''
   namespace: namespace
 } as kubernetes
diff --git a/test/testrecipes/test-bicep-recipes/_resource-creation.bicep b/test/testrecipes/test-bicep-recipes/_resource-creation.bicep
index c494a5173d7..013804d035b 100644
--- a/test/testrecipes/test-bicep-recipes/_resource-creation.bicep
+++ b/test/testrecipes/test-bicep-recipes/_resource-creation.bicep
@@ -1,4 +1,4 @@
-provider 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 46b2b46a209..075fbc87f39 100644
--- a/test/testrecipes/test-bicep-recipes/dapr-pubsub-broker.bicep
+++ b/test/testrecipes/test-bicep-recipes/dapr-pubsub-broker.bicep
@@ -1,4 +1,4 @@
-provider kubernetes with {
+extension kubernetes with {
   namespace: context.runtime.kubernetes.namespace
   kubeConfig: ''
 } as kubernetes
diff --git a/test/testrecipes/test-bicep-recipes/dapr-secret-store.bicep b/test/testrecipes/test-bicep-recipes/dapr-secret-store.bicep
index 6fa0b1c14c8..d773959f4d3 100644
--- a/test/testrecipes/test-bicep-recipes/dapr-secret-store.bicep
+++ b/test/testrecipes/test-bicep-recipes/dapr-secret-store.bicep
@@ -1,4 +1,4 @@
-provider kubernetes with {
+extension kubernetes with {
   namespace: context.runtime.kubernetes.namespace
   kubeConfig: ''
 } as kubernetes
diff --git a/test/testrecipes/test-bicep-recipes/dapr-state-store.bicep b/test/testrecipes/test-bicep-recipes/dapr-state-store.bicep
index 18bef5c3ca6..8bfc70af02c 100644
--- a/test/testrecipes/test-bicep-recipes/dapr-state-store.bicep
+++ b/test/testrecipes/test-bicep-recipes/dapr-state-store.bicep
@@ -1,4 +1,4 @@
-provider kubernetes with {
+extension kubernetes with {
   namespace: context.runtime.kubernetes.namespace
   kubeConfig: ''
 } as kubernetes
diff --git a/test/testrecipes/test-bicep-recipes/extender-recipe.bicep b/test/testrecipes/test-bicep-recipes/extender-recipe.bicep
index e6d8fea4168..6c75b3b73da 100644
--- a/test/testrecipes/test-bicep-recipes/extender-recipe.bicep
+++ b/test/testrecipes/test-bicep-recipes/extender-recipe.bicep
@@ -1,4 +1,4 @@
-provider kubernetes with {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
 } as kubernetes
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 7b126e891cf..9805a8b6247 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 @@
-provider 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 dd6f7b00b74..94a3ac0863e 100644
--- a/test/testrecipes/test-bicep-recipes/language-failure.bicep
+++ b/test/testrecipes/test-bicep-recipes/language-failure.bicep
@@ -1,4 +1,4 @@
-provider 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 227134bda00..1658f7dcff6 100644
--- a/test/testrecipes/test-bicep-recipes/mongodb-recipe-kubernetes.bicep
+++ b/test/testrecipes/test-bicep-recipes/mongodb-recipe-kubernetes.bicep
@@ -1,4 +1,4 @@
-provider kubernetes with {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
 } as kubernetes
diff --git a/test/testrecipes/test-bicep-recipes/rabbitmq-recipe.bicep b/test/testrecipes/test-bicep-recipes/rabbitmq-recipe.bicep
index d1805fe2c50..7b041b1decb 100644
--- a/test/testrecipes/test-bicep-recipes/rabbitmq-recipe.bicep
+++ b/test/testrecipes/test-bicep-recipes/rabbitmq-recipe.bicep
@@ -1,4 +1,4 @@
-provider kubernetes with {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
 } as kubernetes
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 91d3b7c7ca3..4674c924c5c 100644
--- a/test/testrecipes/test-bicep-recipes/redis-recipe-value-backed.bicep
+++ b/test/testrecipes/test-bicep-recipes/redis-recipe-value-backed.bicep
@@ -1,4 +1,4 @@
-provider kubernetes with {
+extension kubernetes with {
   namespace: 'default'
   kubeConfig: ''
 } as kubernetes
diff --git a/test/testrecipes/test-bicep-recipes/resource-creation-failure.bicep b/test/testrecipes/test-bicep-recipes/resource-creation-failure.bicep
index 006316997fd..3bf47816eb6 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 @@
-provider 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 36f5a2048ae..8b3dcbb0853 100644
--- a/test/testrecipes/test-bicep-recipes/resource-creation.bicep
+++ b/test/testrecipes/test-bicep-recipes/resource-creation.bicep
@@ -1,4 +1,4 @@
-provider 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 1e1d9b2edad..42e29ceecaf 100644
--- a/test/testrecipes/test-bicep-recipes/sqldb-recipe.bicep
+++ b/test/testrecipes/test-bicep-recipes/sqldb-recipe.bicep
@@ -1,4 +1,4 @@
-provider kubernetes with {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
 } as kubernetes