Merge branch 'delete-dev-env-wf' of github.com:cds-snc/notification-t…

…erraform into delete-dev-env-wf
cds-snc · Oct 10, 2024 · 981f3eb · 981f3eb
2 parents 1fb951a + 15d0e26
commit 981f3eb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/infrastructure_version.txt b/.github/workflows/infrastructure_version.txt
@@ -1 +1 @@
-2.16.27
+2.16.30
diff --git a/aws/quicksight/dataset_notifications.tf b/aws/quicksight/dataset_notifications.tf
@@ -14,6 +14,7 @@ resource "aws_quicksight_data_set" "notifications" {
         with notification_data as (
             select 
               id as notification_id,
+              billable_units as notification_billable_units,
               created_at as notification_created_at,
               queue_name as notification_queue_name,
               sent_at as notification_sent_at,
@@ -30,6 +31,7 @@ resource "aws_quicksight_data_set" "notifications" {
           union
             select 
               id as notification_id,
+              billable_units as notification_billable_units,
               created_at as notification_created_at,
               queue_name as notification_queue_name,
               sent_at as notification_sent_at,
@@ -75,7 +77,7 @@ resource "aws_quicksight_data_set" "notifications" {
           left outer join template_categories tc on tc.id = t.template_category_id
         )
         select
-          notification_id, notification_created_at, notification_sent_at, notification_status,
+          notification_id, notification_billable_units, notification_created_at, notification_sent_at, notification_status,
           notification_queue_name, notification_type, notification_updated_at, 
           notification_reference, job_id, api_key_id, api_key_type,
           s.*, t.*
@@ -88,6 +90,10 @@ resource "aws_quicksight_data_set" "notifications" {
         name = "notification_id"
         type = "STRING"
       }
+      columns {
+        name = "notification_billable_units"
+        type = "INTEGER"
+      }
       columns {
         name = "notification_created_at"
         type = "DATETIME"

diff --git a/env/production/eks/terragrunt.hcl b/env/production/eks/terragrunt.hcl
@@ -1,3 +1,5 @@
+#PRODUCTION EKS VERSIONS: K8s Node Upgrade 1.30.4-20240917
+
 terraform {
   source = "${get_env("ENVIRONMENT") == "production" ? "git::https://github.com/cds-snc/notification-terraform//aws/eks?ref=v${get_env("INFRASTRUCTURE_VERSION")}" : "../../../aws//eks"}"
 }