misc fixes

infrastructure/.terraform.lock.hcl

@@ -1,6 +1,25 @@
 # This file is maintained automatically by "terraform init".
 # Manual edits may be lost in future updates.
 
+provider "registry.terraform.io/hashicorp/azuread" {
+  version = "3.7.0"
+  hashes = [
+    "h1:+DHwtiYCOYEhLMot5KQ0hm+zopmUJwPJ/gJiXVfdNOs=",
+    "zh:01114beb07eb8415a563ca80a513e7fd11fd6f0670bdd960e9092e58464ab2b7",
+    "zh:1460c790ca28cc11c3efd4abec076fc5cdd4ae1cc654a45c69e10ca064e0a611",
+    "zh:161b6dd82cf279e7ac7a31c404f2ace491a5a9e7ec382ace91de2fd18f8c190b",
+    "zh:1c3e89cf19118fc07d7b04257251fc9897e722c16e0a0df7b07fcd261f8c12e7",
+    "zh:2eff0bea92c48be0221863ebf7752f491232088f4ec3cbe4da2ebf9f478fed1f",
+    "zh:69a689198fcac054da30fea6a8abce2f12b667f6f327c9bb388f2c307ee782fd",
+    "zh:6f5acf42d71a2f5157c54e67b2db9b080c4ebb27b812112c0c84241e66d94803",
+    "zh:8e0a58ff2c21aff372c66c679db48578be48e99f5cf6727f082cf4b629dbda6c",
+    "zh:9c88cc06ba7ee1f6e6b43af7e223c4d107fb77e5a984f1441fffb00c3693537f",
+    "zh:e8656e8143baac71029857c72899f8503cede41f2559c89ce29d21c0436c96fc",
+    "zh:e8e21913956a3f043c0e65cc95278bdc82f62ff33fd75a56b1919bd63fd14f8a",
+    "zh:f7f213dd61d1c75b8397d97660cf329870a241e88ec6e0dc07c60725d975252e",
+  ]
+}
+
 provider "registry.terraform.io/hashicorp/azurerm" {
   version     = "4.40.0"
   constraints = "4.40.0"
@@ -20,3 +39,22 @@ provider "registry.terraform.io/hashicorp/azurerm" {
     "zh:f6fd85bfca8516f9f3840acc3f0e5e335f6195b66231c2db05c0fb43dd8aebe1",
   ]
 }
+
+provider "registry.terraform.io/hashicorp/random" {
+  version = "3.7.2"
+  hashes = [
+    "h1:KG4NuIBl1mRWU0KD/BGfCi1YN/j3F7H4YgeeM7iSdNs=",
+    "zh:14829603a32e4bc4d05062f059e545a91e27ff033756b48afbae6b3c835f508f",
+    "zh:1527fb07d9fea400d70e9e6eb4a2b918d5060d604749b6f1c361518e7da546dc",
+    "zh:1e86bcd7ebec85ba336b423ba1db046aeaa3c0e5f921039b3f1a6fc2f978feab",
+    "zh:24536dec8bde66753f4b4030b8f3ef43c196d69cccbea1c382d01b222478c7a3",
+    "zh:29f1786486759fad9b0ce4fdfbbfece9343ad47cd50119045075e05afe49d212",
+    "zh:4d701e978c2dd8604ba1ce962b047607701e65c078cb22e97171513e9e57491f",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:7b8434212eef0f8c83f5a90c6d76feaf850f6502b61b53c329e85b3b281cba34",
+    "zh:ac8a23c212258b7976e1621275e3af7099e7e4a3d4478cf8d5d2a27f3bc3e967",
+    "zh:b516ca74431f3df4c6cf90ddcdb4042c626e026317a33c53f0b445a3d93b720d",
+    "zh:dc76e4326aec2490c1600d6871a95e78f9050f9ce427c71707ea412a2f2f1a62",
+    "zh:eac7b63e86c749c7d48f527671c7aee5b4e26c10be6ad7232d6860167f99dbb0",
+  ]
+}

infrastructure/config/main.tf

@@ -4,6 +4,16 @@ locals {
     prod = "flying-prod"
   }
 
+  app_reg_name = {
+    test = "noahspan-flying-test"
+    prod = "noahspan-flying-prod"
+  }
+
+  app_reg_federated_identity_credential_subject = {
+    test = "repo:noahspannbauer/noahspan-flying:environment:test"
+    prod = "repo:noahspannbauer/noahspan-flying:environment:prod"
+  }
+
   container_image = {
     test = "noahspan/flying-app:v2.0.0-alpha"
     prod = "noahspan/flying-app:v2.0.0-alpha"

infrastructure/config/outputs.tf

@@ -2,6 +2,14 @@ output "app_name" {
   value = local.app_name[var.environment]
 }
 
+output "app_reg_name" {
+  value = local.app_reg_name[var.environment]
+}
+
+output "app_reg_federated_identity_credential_subject" {
+  value = local.app_reg_federated_identity_credential_subject[var.environment]
+}
+
 output "container_image" {
   value = local.container_image[var.environment]
 }

infrastructure/container_app.tf

@@ -1,3 +1,8 @@
+# data "azuread_application" "app_registration" {
+#   provider = azuread.external_tenant
+#   display_name = module.environment.app_reg_name
+# }
+
 resource "azurerm_container_app" "container_app" {
   name = module.environment.app_name
   container_app_environment_id = data.azurerm_container_app_environment.container_app_environment.id
@@ -60,7 +65,7 @@ resource "azurerm_container_app" "container_app" {
 
     container {
       cpu = 0.25
-      image = "noahspan/flying-app:v2.0.0-alpha"
+      image = "noahspan/flying:19615036250"
       memory = "0.5Gi"
       name = "flying"
 
@@ -71,7 +76,7 @@ resource "azurerm_container_app" "container_app" {
 
       env {
         name = "CLIENT_ID"
-        secret_name = "client-id"
+        value = var.CLIENT_ID
       }
 
       env {
@@ -81,7 +86,7 @@ resource "azurerm_container_app" "container_app" {
 
       env {
         name = "TENANT_ID"
-        value = var.TENANT_ID
+        value = var.EXTERNAL_TENANT_ID
       }
 
       env {
@@ -144,11 +149,6 @@ resource "azurerm_container_app" "container_app" {
     value = azurerm_storage_account.storage_account.primary_connection_string
   }
 
-  secret {
-    name = "client-id"
-    value = var.CLIENT_ID
-  }
-
   secret {
     name = "client-secret"
     value = var.CLIENT_SECRET

infrastructure/providers.tf

@@ -1,3 +1,5 @@
 provider "azurerm" {
   features {}
-}
+}
+
+provider "random" {}

infrastructure/terraform.tf

@@ -6,6 +6,14 @@ terraform {
       source = "hashicorp/azurerm"
       version = "4.40.0"
     }
+
+    azuread = {
+      source = "hashicorp/azuread"
+    }
+
+    random = {
+      source = "hashicorp/random"
+    }
   }
 
   backend "remote" {

infrastructure/variables.tf

@@ -21,6 +21,10 @@ variable "RESOURCE_GROUP_NAME" {
   type = string
 }
 
+variable "EXTERNAL_TENANT_ID" {
+  type = string
+}
+
 variable "TENANT_ID" {
   type = string
 }