Skip to content

Commit

Permalink
Merge pull request #112 from nautobot/u/hanlin-develop-to-main
Browse files Browse the repository at this point in the history
Address Merge Conflicts between `main` and `develop`
  • Loading branch information
HanlinMiao authored Sep 29, 2023
2 parents 792cad8 + e1b4ae4 commit b37f9a8
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,8 @@ jobs:
strategy:
fail-fast: true
matrix:
# TBD: Fix tested versions
# python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8"]
nautobot-version: ["2.0.0"]
python-version: ["3.8", "3.11"]
nautobot-version: ["2.0.0", "stable"]
db-backend: ["postgresql", "mysql"]
runs-on: "ubuntu-20.04"
env:
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Nautobot Secrets Providers Changelog

## v2.0.0 (TBD)
## v2.0.0 (2023-09-23)

### Changed

Expand All @@ -10,6 +10,12 @@

- [#105](https://github.com/nautobot/nautobot-plugin-secrets-providers/pull/106) Removed `slug` field from `Secret` model. Can be replaced with `name` field or [natural keys](https://docs.nautobot.com/projects/core/en/next/development/apps/migration/model-updates/global/#replace-the-usage-of-slugs-with-composite-keys).

## 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
Expand Down
4 changes: 1 addition & 3 deletions nautobot_secrets_providers/providers/hashicorp.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,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,
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "nautobot-secrets-providers"
version = "2.0.0rc1"
version = "2.0.0"
description = "Nautobot Secrets Providers App"
authors = ["Network to Code, LLC <[email protected]>"]
license = "Apache-2.0"
Expand Down

0 comments on commit b37f9a8

Please sign in to comment.