Merge branch 'main' into tls

Signed-off-by: Anthony Shaw <[email protected]>

Author: tonybaloney

.github/workflows/bicep-audit.yml

@@ -4,12 +4,12 @@ on:
     branches: 
       - main
     paths:
-      - "infra/**"
+      - "**/*.bicep"
   pull_request:
     branches: 
       - main
     paths:
-      - "infra/**"
+      - "**/*.bicep"
   workflow_dispatch:
 
 jobs:
@@ -21,15 +21,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Run Microsoft Security DevOps Analysis
-        uses: microsoft/security-devops-action@preview
-        id: msdo
-        continue-on-error: true
+      - name: Run PSRule analysis
+        uses: microsoft/[email protected]
         with:
-          tools: templateanalyzer
+          modules: PSRule.Rules.Azure
+          baseline: Azure.Pillar.Security
+          inputPath: infra/*.test.bicep
+          outputFormat: Sarif
+          outputPath: reports/ps-rule-results.sarif
+          summary: true
+        continue-on-error: true
+          
+        env:
+          PSRULE_CONFIGURATION_AZURE_BICEP_FILE_EXPANSION: 'true'
+          PSRULE_CONFIGURATION_AZURE_BICEP_FILE_EXPANSION_TIMEOUT: '30'
 
-      - name: Upload alerts to Security tab
+      - name: Upload results to security tab
         uses: github/codeql-action/upload-sarif@v3
         if: github.repository_owner == 'Azure-Samples'
         with:
-          sarif_file: ${{ steps.msdo.outputs.sarifFile }}
+          sarif_file: reports/ps-rule-results.sarif

README.md

@@ -9,7 +9,6 @@ products:
 - azure
 - azure-container-apps
 - azure-service-bus
-- dapr
 urlFragment: pubsub-dapr-nodejs-servicebus
 name: Microservice communication using pubsub (async)(Node.js)
 description: Create a publisher microservice and a subscriber microservice with Node.js to demonstrate how Dapr enables a publish-subcribe pattern. The publisher will generate messages of a specific topic, while subscribers will listen for messages of specific topics. 

infra/abbreviations.json

@@ -1,7 +1,7 @@
 {
     "analysisServicesServers": "as",
     "apiManagementService": "apim-",
-    "appConfigurationConfigurationStores": "appcs-",
+    "appConfigurationStores": "appcs-",
     "appManagedEnvironments": "cae-",
     "appContainerApps": "ca-",
     "authorizationPolicyDefinitions": "policy-",
@@ -14,6 +14,7 @@
     "cognitiveServicesAccounts": "cog-",
     "cognitiveServicesFormRecognizer": "cog-fr-",
     "cognitiveServicesTextAnalytics": "cog-ta-",
+    "cognitiveServicesSpeech": "cog-sp-",
     "computeAvailabilitySets": "avail-",
     "computeCloudServices": "cld-",
     "computeDiskEncryptionSets": "des",
@@ -55,6 +56,7 @@
     "kubernetesConnectedClusters": "arck",
     "kustoClusters": "dec",
     "kustoClustersDatabases": "dedb",
+    "loadTesting": "lt-",
     "logicIntegrationAccounts": "ia-",
     "logicWorkflows": "logic-",
     "machineLearningServicesWorkspaces": "mlw-",
@@ -132,4 +134,4 @@
     "webSitesAppServiceEnvironment": "ase-",
     "webSitesFunctions": "func-",
     "webStaticSites": "stapp-"
-}
+}