Update bicep references in recipes (#70)

* update bicep references

Signed-off-by: sk593 <[email protected]>

* nit

Signed-off-by: sk593 <[email protected]>

* update bicepconfig workaround

Signed-off-by: sk593 <[email protected]>

---------

Signed-off-by: sk593 <[email protected]>

Author: sk593

.github/scripts/validate-bicep.sh

@@ -4,12 +4,15 @@ then
     BICEP_EXECUTABLE="$BICEP_PATH/rad-bicep"
 fi
 
+# The Bicep compiler prints out a warning for any experimental features in use. 
+# We want to ignore these warnings since Radius makes use of some experimental features. 
+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 rad-bicep and fail in one of two cases:
     # - non-zero exit code
     # - non-empty stderr 
     #
@@ -24,7 +27,7 @@ do
     EXITCODE=$?
     exec 3>&-
 
-    if [[ ! $EXITCODE -eq 0 || ! -z $STDERR ]]
+    if [[ ! $EXITCODE -eq 0 || (! -z $STDERR && ! $STDERR == $WARNING_MSG* && ! $STDERR == *"Error"* ) ]]
     then
         echo $STDERR
         FAILURES+=$F

.github/workflows/validate-bicep.yaml

@@ -35,21 +35,19 @@ jobs:
     name: Validate Bicep Code
     runs-on: ubuntu-latest
     steps:
-    - name: Check out repo
-      uses: actions/checkout@v3
-    - name: Parse release version and set environment variables
-      run: python ./.github/scripts/get_release_version.py
-    - name: Download rad-bicep
-      run: |
-        ./.github/scripts/curl-with-retries.sh https://get.radapp.dev/tools/bicep-extensibility/${{ env.REL_CHANNEL }}/linux-x64/rad-bicep --output rad-bicep
-        chmod +x rad-bicep
-        ./rad-bicep --version
-    - name: Verify Bicep files
-      run: ./.github/scripts/validate-bicep.sh
-      env: 
-        BICEP_PATH: .
-    - name: Write error to summary
-      if: ${{ failure() }}
-      run: |
-        echo "## Bicep validation failed" >> $GITHUB_STEP_SUMMARY
-        echo "One or more Bicep files have failed validation. Please ensure you do not have any Bicep errors. Visit https://docs.radapp.dev/getting-started/install/ to download and install the Bicep VS Code extension to assist with validation." >> $GITHUB_STEP_SUMMARY
+      - name: Setup and verify bicep CLI
+        run: |
+          curl -Lo rad-bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64
+          chmod +x ./rad-bicep
+          ./rad-bicep --version
+      - name: Check out repo
+        uses: actions/checkout@v4
+      - name: Verify Bicep files
+        run: ./.github/scripts/validate-bicep.sh
+        env: 
+          BICEP_PATH: .
+      - name: Write error to summary
+        if: ${{ failure() }}
+        run: |
+          echo "## Bicep validation failed" >> $GITHUB_STEP_SUMMARY
+          echo "One or more Bicep files have failed validation. Please ensure you do not have any Bicep errors. Visit https://docs.radapp.dev/getting-started/install/ to download and install the Bicep VS Code extension to assist with validation." >> $GITHUB_STEP_SUMMARY

README.md

@@ -51,7 +51,7 @@ rad recipe register azure \
 ### Bicep
 
 ```bicep
-import radius as rad
+extension radius 
 
 resource myenv 'Applications.Core/environments' = {
   name: 'myenv'

aws/rediscaches.bicep

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import aws as aws
+extension aws
 
 @description('Radius-provided object containing information about the resource calling the Recipe')
 param context object

aws/sqldatabases.bicep

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import aws as aws
+extension aws
 
 @description('Radius-provided object containing information about the resource calling the Recipe')
 param context object

azure/statestores.bicep

@@ -54,10 +54,10 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2022-05-01' = {
   }
 }
 
-import kubernetes as k8s {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
-}
+} as k8s
 
 var daprType = 'state.azure.blobstorage'
 var daprVersion = 'v1'

bicepconfig.json

@@ -0,0 +1,14 @@
+{
+    "experimentalFeaturesEnabled": {
+        "extensibility": true,
+        "extensionRegistry": true,
+        "dynamicTypeLoading": true
+    },
+    "extensions": {
+        "radius": "br:biceptypes.azurecr.io/radius:latest",
+        "aws": "br:biceptypes.azurecr.io/aws:latest"
+    },
+    "cloud": {
+        "credentialPrecedence": [ "Environment" ]
+    }
+}

docs/contributing/contributing-recipes.md

@@ -53,7 +53,7 @@ To test the recipe locally, follow the steps below:
 
     **Via Radius environment bicep**
     ```bicep
-    import radius as radius
+    extension radius
     resource env 'Applications.Core/environments@2023-10-01-preview' = {
         name: 'prod'
         properties: {

local-dev/extender-postgresql.bicep

@@ -37,10 +37,10 @@ param memoryRequest string = '512Mi'
 @description('Memory limit for the postgres deployment')
 param memoryLimit string = '1024Mi'
 
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
-}
+} as kubernetes
 
 var uniqueName = 'postgres-${uniqueString(context.resource.id)}'
 var port = 5432

local-dev/mongodatabases.bicep

@@ -28,10 +28,10 @@ param username string = 'admin'
 #disable-next-line secure-parameter-default
 param password string = 'Password1234=='
 
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
-}
+} as kubernetes
 
 var uniqueName = 'mongo-${uniqueString(context.resource.id)}'
 var port = 27017

local-dev/pubsubbrokers.bicep

@@ -26,10 +26,10 @@ param memoryRequest string = '128Mi'
 @description('Memory limit for the redis deployment')
 param memoryLimit string = '1024Mi'
 
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
-}
+} as kubernetes
 
 var uniqueName = 'daprpubsub-${uniqueString(context.resource.id)}'
 var port = 6379

local-dev/rabbitmqqueues.bicep

@@ -29,10 +29,10 @@ param memoryRequest string = '256Mi'
 @description('Memory limit for the rabbitmq deployment')
 param memoryLimit string = '1024Mi'
 
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
-}
+} as kubernetes
 
 var uniqueName = 'rabbitmq-${uniqueString(context.resource.id)}'
 var port = 5672

local-dev/rediscaches.bicep

@@ -17,10 +17,10 @@ limitations under the License.
 @description('Information about what resource is calling this Recipe. Generated by Radius. For more information visit https://docs.radapp.dev/operations/custom-recipes/')
 param context object
 
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
-}
+} as kubernetes
 
 resource redis 'apps/Deployment@v1' = {
   metadata: {

local-dev/secretstores.bicep

@@ -17,10 +17,10 @@ limitations under the License.
 @description('Information about what resource is calling this Recipe. Generated by Radius. For more information visit https://docs.radapp.dev/operations/custom-recipes/')
 param context object
 
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
-}
+} as kubernetes
 
 var daprType = 'secretstores.kubernetes'
 var daprVersion = 'v1'

local-dev/sqldatabases.bicep

@@ -40,10 +40,10 @@ param memoryLimit string = '1024Mi'
 @description('Initial catalog to connect to. Defaults to empty string (no initial catalog).')
 param initialCatalog string = ''
 
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
-}
+} as kubernetes
 
 var uniqueName = 'sql-${uniqueString(context.resource.id)}'
 var port = 1433

local-dev/statestores.bicep

@@ -29,10 +29,10 @@ param memoryRequest string = '128Mi'
 @description('Memory limit for the redis deployment')
 param memoryLimit string = '1024Mi'
 
-import kubernetes as kubernetes {
+extension kubernetes with {
   kubeConfig: ''
   namespace: context.runtime.kubernetes.namespace
-}
+} as kubernetes
 
 var uniqueName = 'daprstate-${uniqueString(context.resource.id)}'
 var port = 6379

tests/test-local-dev-recipes.bicep

@@ -1,4 +1,4 @@
-import radius as radius
+extension radius
 
 @description('Specifies the image for the container resource.')
 param magpieimage string
@@ -9,10 +9,10 @@ param registry string
 @description('The OCI tag for test Bicep recipes.')
 param version string
 
-import kubernetes as kubernetes {
+extension kubernetes with {
   namespace: 'daprrp-rs-secretstore-recipe'
   kubeConfig: ''
-}
+} as kubernetes
 
 resource env 'Applications.Core/environments@2023-10-01-preview' = {
   name: 'local-dev-recipe-env'