AZD - template cleanup, removed env, rebuilt main.json

Author: Seth

.github/workflows/azd-template-validation.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - azd/add-template-gallery
+      - main
 
 permissions:
   contents: read
@@ -13,7 +13,6 @@ permissions:
 jobs:
   template_validation:
     runs-on: ubuntu-latest
-    environment: azd-template-gallery-seth-mcaps
     name: azd template validation
     steps:
       - uses: actions/checkout@v4
@@ -24,9 +23,9 @@ jobs:
           useDevContainer: ${{ vars.TEMPLATE_USE_DEV_CONTAINER }}
         id: validation
         env:
-          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
-          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-          AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          AZURE_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }}
+          AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }}
+          AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }}
           AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }}
           AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/azure-dev.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - azd/add-template-gallery
+      - main
 
 permissions:
   id-token: write
@@ -12,12 +12,11 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    environment: azd-template-gallery-seth-mcaps
     env:
-      AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
-      AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-      AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
+      AZURE_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }}
+      AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }}
+      AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }}
+      AZURE_RESOURCE_GROUP: ${{ vars.AZURE_RESOURCE_GROUP }}
       AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }}
       AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
       AZURE_USER_OBJECT_ID: ''

infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.33.93.31351",
-      "templateHash": "3696806033148817293"
+      "templateHash": "10384721894949341887"
     }
   },
   "definitions": {
@@ -1684,7 +1684,7 @@
     },
     "vmAdminPasswordOrKey": {
       "type": "securestring",
-      "minLength": 8,
+      "minLength": 4,
       "maxLength": 70,
       "metadata": {
         "description": "Specifies the password for the jump-box virtual machine. This is necessary to provide secure access to the private VNET via a jump-box VM with Bastion. Value should be meet 3 of the following: uppercase character, lowercase character, numberic digit, special character, and NO control characters."
@@ -22816,7 +22816,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.33.93.31351",
-              "templateHash": "11468708502826403477"
+              "templateHash": "10286244752482293080"
             }
           },
           "parameters": {
@@ -22987,13 +22987,15 @@
             }
           },
           "variables": {
+            "randomString": "[uniqueString(resourceGroup().id, parameters('vmName'), parameters('vmAdminPasswordOrKey'))]",
+            "adminPassword": "[if(less(length(parameters('vmAdminPasswordOrKey')), 8), format('{0}{1}', parameters('vmAdminPasswordOrKey'), take(variables('randomString'), 12)), parameters('vmAdminPasswordOrKey'))]",
             "linuxConfiguration": {
               "disablePasswordAuthentication": true,
               "ssh": {
                 "publicKeys": [
                   {
                     "path": "[format('/home/{0}/.ssh/authorized_keys', parameters('vmAdminUsername'))]",
-                    "keyData": "[parameters('vmAdminPasswordOrKey')]"
+                    "keyData": "[variables('adminPassword')]"
                   }
                 ]
               },
@@ -23035,7 +23037,7 @@
                 "osProfile": {
                   "computerName": "[take(parameters('vmName'), 15)]",
                   "adminUsername": "[parameters('vmAdminUsername')]",
-                  "adminPassword": "[parameters('vmAdminPasswordOrKey')]",
+                  "adminPassword": "[variables('adminPassword')]",
                   "linuxConfiguration": "[if(equals(parameters('authenticationType'), 'password'), null(), variables('linuxConfiguration'))]"
                 },
                 "storageProfile": {