From 043b1841bc6038906b2f11ebcece2b979dcf50fa Mon Sep 17 00:00:00 2001 From: Rohan Weeden Date: Wed, 22 Nov 2023 09:48:02 -0800 Subject: [PATCH 1/5] Use the correct variable for lzards launchpad secret value --- CHANGELOG.md | 2 ++ tf-modules/ingest/lzards-backup-task.tf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ede4a0b804..e189f92878f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). account for AWS character limits. - **CUMULUS-3479** - Fixed typo in s3-replicator resource declaration where `var.lambda_memory_size` is supposed to be `var.lambda_memory_sizes` +- **CUMULUS-????** + - Fixed secret value for `lzards_launchpad_passphrase` which was getting the value from `var.launchpad_passphrase` instead of `var.lzards_launchpad_passphrase`. ## [v18.1.0] 2023-10-25 diff --git a/tf-modules/ingest/lzards-backup-task.tf b/tf-modules/ingest/lzards-backup-task.tf index 9c255b55cce..51bbb838714 100644 --- a/tf-modules/ingest/lzards-backup-task.tf +++ b/tf-modules/ingest/lzards-backup-task.tf @@ -99,7 +99,7 @@ resource "aws_secretsmanager_secret" "lzards_launchpad_passphrase" { resource "aws_secretsmanager_secret_version" "lzards_launchpad_passphrase" { count = length(var.lzards_launchpad_passphrase) == 0 ? 0 : 1 secret_id = aws_secretsmanager_secret.lzards_launchpad_passphrase[0].id - secret_string = var.launchpad_passphrase + secret_string = var.lzards_launchpad_passphrase } data "aws_iam_policy_document" "lzards_processing_role_get_secrets" { From fadc572055f5e8d77b34c8c566934c4294b173a8 Mon Sep 17 00:00:00 2001 From: Jonathan Kovarik Date: Thu, 15 Feb 2024 14:40:36 -0700 Subject: [PATCH 2/5] Fix CL merge --- CHANGELOG.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a113422ecc..05f3e732e77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - **CUMULUS-2890** - Removed unused CloudWatch AWS SDK client. This change removes the CloudWatch client from the `@cumulus/aws-client` package. - + ### Changed - **CUMULUS-3245** @@ -36,10 +36,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - **CUMULUS-3580 - Fixed secret value for `lzards_launchpad_passphrase` which was getting the value from `var.launchpad_passphrase` instead of `var.lzards_launchpad_passphrase`. -- **CUMULUS-3562** - - updated crypto-js to 4.2.0 - - updated aws-sdk/client-api-gateway to 3.499 to avoid older crypto-js dependency - ## [v18.2.0] 2023-02-02 From 4653a7453a3abba183ebb9593980c82628dba4bd Mon Sep 17 00:00:00 2001 From: Jonathan Kovarik Date: Thu, 15 Feb 2024 14:46:32 -0700 Subject: [PATCH 3/5] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05f3e732e77..3214e1e46d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - **CUMULUS-3580 - Fixed secret value for `lzards_launchpad_passphrase` which was getting the value from `var.launchpad_passphrase` instead of `var.lzards_launchpad_passphrase`. + - This fix will result in a potential unexpected change for users that were somehow using the `launchpad_passphrase` for lzards authentication, with an incorrect `lzards_launchpad_passphrase` defined. Users should verify their production configuration to ensure this fix doesn't result in an unexpected failure due to misconfiguration. ## [v18.2.0] 2023-02-02 From 74d6a2eaa6914af76856c3ba02cd24404833b421 Mon Sep 17 00:00:00 2001 From: Nate Pauzenga Date: Mon, 19 Feb 2024 13:05:06 -0500 Subject: [PATCH 4/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 122a06c7364..42f7f4ea34e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ### Fixed -- **CUMULUS-3580 +- **CUMULUS-3580** - Fixed secret value for `lzards_launchpad_passphrase` which was getting the value from `var.launchpad_passphrase` instead of `var.lzards_launchpad_passphrase`. - This fix will result in a potential unexpected change for users that were somehow using the `launchpad_passphrase` for lzards authentication, with an incorrect `lzards_launchpad_passphrase` defined. Users should verify their production configuration to ensure this fix doesn't result in an unexpected failure due to misconfiguration. From b57691cee27faca481dbe3c7dc6dd814ae4aa7aa Mon Sep 17 00:00:00 2001 From: Paul Pilone Date: Tue, 20 Feb 2024 09:16:51 -0500 Subject: [PATCH 5/5] Moves CHANGELOG entry to Breaking Change --- CHANGELOG.md | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42f7f4ea34e..144c8e886fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - **CUMULUS-2897** - Removed unused Systems Manager AWS SDK client. This change removes the Systems Manager client from the `@cumulus/aws-client` package. - +- **CUMULUS-3580** + - Fixed secret value for `lzards_launchpad_passphrase` which was getting the value from `var.launchpad_passphrase` instead of `var.lzards_launchpad_passphrase`. + - This fix will result in a potential unexpected change for users that were somehow using the `launchpad_passphrase` for lzards authentication, with an incorrect `lzards_launchpad_passphrase` defined. Users should verify their production configuration to ensure this fix doesn't result in an unexpected failure due to misconfiguration. + ### Changed - **CUMULUS-3245** @@ -25,11 +28,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). terraform configuration value or utilize `lzardsProvider` as part of the task workflow configuration - Minor refactor of `@cumulus/lzards-api-client` to: - - Use proper ECMAScript import for `@cumulus/launchpad-auth` - - Update incorrect docstring - -### Changed - + - Use proper ECMAScript import for `@cumulus/launchpad-auth` + - Update incorrect docstring - **CUMULUS-3497** - Updated `example/cumulus-tf/orca.tf` to use v9.0.4 - **CUMULUS-3527** @@ -37,10 +37,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ### Fixed -- **CUMULUS-3580** - - Fixed secret value for `lzards_launchpad_passphrase` which was getting the value from `var.launchpad_passphrase` instead of `var.lzards_launchpad_passphrase`. - - This fix will result in a potential unexpected change for users that were somehow using the `launchpad_passphrase` for lzards authentication, with an incorrect `lzards_launchpad_passphrase` defined. Users should verify their production configuration to ensure this fix doesn't result in an unexpected failure due to misconfiguration. - ## [v18.2.0] 2023-02-02 ### Migration Notes