bunch of changes after PR

.container_app/container_app.tf → .container_apps/onboarding-ms/container_app.tf

@@ -22,7 +22,7 @@ data "azurerm_container_app_environment" "container_app_environment" {
   name                = "${local.project}-cae"
 }
 
-resource "azapi_resource" "container_app_onboarding" {
+resource "azapi_resource" "container_app" {
   type      = "Microsoft.App/containerApps@2023-05-01"
   name      = "${local.project}-${local.app_name}-ca"
   location  = data.azurerm_resource_group.resource_group_app.location
@@ -46,7 +46,6 @@ resource "azapi_resource" "container_app_onboarding" {
               latestRevision = true
               label          = "latest"
               weight         = 100
-
             }
           ]
           targetPort = 8080
@@ -58,7 +57,7 @@ resource "azapi_resource" "container_app_onboarding" {
         containers = [
           {
             env   = concat(var.app_settings, local.secrets_env)
-            image = "ghcr.io/pagopa/selfcare-onboarding:${var.image_tag}"
+            image = "ghcr.io/pagopa/selfcare-onboarding-ms:${var.image_tag}"
             name  = "${local.project}-${local.app_name}"
             resources = {
               cpu    = var.container_app.cpu

.container_apps/onboarding-ms/locals.tf

@@ -0,0 +1,17 @@
+locals {
+  project  = "${var.prefix}-${var.env_short}"
+  app_name = "onboarding-ms"
+
+  secrets = [for secret in var.key_vault.secrets_names :
+    {
+      identity    = "system"
+      name        = "${secret}"
+      keyVaultUrl = data.azurerm_key_vault_secret.keyvault_secret["${secret}"].id
+  }]
+
+  secrets_env = [for secret in var.key_vault.secrets_names :
+    {
+      name      = upper(secret)
+      secretRef = secret
+  }]
+}

.github/workflows/deploy_onboarding_ms.yml

@@ -22,7 +22,7 @@ on:
           - prod
 
 env:
-  DIR: "./.container_app"
+  DIR: "./.container_apps/onboarding-ms"
   # This condition (that unfortunately must be replicated for the first job)
   # sets the environment depending on the current context for manually
   # started workflows, it picks up the value coming from the UI; otherwise,
@@ -80,12 +80,13 @@ jobs:
         id: meta
         uses: docker/[email protected]
         with:
-          images: ghcr.io/${{ github.repository }}
+          images: ghcr.io/${{ github.repository }}-ms
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
             type=ref,event=branch
             type=sha
-          labels: org.opencontainers.image.title=${{ github.repository }}
+          labels:
+            org.opencontainers.image.title=${{ github.repository }}-ms
             org.opencontainers.image.description=SelfCare onboarding microservice
             org.opencontainers.image.authors=PagoPA
             org.opencontainers.image.url=github.com/pagopa/${{ github.repository }}