Merge branch 'main' into mawasile/add-additional-logging-to-infra

Author: mawasile

.devcontainer/devcontainer.json

@@ -16,7 +16,7 @@
             "version": "9.0"
         },
         "ghcr.io/azure/azure-dev/azd:latest": {
-            "version": "1.18.1"
+            "version": "1.20.0"
         },
         "./features/dev-tools": {}
     },
@@ -38,8 +38,9 @@
                 "bierner.markdown-mermaid",
                 "ms-dotnettools.csharp",
                 "ms-dotnettools.vscode-dotnet-runtime"
-                // Include other VSCode extensions if needed
-                // Right click on an extension inside VSCode to add directly to devcontainer.json, or copy the extension ID
+
+                // Include other VSCode extensions if needed. Right click on an extension inside VSCode
+                // to add directly to devcontainer.json, or copy the extension ID
             ],
             "settings": {
                 "terraform.languageServer.enable":true,

.github/workflows/azure-dev-down.yml

@@ -14,7 +14,7 @@ on:
         default: "eastus"
 
 permissions:
-  id-token: write
+  id-token: write # Needed for OIDC Authentication
   contents: read
 
 jobs:
@@ -36,7 +36,7 @@ jobs:
           version: '1.20.0'  # Specify your desired azd version here
 
       - name: Setup Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: '18.x'
 

.github/workflows/azure-dev.yml

@@ -24,11 +24,17 @@ on:
     # Run when pull requests are opened or updated
     branches:
       - main
+
 # GitHub Actions workflow to deploy to Azure using azd
+# Ensure only one deployment runs at a time to prevent conflicts
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: false
+
 permissions:
   actions: read # Needed for uploading SARIF reports
   security-events: write  # Needed for uploading SARIF reports
-  id-token: write
+  id-token: write # Needed for OIDC Authentication
   contents: read
 
 
@@ -42,6 +48,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
 
       - name: Install azd
         uses: Azure/setup-azd@cf638ffd167fc81e1851241a478a723c05fa9cb3 # v2.2.0
@@ -193,7 +201,7 @@ jobs:
         with:
           sarif_file: ./checkov-results.sarif/results_sarif.sarif
 
-      - name: Azd down
+      - name: Destroy Infrastructure
         if: ${{ github.event.inputs.run_azd_down == 'true' || github.event_name == 'pull_request' }}
         env:
           POWER_PLATFORM_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }}

.github/workflows/terraform-validate.yml

@@ -13,6 +13,7 @@ permissions:
   contents: read
   security-events: write
   pull-requests: write  # Allow workflow to comment on PRs
+  id-token: write # Needed for OIDC Authentication
 
 # Global environment variables
 env:
@@ -49,10 +50,15 @@ jobs:
         with:
           fetch-depth: 0  # Required for proper GitLeaks scanning
 
+      - name: Setup Node.js
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+        with:
+          node-version: '18.x'
+        
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
         with:
-          terraform_version: "1.12.2"  # Pinning specific version
+          terraform_version: "1.13.3"  # Pinning specific version
 
       - name: Terraform Init
         id: tf-init

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+  <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

infra/main.naming.tf

@@ -5,8 +5,9 @@
 
 locals {
   # Organization suffixes and prefixes are optional, and we need to form an array of non-empty values only
-  org_prefix = compact([var.org_naming.org_prefix])
-  org_suffix = compact([var.org_naming.org_environment, var.org_naming.org_suffix])
+  org_prefix   = compact([var.org_naming.org_prefix])
+  org_suffix   = compact([var.org_naming.org_environment, var.org_naming.org_suffix])
+  azd_env_seed = parseint(substr(md5(var.azd_environment_name), 0, 8), 16)
 }
 
 # Generate unique names for primary resources
@@ -26,6 +27,7 @@ resource "azurecaf_name" "main_names" {
   prefixes      = local.org_prefix
   suffixes      = local.org_suffix
   random_length = 4
+  random_seed   = local.azd_env_seed
   # use_slug = false
   clean_input = true
 }

tests/Copilot/CopilotTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+  <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>