Merge remote-tracking branch 'origin/next-2.0' into drift-manager/pr

nautobot · Aug 29, 2023 · fd306ad · fd306ad
2 parents 65e6e2a + 77bf2b4
commit fd306ad
Show file tree

Hide file tree

Showing 13 changed files with 432 additions and 553 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -73,17 +73,17 @@ jobs:
         run: "poetry run invoke yamllint"
   pylint:
     needs:
+      - "black"
       - "bandit"
       - "pydocstyle"
       - "flake8"
       - "yamllint"
-      - "black"
     runs-on: "ubuntu-20.04"
     strategy:
       fail-fast: true
       matrix:
         python-version: ["3.8"]
-        nautobot-version: ["1.4.0"]
+        nautobot-version: ["2.0.0-rc.2"]
     env:
       INVOKE_NAUTOBOT_SECRETS_PROVIDERS_PYTHON_VER: "${{ matrix.python-version }}"
       INVOKE_NAUTOBOT_SECRETS_PROVIDERS_NAUTOBOT_VER: "${{ matrix.nautobot-version }}"
@@ -119,19 +119,11 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
-        db-backend: ["postgresql"]
-        nautobot-version: ["stable"]
-        include:
-          - python-version: "3.10"
-            db-backend: "postgresql"
-            nautobot-version: "1.4.0"
-          - python-version: "3.8"
-            db-backend: "mysql"
-            nautobot-version: "1.4.0"
-          - python-version: "3.10"
-            db-backend: "mysql"
-            nautobot-version: "stable"
+        # TBD: Fix tested versions
+        # python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8"]
+        nautobot-version: ["2.0.0-rc.2"]
+        db-backend: ["postgresql", "mysql"]
     runs-on: "ubuntu-20.04"
     env:
       INVOKE_NAUTOBOT_SECRETS_PROVIDERS_PYTHON_VER: "${{ matrix.python-version }}"

diff --git a/.github/workflows/upstream_testing.yml b/.github/workflows/upstream_testing.yml
@@ -3,7 +3,7 @@ name: "Nautobot Upstream Monitor"
 
 on:  # yamllint disable-line rule:truthy rule:comments
   schedule:
-    - cron: "0 4 */2 * *"  # every other day at 4:00
+    - cron: "0 4 */2 * *"  # every other day at midnight
 
 jobs:
   upstream-test:

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Nautobot Secrets Providers
 
-Nautobot Secrets Providers is a plugin for [Nautobot](https://github.com/nautobot/nautobot) 1.2.0 or higher that bundles Secrets Providers for integrating with popular secrets backends. Nautobot 1.2.0 added support for integrating with retrieving secrets from various secrets providers.
+Nautobot Secrets Providers is a plugin for [Nautobot](https://github.com/nautobot/nautobot) 1.4.0 or higher that bundles Secrets Providers for integrating with popular secrets backends. Nautobot 1.4.0 added support for integrating with retrieving secrets from various secrets providers.
 
 This plugin publishes secrets providers that are not included in the within the Nautobot core software package so that it will be easier to maintain and extend support for various secrets providers without waiting on Nautobot software releases.
 

diff --git a/development/Dockerfile b/development/Dockerfile
@@ -6,8 +6,8 @@
 # -------------------------------------------------------------------------------------
 # !!! USE CAUTION WHEN MODIFYING LINES BELOW
 
-# Accepts a desired Nautobot version as build argument, default to 1.4.0
-ARG NAUTOBOT_VER="1.4.0"
+# Accepts a desired Nautobot version as build argument, default to `2.0.0-rc.2`
+ARG NAUTOBOT_VER="2.0.0-rc.2"
 
 # Accepts a desired Python version as build argument, default to 3.8
 ARG PYTHON_VER="3.8"

diff --git a/invoke.example.yml b/invoke.example.yml
@@ -1,7 +1,7 @@
 ---
 nautobot_secrets_providers:
   project_name: "nautobot-secrets-providers"
-  nautobot_ver: "latest"
+  nautobot_ver: "2.0.0-rc.2"
   local: false
   python_ver: "3.8"
   compose_dir: "development"

diff --git a/nautobot_secrets_providers/__init__.py b/nautobot_secrets_providers/__init__.py
@@ -17,8 +17,8 @@ class NautobotSecretsProvidersConfig(NautobotAppConfig):
     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."
     base_url = "secrets"
     required_settings = []
-    min_version = "1.4.0"
-    max_version = "1.9999"
+    min_version = "2.0.0-rc.2"
+    max_version = "2.9999"
     default_settings = {}
     caching_config = {}
 

diff --git a/nautobot_secrets_providers/providers/aws.py b/nautobot_secrets_providers/providers/aws.py
@@ -11,7 +11,7 @@
 
 from django import forms
 
-from nautobot.utilities.forms import BootstrapMixin
+from nautobot.core.forms import BootstrapMixin
 from nautobot.extras.secrets import exceptions, SecretsProvider
 
 

diff --git a/nautobot_secrets_providers/providers/choices.py b/nautobot_secrets_providers/providers/choices.py
@@ -1,5 +1,5 @@
 """Choices for Thycotic Secret Server Plugin."""
-from nautobot.utilities.choices import ChoiceSet
+from nautobot.core.choices import ChoiceSet
 
 
 class ThycoticSecretChoices(ChoiceSet):

diff --git a/nautobot_secrets_providers/providers/delinea.py b/nautobot_secrets_providers/providers/delinea.py
@@ -33,7 +33,7 @@
     except ImportError:
         thycotic_installed = False  # pylint: disable=invalid-name
 
-from nautobot.utilities.forms import BootstrapMixin
+from nautobot.core.forms import BootstrapMixin
 from nautobot.extras.secrets import exceptions, SecretsProvider
 
 from .choices import ThycoticSecretChoices

diff --git a/nautobot_secrets_providers/providers/hashicorp.py b/nautobot_secrets_providers/providers/hashicorp.py
@@ -13,7 +13,7 @@
 except ImportError:
     hvac = None
 
-from nautobot.utilities.forms import BootstrapMixin
+from nautobot.core.forms import BootstrapMixin
 from nautobot.extras.secrets import exceptions, SecretsProvider
 
 from .choices import HashicorpKVVersionChoices