Merge pull request #17 from miberr/development

Resource template modifications
miberr · Apr 10, 2024 · 9c9ff56 · 9c9ff56
2 parents 9740092 + 373ab34
commit 9c9ff56
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 27 deletions.
diff --git a/.github/workflows/dev-deployment.yml b/.github/workflows/dev-deployment.yml
@@ -77,7 +77,7 @@ jobs:
         resourceGroupName: ${{ secrets.AZURE_RG_NAME }}
         template: ./arm/resources.json
         deploymentName: GitHubActions${{ steps.date.outputs.date }}
-        parameters: environment=DEV gitHubAppUserId=${{ secrets.AZURE_GITHUB_APP_USER_ID }}
+        parameters: environment=DEV
 
   deployFunction:
     name: Deploy function to Azure

diff --git a/.github/workflows/prod-deployment.yml b/.github/workflows/prod-deployment.yml
@@ -75,7 +75,7 @@ jobs:
         resourceGroupName: ${{ secrets.AZURE_RG_NAME }}
         template: ./arm/resources.json
         deploymentName: GitHubActions${{ steps.date.outputs.date }}
-        parameters: environment=PROD gitHubAppUserId=${{ secrets.AZURE_GITHUB_APP_USER_ID }}
+        parameters: environment=PROD
   deployFunction:
     name: Deploy function to Azure
     runs-on: windows-latest
@@ -153,7 +153,7 @@ jobs:
           output_location: "build" # Built app content directory - optional
           ###### End of Repository/Build Configurations ######
         env:
-          ALGOLIA_APP_ID: $ALGOLIA_APP_ID
-          ALGOLIA_INDEX_NAME: $ALGOLIA_INDEX_NAME
-          ALGOLIA_SEARCH_API_KEY: $ALGOLIA_SEARCH_API_KEY
+          ALGOLIA_APP_ID: ${{ env.ALGOLIA_APP_ID }}
+          ALGOLIA_INDEX_NAME: ${{ env.ALGOLIA_INDEX_NAME }}
+          ALGOLIA_SEARCH_API_KEY: ${{ env.ALGOLIA_SEARCH_API_KEY }}
 
diff --git a/arm/resources.json b/arm/resources.json
@@ -19,12 +19,6 @@
             "metadata": {
                 "description": "The environment to deploy to."
             }
-        },
-        "gitHubAppUserId": {
-            "type": "string",
-            "metadata": {
-                "description": "The GitHub App user id from Entra ID."
-            }
         }
     },
     "functions": [],
@@ -166,22 +160,7 @@
                 "tenantId": "[subscription().tenantId]",
                 "enablesoftDelete": true,
                 "softDeleteRetentionInDays": 90,
-                "accessPolicies": [
-                    {
-                        "tenantId": "[subscription().tenantId]",
-                        "objectId": "[parameters('gitHubAppUserId')]",
-                        "permissions": {
-                            "keys": [
-                                "get",
-                                "list"
-                            ],
-                            "secrets": [
-                                "get",
-                                "list"
-                            ]
-                        }
-                    }
-                ]
+                "enableRbacAuthorization": true
             }
         },
         {