Merge pull request #233 from microsoft/dev

fix: Prefix/Suffix fixes & package upgrades - dev to main

Author: Prajwal-Microsoft

.github/workflows/azure-dev.yaml

@@ -20,7 +20,7 @@ jobs:
 
       # Step 2: Validate the Azure template using microsoft/template-validation-action
       - name: Validate Azure Template
-        uses: microsoft/template-validation-action@v0.3.5
+        uses: microsoft/template-validation-action@v0.4.3
         id: validation
         env:
           AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}

.github/workflows/build-docker-image.yml

@@ -18,10 +18,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Get current date
         id: date

.github/workflows/deploy.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Azure CLI
         run: |

.github/workflows/pylint.yml

@@ -15,7 +15,7 @@ jobs:
 
       # Step 2: Set up Python environment
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/test.yml

@@ -23,10 +23,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 
@@ -66,7 +66,7 @@ jobs:
   #
   #   steps:
   #     - name: Checkout code
-  #       uses: actions/checkout@v3
+  #       uses: actions/checkout@v4
   #
   #     - name: Set up Node.js
   #       uses: actions/setup-node@v3

infra/main.bicep

@@ -86,8 +86,7 @@ param existingLogAnalyticsWorkspaceId string = ''
 param existingFoundryProjectResourceId string = ''
 
 // ========== Variables ========== //
-var solutionPrefix = 'cps-${padLeft(take(toLower(uniqueString(subscription().id, environmentName, resourceGroup().location)), 12), 12, '0')}'
-
+var solutionPrefix = 'cps-${padLeft(take(toLower(uniqueString(subscription().id, environmentName, resourceGroup().location, resourceGroup().name)), 12), 12, '0')}'
 // ============== //
 // Resources      //
 // ============== //

infra/scripts/docker-build.sh

@@ -14,10 +14,12 @@ get_azd_env_value_or_default() {
     local default="$2"
     local required="${3:-false}"
 
-    value=$(azd env get-value "$key" 2>/dev/null || echo "")
+    local value
+    value=$(azd env get-value "$key" 2>/dev/null)
+    local exit_code=$?
 
-    if [ -z "$value" ]; then
-        if [ "$required" = true ]; then
+    if [ $exit_code -ne 0 ] || [ -z "$value" ]; then
+        if [ "$required" = "true" ]; then
             echo "❌ Required environment key '$key' not found." >&2
             exit 1
         else
@@ -27,6 +29,7 @@ get_azd_env_value_or_default() {
 
     echo "$value"
 }
+
 # Required env variables
 AZURE_SUBSCRIPTION_ID=$(get_azd_env_value_or_default "AZURE_SUBSCRIPTION_ID" "" true)
 ENV_NAME=$(get_azd_env_value_or_default "AZURE_ENV_NAME" "" true)
@@ -37,8 +40,8 @@ AZURE_ENV_IMAGETAG=$(get_azd_env_value_or_default "AZURE_ENV_IMAGETAG" "latest"
 CONTAINER_WEB_APP_NAME=$(get_azd_env_value_or_default "CONTAINER_WEB_APP_NAME" "" true)
 CONTAINER_API_APP_NAME=$(get_azd_env_value_or_default "CONTAINER_API_APP_NAME" "" true)
 CONTAINER_APP_NAME=$(get_azd_env_value_or_default "CONTAINER_APP_NAME" "" true)
-$ACR_NAME = $(get_azd_env_value_or_default "CONTAINER_REGISTRY_NAME" "" true)
-$ACR_ENDPOINT = $(get_azd_env_value_or_default "CONTAINER_REGISTRY_LOGIN_SERVER" "" true)
+ACR_NAME=$(get_azd_env_value_or_default "CONTAINER_REGISTRY_NAME" "" true)
+ACR_ENDPOINT=$(get_azd_env_value_or_default "CONTAINER_REGISTRY_LOGIN_SERVER" "" true)
 
 echo "Using the following parameters:"
 echo "AZURE_SUBSCRIPTION_ID = $AZURE_SUBSCRIPTION_ID"