From 80569ed602187d5f8b18c2c60b00460accae33fc Mon Sep 17 00:00:00 2001 From: Ryan Tan Date: Tue, 1 Oct 2024 11:35:54 +0800 Subject: [PATCH 1/3] allow matches with govcloud for arn --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index d7879f5..3a53aa6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,7 +20,7 @@ async fn main() -> Result<(), Error> { // if APIKey provided is an ARN, get the APIKey from Secrets Manager let api_key_value = config.api_key.token().to_string(); - if api_key_value.starts_with("arn:aws:secretsmanager:") { + if api_key_value.starts_with("arn:aws") && api_key_value.contains(":secretsmanager") { config.api_key = config::get_api_key_from_secrets_manager(&aws_config, api_key_value) .await .map_err(|e| e.to_string())?; From 242aaaa984c7b46b9e64c1b818606fbf96f93513 Mon Sep 17 00:00:00 2001 From: Ryan Tan Date: Tue, 1 Oct 2024 11:38:49 +0800 Subject: [PATCH 2/3] add changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f2e830..d9e6854 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## v1.0.14 / 2024-01-10 +### 🧰 Bug fixes 🧰 +- Allow matches with arn of aws secretmanager in govcloud, previously only matched with public cloud secretmanager arn + ## v1.0.13 / 2024-11-08 ### 🧰 Bug fixes 🧰 - Allow the lambda to use the runtime `provided.al2`, by changing the binary build of cargo to a version that will support it in the Makefile. Add a parameter `FunctionRunTime` to allow users to choose the function runtime From 48ad23dc32f045bd0d459250532fbbf6c72c159f Mon Sep 17 00:00:00 2001 From: Ryan Tan Date: Tue, 1 Oct 2024 11:41:49 +0800 Subject: [PATCH 3/3] add semantic versioning --- Cargo.toml | 2 +- template.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8a626b4..1e9b260 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "coralogix-aws-shipper" -version = "1.0.13" +version = "1.0.14" edition = "2021" [dependencies] diff --git a/template.yaml b/template.yaml index 0b41afa..c140792 100644 --- a/template.yaml +++ b/template.yaml @@ -25,7 +25,7 @@ Metadata: - kinesis - cloudfront HomePageUrl: https://coralogix.com - SemanticVersion: 1.0.13 + SemanticVersion: 1.0.14 SourceCodeUrl: https://github.com/coralogix/coralogix-aws-shipper AWS::CloudFormation::Interface: