chore: some more changes to see cross refs

bcgov · Dec 8, 2024 · fc486c1 · fc486c1
1 parent 0c19311
commit fc486c1
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 14 deletions.
diff --git a/.github/workflows/.deployer.yml b/.github/workflows/.deployer.yml
@@ -14,14 +14,19 @@ on:
         required: true
         default: 'apply'
         type: string
+      working_directory:
+        description: 'The working directory to run the command in'
+        required: true
+        default: 'database'
+        type: string
 
 
 
 
 env:
     TG_VERSION: 0.55.2
     TF_VERSION: 1.5.3
-    TG_SRC_PATH: terraform/backend
+    TG_SRC_PATH: terraform/${{ inputs.working_directory }}
     AWS_REGION: ca-central-1
 jobs:
  deploy_database:
@@ -42,12 +47,8 @@ jobs:
       uses: autero1/action-terragrunt@v3
       with:
           terragrunt-version: ${{ env.TG_VERSION }}
-    - name: Print Terraform directory
-      working-directory: terraform/backend/${{ inputs.environment_name }}
-      run: |
-        ls -la
     - name: Terragrunt Apply
-      working-directory: terraform/backend/${{ inputs.environment_name }}
+      working-directory: terraform/${{ inputs.working_directory }}/${{ inputs.environment_name }}
       env:
           target_env: ${{ inputs.environment_name }}
           aws_license_plate: ${{ secrets.AWS_LICENSE_PLATE }}

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -29,12 +29,22 @@ jobs:
   #        triggers: ('${{ matrix.package }}/')
 
   # https://github.com/bcgov/quickstart-openshift-helpers
-  deploys:
-    name: Deploys
+  deploy-db:
+    name: Deploys Database
     uses: ./.github/workflows/.deployer.yml
     with:
       environment_name: dev
       command: apply
+      working_directory: database
+    secrets: inherit
+  deploy-api:
+    name: Deploys API
+    needs: [deploy-db]
+    uses: ./.github/workflows/.deployer.yml
+    with:
+      environment_name: dev
+      command: apply
+      working_directory: api
     secrets: inherit
 
 
diff --git a/infrastructure/api/ecs.tf b/infrastructure/api/ecs.tf
@@ -1,3 +1,16 @@
-output "master_creds" {
-  value = data.aws_secretsmanager_secret.db-master-creds.secret_string
+data "aws_secretsmanager_secret" "db_master_creds" {
+  name = "db-master-creds-${var.target_env}"
 }
+
+
+
+data "aws_rds_cluster" "rds_cluster" {
+  cluster_identifier = "qsawsc-aurora-cluster-${var.target_env}"
+}
+
+output "db_master_creds" {
+  value = data.aws_secretsmanager_secret.db_master_creds.secret_string
+}
+output "database_endpoint" {
+  value = data.aws_rds_cluster.rds_cluster.endpoint
+}
diff --git a/infrastructure/api/vars.tf b/infrastructure/api/vars.tf
@@ -0,0 +1,4 @@
+variable "target_env" {
+  description = "AWS workload account env"
+  type        = string
+}
diff --git a/infrastructure/backend/aurora-v2.tf → infrastructure/database/aurora-v2.tf b/infrastructure/backend/aurora-v2.tf → infrastructure/database/aurora-v2.tf
@@ -64,7 +64,7 @@ resource "aws_rds_cluster_parameter_group" "db_postgresql" {
 
 
 resource "aws_secretsmanager_secret" "db_mastercreds_secret" {
-  name = "db-master-creds"
+  name = "db-master-creds-${var.target_env}"
 
   tags = {
     managed-by = "terraform"

diff --git a/infrastructure/backend/ec2-jumpbox.tf → infrastructure/database/ec2-jumpbox.tf b/infrastructure/backend/ec2-jumpbox.tf → infrastructure/database/ec2-jumpbox.tf
diff --git a/...ure/backend/networking-security-groups.tf → ...re/database/networking-security-groups.tf b/...ure/backend/networking-security-groups.tf → ...re/database/networking-security-groups.tf
diff --git a/infrastructure/backend/networking.tf → infrastructure/database/networking.tf b/infrastructure/backend/networking.tf → infrastructure/database/networking.tf
diff --git a/infrastructure/backend/vars.tf → infrastructure/database/vars.tf b/infrastructure/backend/vars.tf → infrastructure/database/vars.tf
diff --git a/terraform/api/terragrunt.hcl b/terraform/api/terragrunt.hcl
@@ -13,7 +13,7 @@ locals {
   aws_license_plate          = get_env("aws_license_plate")
   statefile_bucket_name   = "${local.tf_remote_state_prefix}-${local.aws_license_plate}-${local.target_env}" 
   statefile_key           = "${local.target_env}/api/terraform.tfstate"
-  statelock_table_name    = "${local.tf_remote_state_prefix}-lock-${local.aws_license_plate}-${local.target_env}-api" 
+  statelock_table_name    = "${local.tf_remote_state_prefix}-lock-${local.aws_license_plate}"
 }
 
 # Remote S3 state for Terraform.

diff --git a/terraform/backend/dev/terragrunt.hcl → terraform/database/dev/terragrunt.hcl b/terraform/backend/dev/terragrunt.hcl → terraform/database/dev/terragrunt.hcl
diff --git a/terraform/backend/terragrunt.hcl → terraform/database/terragrunt.hcl b/terraform/backend/terragrunt.hcl → terraform/database/terragrunt.hcl
@@ -1,5 +1,5 @@
 terraform {
-  source = "../../..//infrastructure//backend"
+  source = "../../..//infrastructure//database"
 }
 
 
@@ -12,7 +12,7 @@ locals {
   target_env              = get_env("target_env")
   aws_license_plate          = get_env("aws_license_plate")
   statefile_bucket_name   = "${local.tf_remote_state_prefix}-${local.aws_license_plate}-${local.target_env}" 
-  statefile_key           = "database/aurora-v2/terraform.tfstate"
+  statefile_key           = "${local.target_env}/database/aurora-v2/terraform.tfstate"
   statelock_table_name    = "${local.tf_remote_state_prefix}-lock-${local.aws_license_plate}" 
 }