updating workflow to use linked function, removing key based auth (#9)

Author: vicancy

.github/workflows/azure-static-web-apps-zealous-pond-031386310.yml

@@ -31,7 +31,7 @@ jobs:
           ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
           # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
           app_location: 'client' # App source code path
-          api_location: 'api' # Api source code path - optional
+          api_location: '' # Use empty, link an existing Azure Functions app instead
           output_location: '' # Built app content directory - optional
           ###### End of Repository/Build Configurations ######
 

api/local.settings.sample.json

@@ -6,6 +6,7 @@
     "PUBSUB_CONNECTION_STRING": "__CHANGE_ME__",
     "PUBSUB_HUB": "chat",
     "STORAGE_ACCOUNT_NAME": "__CHANGE_ME__",
-    "STORAGE_ACCOUNT_KEY": "__CHANGE_ME__"
+    "AZURE_TENANT_ID": "__CHANGE_ME__",
+    "AZURE_CLIENT_ID": "__CHANGE_ME__"
   }
 }

api/state.js

@@ -8,13 +8,12 @@ const { TableServiceClient, TableClient } = require('@azure/data-tables')
 const { DefaultAzureCredential } = require('@azure/identity')
 
 const account = process.env.STORAGE_ACCOUNT_NAME
-const accountKey = process.env.STORAGE_ACCOUNT_KEY
 const chatsTable = 'chats'
 const usersTable = 'users'
 const partitionKey = 'chatr'
 
-if (!account || !accountKey) {
-  console.log('### 💥 Fatal! STORAGE_ACCOUNT_NAME and/or STORAGE_ACCOUNT_KEY is not set')
+if (!account) {
+  console.log('### 💥 Fatal! STORAGE_ACCOUNT_NAME is not set')
 }
 
 const credential = new DefaultAzureCredential()

deploy/deploy.sh

@@ -26,13 +26,11 @@ az deployment sub create                 \
   location="$AZURE_REGION"
 
 pubSubConnStr=$(az deployment sub show --name chatr --query 'properties.outputs.pubSubConnStr.value' -o tsv)
-storageKey=$(az deployment sub show --name chatr --query 'properties.outputs.storageKey.value' -o tsv)
 
 echo -e "\n🔨 Configuring static web app..."
 az staticwebapp appsettings set -n "${AZURE_PREFIX}" --setting-names \
   PUBSUB_CONNECTION_STRING="${pubSubConnStr}" \
   PUBSUB_HUB="chat" \
-  STORAGE_ACCOUNT_KEY="${storageKey}" \
   STORAGE_ACCOUNT_NAME="${AZURE_PREFIX}store" > /dev/null
 
 echo -e "\n✨ Deployment complete!\n🌐 The URL to accecss the app is: $(az deployment sub show --name chatr --query 'properties.outputs.appUrl.value' -o tsv)"

deploy/main.bicep

@@ -46,6 +46,6 @@ module pubsub 'modules/pubsub.bicep' = {
   }
 }
 
+// TODO: Add principals to storage
 output appUrl string = 'https://${staticApp.outputs.appHostname}'
 output pubSubConnStr string = 'Endpoint=https://${resPrefix}.webpubsub.azure.com;AccessKey=${pubsub.outputs.key};Version=1.0;'
-output storageKey string = storage.outputs.key

deploy/modules/storage.bicep

@@ -10,5 +10,3 @@ resource storageAcct 'Microsoft.Storage/storageAccounts@2021-02-01' = {
     name: 'Standard_LRS'
   }
 }
-
-output key string = listKeys(storageAcct.id, storageAcct.apiVersion).keys[0].value