From 3356dfc77acec78a94e352d5c6ed94db55490aba Mon Sep 17 00:00:00 2001 From: Noah Spannbauer Date: Thu, 20 Feb 2025 18:37:34 -0600 Subject: [PATCH] Updating version number to 1.0.0 --- api/package.json | 4 ++-- app/package.json | 2 +- infrastructure/config/main.tf | 5 +++++ infrastructure/config/outputs.tf | 4 ++++ infrastructure/dns.tf | 24 ++++++++++++++---------- infrastructure/main.tf | 15 ++++++++------- pnpm-lock.yaml | 10 +++++----- 7 files changed, 39 insertions(+), 25 deletions(-) diff --git a/api/package.json b/api/package.json index cdc2c36..09b7e87 100644 --- a/api/package.json +++ b/api/package.json @@ -1,6 +1,6 @@ { "name": "api", - "version": "0.0.25", + "version": "1.0.0", "description": "", "author": "", "private": true, @@ -27,7 +27,7 @@ "@nestjs/passport": "^10.0.3", "@nestjs/platform-express": "^10.0.0", "@noahspan/azure-database": "^3.1.2", - "@noahspan/noahspan-modules": "^0.9.2", + "@noahspan/noahspan-modules": "^1.0.0", "@schematics/angular": "^17.3.7", "dotenv": "^16.4.7", "reflect-metadata": "^0.2.2", diff --git a/app/package.json b/app/package.json index f395586..ddaac2c 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "app", "private": true, - "version": "0.0.39", + "version": "1.0.0", "type": "module", "scripts": { "dev": "vite", diff --git a/infrastructure/config/main.tf b/infrastructure/config/main.tf index 7bf5024..2ef1b08 100644 --- a/infrastructure/config/main.tf +++ b/infrastructure/config/main.tf @@ -39,6 +39,11 @@ locals { prod = "flying-prod" } + custom_domain_count = { + test = 0 + prod = 1 + } + logbook_feature_flag_active = { test = "true" prod = "true" diff --git a/infrastructure/config/outputs.tf b/infrastructure/config/outputs.tf index c7103b0..b5384ed 100644 --- a/infrastructure/config/outputs.tf +++ b/infrastructure/config/outputs.tf @@ -30,6 +30,10 @@ output "container_app_environment_name" { value = local.container_app_environment_name[var.environment] } +output "custom_domain_count" { + value = local.custom_domain_count[var.environment] +} + output "logbook_feature_flag_active" { value = local.logbook_feature_flag_active[var.environment] } diff --git a/infrastructure/dns.tf b/infrastructure/dns.tf index afb6d90..346fa4e 100644 --- a/infrastructure/dns.tf +++ b/infrastructure/dns.tf @@ -1,15 +1,19 @@ data "azurerm_dns_zone" "dns_zone" { name = var.DOMAIN_NAME - resource_group_name = data.azurerm_resource_group.resource_group.name } -# resource "azurerm_dns_txt_record" "dns_txt_record" { -# name = "asuid.${var.APP_SUBDOMAIN_NAME}" -# resource_group_name = data.azurerm_resource_group.resource_group.name -# zone_name = data.azurerm_dns_zone.dns_zone.name -# ttl = 14400 +data "azurerm_resource_group" "dns_zone_resource_group" { + name = "noahspan" +} -# record { -# value = azurerm_container_app.container_app_app.custom_domain_verification_id -# } -# } \ No newline at end of file +resource "azurerm_dns_txt_record" "dns_txt_record" { + count = module.environment.custom_domain_count + name = "asuid.${var.APP_SUBDOMAIN_NAME}" + resource_group_name = data.azurerm_resource_group.dns_zone_resource_group.name + zone_name = data.azurerm_dns_zone.dns_zone.name + ttl = 14400 + + record { + value = azurerm_container_app.container_app_app.custom_domain_verification_id + } +} \ No newline at end of file diff --git a/infrastructure/main.tf b/infrastructure/main.tf index 6c5ad6b..77a2c02 100644 --- a/infrastructure/main.tf +++ b/infrastructure/main.tf @@ -148,11 +148,12 @@ resource "azurerm_container_app" "container_app_app" { } } -# resource "azurerm_container_app_custom_domain" "custom_domain" { -# name = trimsuffix(trimprefix(azurerm_dns_txt_record.dns_txt_record.fqdn, "asuid."), ".") -# container_app_id = azurerm_container_app.container_app_app.id +resource "azurerm_container_app_custom_domain" "custom_domain" { + count = module.environment.custom_domain_count + name = trimsuffix(trimprefix(azurerm_dns_txt_record.dns_txt_record[0].fqdn, "asuid."), ".") + container_app_id = azurerm_container_app.container_app_app.id -# lifecycle { -# ignore_changes = [ certificate_binding_type, container_app_environment_certificate_id ] -# } -# } \ No newline at end of file + lifecycle { + ignore_changes = [ certificate_binding_type, container_app_environment_certificate_id ] + } +} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eed4af1..08ee513 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -73,8 +73,8 @@ importers: specifier: ^3.1.2 version: 3.1.2(@nestjs/common@10.4.15(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.15) '@noahspan/noahspan-modules': - specifier: ^0.9.2 - version: 0.9.2 + specifier: ^1.0.0 + version: 1.0.0 '@schematics/angular': specifier: ^17.3.7 version: 17.3.11(chokidar@3.6.0) @@ -1531,8 +1531,8 @@ packages: '@noahspan/noahspan-modules@0.5.9': resolution: {integrity: sha512-kkL9P/TNxuPp5T/gd6gTLAmAGi8SJD4MjTWtsrMvw4WWF69x69m2Nr2G6zCv9WLtFrm4NaJhF8I1MVVuNOCinw==} - '@noahspan/noahspan-modules@0.9.2': - resolution: {integrity: sha512-TU/qO7nNVo+3Ceap7dISUmDtAd/rnZnroCjCK82Zhk6rgj8tkazRhksdUemcdPyienQLJKBaUh6H/sZQNetC1Q==} + '@noahspan/noahspan-modules@1.0.0': + resolution: {integrity: sha512-wO+wsf7AoX2uh+8eDoJHUqObHs5YRk4hzQZZrMB8QIt9HYkg598WMoLzQ1GghYi9o6+aClFSZekXh6+h6SS9IQ==} '@nodelib/fs.scandir@2.1.5': resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} @@ -7165,7 +7165,7 @@ snapshots: - stream-browserify - supports-color - '@noahspan/noahspan-modules@0.9.2': + '@noahspan/noahspan-modules@1.0.0': dependencies: '@azure/identity': 4.6.0 '@azure/msal-node': 2.16.2