From 2aad14e06ad0d32262e3b88ebc222a1afeeae7d3 Mon Sep 17 00:00:00 2001 From: Gary Snider <75227981+gsnider2195@users.noreply.github.com> Date: Thu, 1 Aug 2024 19:40:56 -0700 Subject: [PATCH 1/6] Sync main to develop post 3.1.0 (#143) --- changes/137.documentation | 1 - changes/140.housekeeping | 1 - changes/67.added | 1 - docs/admin/compatibility_matrix.md | 1 + docs/admin/release_notes/version_3.1.md | 21 +++++++++++++++++++++ pyproject.toml | 2 +- 6 files changed, 23 insertions(+), 4 deletions(-) delete mode 100644 changes/137.documentation delete mode 100644 changes/140.housekeeping delete mode 100644 changes/67.added create mode 100644 docs/admin/release_notes/version_3.1.md diff --git a/changes/137.documentation b/changes/137.documentation deleted file mode 100644 index 895f86f..0000000 --- a/changes/137.documentation +++ /dev/null @@ -1 +0,0 @@ -Updated documentation links for installed apps page. \ No newline at end of file diff --git a/changes/140.housekeeping b/changes/140.housekeeping deleted file mode 100644 index e108705..0000000 --- a/changes/140.housekeeping +++ /dev/null @@ -1 +0,0 @@ -Updated development environment to use `certifi` `2024.7.4`. diff --git a/changes/67.added b/changes/67.added deleted file mode 100644 index e0bd43f..0000000 --- a/changes/67.added +++ /dev/null @@ -1 +0,0 @@ -Added the ability to choose between multiple vaults (configurations) for HashiCorp. \ No newline at end of file diff --git a/docs/admin/compatibility_matrix.md b/docs/admin/compatibility_matrix.md index 74f5a5f..2734c17 100644 --- a/docs/admin/compatibility_matrix.md +++ b/docs/admin/compatibility_matrix.md @@ -6,3 +6,4 @@ | 1.4.X | 1.4.0 | 1.99.99 | | 2.0.X | 2.0.0 | 2.99.99 | | 3.0.X | 2.0.0 | 2.99.99 | +| 3.1.X | 2.0.0 | 2.99.99 | diff --git a/docs/admin/release_notes/version_3.1.md b/docs/admin/release_notes/version_3.1.md new file mode 100644 index 0000000..783f9ab --- /dev/null +++ b/docs/admin/release_notes/version_3.1.md @@ -0,0 +1,21 @@ +# v3.1 Release Notes + +This document describes all new features and changes in the release `3.1`. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## Release Overview + +This release adds support for multiple HashiCorp Vault secrets providers. + +## [v3.1.0 (2024-08-01)](https://github.com/nautobot/nautobot-app-secrets-providers/releases/tag/v3.1.0) + +### Added + +- [#67](https://github.com/nautobot/nautobot-app-secrets-providers/issues/67) - Added the ability to choose between multiple vaults (configurations) for HashiCorp. + +### Documentation + +- [#137](https://github.com/nautobot/nautobot-app-secrets-providers/issues/137) - Updated documentation links for installed apps page. + +### Housekeeping + +- [#140](https://github.com/nautobot/nautobot-app-secrets-providers/issues/140) - Updated development environment to use `certifi` `2024.7.4`. diff --git a/pyproject.toml b/pyproject.toml index a745129..76a19fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nautobot-secrets-providers" -version = "3.1.0-beta.1" +version = "3.2.0-beta.1" description = "Nautobot Secrets Providers App" authors = ["Network to Code, LLC "] license = "Apache-2.0" From fabe8fc0a18f1dde2a1ec6f42d47ddb95fdda571 Mon Sep 17 00:00:00 2001 From: Nautobot-Bot <79372327+nautobot-bot@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:45:26 -0400 Subject: [PATCH 2/6] Cookie updated by NetworkToCode Cookie Drift Manager Tool (#144) * Cookie updated by NetworkToCode Cookie Drift Manager Tool Template: ``` { "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git", "dir": "nautobot-app", "ref": "refs/tags/nautobot-app-v2.3.0", "path": null } ``` Cookie: ``` { "remote": "https://github.com/nautobot/nautobot-app-secrets-providers.git", "path": "/tmp/tmpfhiln0kg/nautobot-app-secrets-providers", "repository_path": "/tmp/tmpfhiln0kg/nautobot-app-secrets-providers", "dir": "", "branch_prefix": "drift-manager", "context": { "codeowner_github_usernames": "@nautobot/core", "full_name": "Network to Code, LLC", "email": "info@networktocode.com", "github_org": "nautobot", "app_name": "nautobot_secrets_providers", "verbose_name": "Secrets Providers", "app_slug": "nautobot-secrets-providers", "project_slug": "nautobot-app-secrets-providers", "repo_url": "https://github.com/nautobot/nautobot-app-secrets-providers", "base_url": "secrets-providers", "min_nautobot_version": "2.0.0", "max_nautobot_version": "2.9999", "camel_name": "NautobotSecretsProviders", "project_short_description": "Nautobot App that provides direct integrations with Enterprise secrets management systems. Provides patterns to securely fetch secrets for use by other Nautobot Apps and Nautobot Jobs.", "model_class_name": "None", "open_source_license": "Apache-2.0", "docs_base_url": "https://docs.nautobot.com", "docs_app_url": "https://docs.nautobot.com/projects/secrets-providers/en/latest", "_template": "https://github.com/nautobot/cookiecutter-nautobot-app.git", "_output_dir": "/tmp/tmpfhiln0kg", "_repo_dir": "/github/home/.cookiecutters/cookiecutter-nautobot-app/nautobot-app", "_checkout": "refs/tags/nautobot-app-v2.3.0" }, "base_branch": "develop", "remote_name": "origin", "pull_request_strategy": "PullRequestStrategy.CREATE", "post_actions": [ "PostAction.BLACK" ], "baked_commit_ref": "07ab5a6da72c934c43f1f957ce073bedbfdbfc9a", "draft": true } ``` CLI Arguments: ``` { "cookie_dir": "", "input": false, "json_filename": "", "output_dir": "", "push": true, "template": "", "template_dir": "", "template_ref": "refs/tags/nautobot-app-v2.3.0", "pull_request": null, "post_action": [], "disable_post_actions": false, "draft": null } ``` * changelog, remove bandit, fix some ruff failures * remove placeholder in readme * fix compatibility matrix * remove placeholder test * fix workflow * remove api code reference --------- Co-authored-by: bakebot Co-authored-by: Gary Snider <75227981+gsnider2195@users.noreply.github.com> --- .bandit.yml | 6 - .cookiecutter.json | 4 +- .dockerignore | 1 - .flake8 | 10 - .../pull_request_template.md | 2 +- .github/workflows/ci.yml | 37 +-- README.md | 6 +- changes/144.housekeeping | 1 + development/nautobot_config.py | 7 +- docs/admin/install.md | 2 +- docs/assets/extra.css | 2 +- docs/dev/contributing.md | 24 +- docs/dev/dev_environment.md | 10 +- docs/requirements.txt | 2 +- mkdocs.yml | 3 +- .../0001_update_thycotic_delinea_slug.py | 1 - .../providers/__init__.py | 2 +- nautobot_secrets_providers/providers/aws.py | 4 +- nautobot_secrets_providers/providers/azure.py | 2 +- .../providers/choices.py | 10 +- .../providers/delinea.py | 14 +- .../providers/hashicorp.py | 6 +- nautobot_secrets_providers/secrets.py | 1 - .../tests/nautobot_config.py | 3 +- .../tests/test_basic.py | 10 +- .../tests/test_providers.py | 9 +- nautobot_secrets_providers/urls.py | 3 +- poetry.lock | 237 ++---------------- pyproject.toml | 52 ++-- tasks.py | 111 ++++---- 30 files changed, 158 insertions(+), 424 deletions(-) delete mode 100644 .bandit.yml delete mode 100644 .flake8 create mode 100644 changes/144.housekeeping diff --git a/.bandit.yml b/.bandit.yml deleted file mode 100644 index 56f7a83..0000000 --- a/.bandit.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -skips: [] -# No need to check for security issues in the test scripts! -exclude_dirs: - - "./tests/" - - "./.venv/" diff --git a/.cookiecutter.json b/.cookiecutter.json index 60025f8..3d6a21a 100644 --- a/.cookiecutter.json +++ b/.cookiecutter.json @@ -21,7 +21,7 @@ "_drift_manager": { "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git", "template_dir": "nautobot-app", - "template_ref": "refs/tags/nautobot-app-v2.2.1", + "template_ref": "refs/tags/nautobot-app-v2.3.0", "cookie_dir": "", "branch_prefix": "drift-manager", "pull_request_strategy": "create", @@ -29,7 +29,7 @@ "black" ], "draft": true, - "baked_commit_ref": "07ab5a6da72c934c43f1f957ce073bedbfdbfc9a" + "baked_commit_ref": "f75687d1998767d0385ff1eb722abf2044208871" } } } diff --git a/.dockerignore b/.dockerignore index 2270f49..a0bf06f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -19,7 +19,6 @@ FAQ.md .git/ .gitignore .github -tasks.py LICENSE **/*.log **/.vscode/ diff --git a/.flake8 b/.flake8 deleted file mode 100644 index c9f5e84..0000000 --- a/.flake8 +++ /dev/null @@ -1,10 +0,0 @@ -[flake8] -ignore = - E501, # Line length is enforced by Black, so flake8 doesn't need to check it - W503 # Black disagrees with this rule, as does PEP 8; Black wins -exclude = - migrations, - __pycache__, - manage.py, - settings.py, - .venv diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md index 6881e27..d9f19db 100644 --- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md @@ -1,5 +1,5 @@