resolve merge conflict

nautobot · Sep 29, 2023 · 326d139 · 326d139
2 parents 5acedaf + f4283a9
commit 326d139
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Nautobot Secrets Providers Changelog
 
+## v1.4.1 (2023-06-07)
+
+### Fixed
+
+- [#91](https://github.com/nautobot/nautobot-plugin-secrets-providers/issues/91) Fixed Hashicorp Vault Authentication with AWS Credentials when region is not set.
+
 ## v1.4.0 (2023-04-19)
 
 ### Added

diff --git a/nautobot_secrets_providers/providers/hashicorp.py b/nautobot_secrets_providers/providers/hashicorp.py
@@ -151,9 +151,7 @@ def get_client(cls, secret=None):
                 elif auth_method == "aws":
                     session = boto3.Session()
                     aws_creds = session.get_credentials()
-                    aws_region = session.region_name
-                    if aws_region is None:
-                        aws_region = "us-east-1"
+                    aws_region = session.region_name or "us-east-1"
                     client.auth.aws.iam_login(
                         access_key=aws_creds.access_key,
                         secret_key=aws_creds.secret_key,

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nautobot-secrets-providers"
-version = "1.4.1b1"
+version = "1.4.1"
 description = "Nautobot Secrets Providers Plugin."
 authors = ["Network to Code, LLC <info@networktocode.com>"]
 license = "Apache-2.0"