Merge branch 'master' into chore/package-update-230824

equinor · Sep 13, 2024 · 7e48d61 · 7e48d61
2 parents 88b766b + 24f315a
commit 7e48d61
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 4 deletions.
diff --git a/pipelines/summary-api-pipeline.yml b/pipelines/summary-api-pipeline.yml
@@ -243,7 +243,7 @@ stages:
                   action: deploy
                   manifests: $(deploymentManifest)
 
-              - template: templates/deploy-container-app.yml
+              - template: templates/deploy-summary-container-app.yml
                 parameters:
                   azureSubscription: $(subscriptionServiceProd)
                   environment: $(envName)

diff --git a/pipelines/templates/deploy-summary-container-app.yml b/pipelines/templates/deploy-summary-container-app.yml
@@ -0,0 +1,23 @@
+parameters:
+  azureSubscription: 'PROJECT_PORTAL (63b791ae-b2bc-41a1-ac66-806c4e69bffe)'
+  environment: ''
+  clientId: ''
+  imageName: ''
+  fusionEnvironment: 'fprd'
+  templateFile: $(Build.SourcesDirectory)src/Fusion.Summary.Api/Deployment/webapp.template.json
+
+steps:
+- checkout: self
+- task: AzurePowerShell@5
+  displayName: 'Deploy ARM template'
+  inputs:
+    azureSubscription: ${{ parameters.azureSubscription }}
+    ScriptType: FilePath
+    FailOnStandardError: true
+    azurePowerShellVersion: 'LatestVersion'
+    ScriptPath: src/Fusion.Summary.Api/Deployment/deploy-webapp.ps1
+    ScriptArguments: >
+      -environment ${{ parameters.environment }} 
+      -clientId ${{ parameters.clientId }} 
+      -fusionEnvironment ${{ parameters.fusionEnvironment }} 
+      -imageName ${{ parameters.imageName }}
diff --git a/src/Fusion.Summary.Api/Deployment/webapp.template.json b/src/Fusion.Summary.Api/Deployment/webapp.template.json
@@ -41,8 +41,8 @@
         "fusion-env-name": "[toLower(parameters('fusion-env-name'))]",
         "location": "[resourceGroup().location]",
         "api-name": "[concat('fap-summary-api-', variables('env-name'))]",
-        "keyvault-name": "[concat('kv-fap-summary-', variables('env-name'))]",
-        "ai-api-name": "[concat('ai-fap-summary-', variables('env-name'))]"
+        "keyvault-name": "[concat('kv-fap-resources-', variables('env-name'))]",
+        "ai-api-name": "[concat('ai-fap-resources-', variables('env-name'))]"
     },
     "resources": [   
         /* API SERVICE */      
@@ -142,7 +142,7 @@
                 ]
             },
             "dependsOn": [
-                "[resourceId('Microsoft.Web/Sites', variables('api-name'))]"
+                "[resourceId('Microsoft.Web/sites', variables('api-name'))]"
             ]
         }
     ]

diff --git a/src/Fusion.Summary.Functions/Deployment/disabled-functions.json b/src/Fusion.Summary.Functions/Deployment/disabled-functions.json
@@ -2,5 +2,29 @@
   {
     "environment": "pr",
     "disabledFunctions": []
+  },
+  {
+    "environment": "ci",
+    "disabledFunctions": [
+      "weekly-department-recipients-sync",
+      "weekly-department-summary-sender",
+      "weekly-department-summary-worker"
+    ]
+  },
+  {
+    "environment": "fqa",
+    "disabledFunctions": [
+      "weekly-department-recipients-sync",
+      "weekly-department-summary-sender",
+      "weekly-department-summary-worker"
+    ]
+  },
+  {
+    "environment": "fprd",
+    "disabledFunctions": [
+      "weekly-department-recipients-sync",
+      "weekly-department-summary-sender",
+      "weekly-department-summary-worker"
+    ]
   }
 ]