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

@@ -280,7 +280,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:
@@ -297,11 +297,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

.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'

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"
+	}
+}

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

hack/bicep-types-radius/generated/index.json

@@ -45,7 +45,7 @@
   },
   "resourceFunctions": {},
   "settings": {
-    "name": "radius",
+    "name": "Radius",
     "version": "latest",
     "isSingleton": false
   }

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));

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'

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'

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
 

test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli-run.bicep

@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 param application string
 

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'

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'

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'

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'

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

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

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

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

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

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
 

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

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
 

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'

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

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
 

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

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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: {

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

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

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'

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

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'

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'

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'

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'

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'

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'

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'

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'

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'