From c4903c9aa163f0922c3ba85f2d7edfdf6f93daef Mon Sep 17 00:00:00 2001
From: Benjamin Chiverton <b.chiverton@warwick.ac.uk>
Date: Tue, 2 Jul 2024 08:27:59 +0100
Subject: [PATCH] Move apps into shared resource group

---
 .../workflows/config/container-environment-config.yaml    | 2 --
 .github/workflows/instance-deploy-test.yml                | 8 +++-----
 terraform/instance/container_apps.tf                      | 6 +++---
 3 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 .github/workflows/config/container-environment-config.yaml

diff --git a/.github/workflows/config/container-environment-config.yaml b/.github/workflows/config/container-environment-config.yaml
deleted file mode 100644
index 3006337..0000000
--- a/.github/workflows/config/container-environment-config.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-properties:
-  managedEnvironmentId: /subscriptions/c57c2a02-297d-4f68-979b-1960df722627/resourceGroups/onlinestore-shared-rg/providers/Microsoft.App/managedEnvironments/onlinestore-containerapps
diff --git a/.github/workflows/instance-deploy-test.yml b/.github/workflows/instance-deploy-test.yml
index 48b204d..6a08489 100644
--- a/.github/workflows/instance-deploy-test.yml
+++ b/.github/workflows/instance-deploy-test.yml
@@ -110,16 +110,15 @@ jobs:
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
       - name: Deploy api
-        uses: benchiverton/container-apps-deploy-action@container-env-resource-group
+        uses: azure/container-apps-deploy-action@v1
         with:
           acrName: onlinestorecontainerregistry
           acrUsername: ${{ secrets.ACR_USERNAME }}
           acrPassword: ${{ secrets.ACR_TOKEN }}
           containerAppName: ${{ github.head_ref }}-onlinestore-api
-          containerAppEnvironmentResourceGroup: onlinestore-shared-rg
           imageToDeploy: onlinestorecontainerregistry.azurecr.io/onlinestore-api:${{ github.sha }}
           location: 'East US'
-          resourceGroup: ${{ env.resource_group_name }}
+          resourceGroup: onlinestore-shared-rg
           targetPort: 8080
           environmentVariables: OTEL_EXPORTER_OTLP_ENDPOINT=http://${{ github.head_ref }}-onlinestore-monitoring:18889
       - name: Deploy website
@@ -129,10 +128,9 @@ jobs:
           acrUsername: ${{ secrets.ACR_USERNAME }}
           acrPassword: ${{ secrets.ACR_TOKEN }}
           containerAppName: ${{ github.head_ref }}-onlinestore-website
-          containerAppEnvironmentResourceGroup: onlinestore-shared-rg
           imageToDeploy: onlinestorecontainerregistry.azurecr.io/onlinestore-website:${{ github.sha }}
           location: 'East US'
-          resourceGroup: ${{ env.resource_group_name }}
+          resourceGroup: onlinestore-shared-rg
           targetPort: 80
           environmentVariables: "API__BASEPATH=https://${{ github.head_ref }}-api.rockpal.co.uk"
       - name: Find Comment
diff --git a/terraform/instance/container_apps.tf b/terraform/instance/container_apps.tf
index c0bb36b..4caf469 100644
--- a/terraform/instance/container_apps.tf
+++ b/terraform/instance/container_apps.tf
@@ -6,7 +6,7 @@ data  "azurerm_container_app_environment" "apps" {
 resource "azurerm_container_app" "api" {
   name                         = "${lower(var.environment)}-${var.name}-api"
   container_app_environment_id = data.azurerm_container_app_environment.apps.id
-  resource_group_name          = azurerm_resource_group.instance.name
+  resource_group_name          = data.azurerm_container_app_environment.apps.resource_group_name
   revision_mode                = "Single"
 
   template {
@@ -41,7 +41,7 @@ resource "azurerm_container_app" "api" {
 resource "azurerm_container_app" "website" {
   name                         = "${lower(var.environment)}-${var.name}-website"
   container_app_environment_id = data.azurerm_container_app_environment.apps.id
-  resource_group_name          = azurerm_resource_group.instance.name
+  resource_group_name          = data.azurerm_container_app_environment.apps.resource_group_name
   revision_mode                = "Single"
 
   template {
@@ -76,7 +76,7 @@ resource "azurerm_container_app" "website" {
 resource "azurerm_container_app" "monitoring" {
   name                         = "${lower(var.environment)}-${var.name}-monitoring"
   container_app_environment_id = data.azurerm_container_app_environment.apps.id
-  resource_group_name          = azurerm_resource_group.instance.name
+  resource_group_name          = data.azurerm_container_app_environment.apps.resource_group_name
   revision_mode                = "Single"
 
   template {