Merge pull request #141 from Onemind-Services-LLC/dev

Release v2.0.0
Onemind-Services-LLC · Jul 15, 2024 · 0112397 · 0112397
2 parents b26fd5d + 750558f
commit 0112397
Show file tree

Hide file tree

Showing 43 changed files with 741 additions and 558 deletions.
diff --git a/.github/labels.toml b/.github/labels.toml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.12
       - name: Lint Code Base
         uses: github/super-linter/slim@v4
         env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,43 @@
 
 ## [Unreleased](https://github.com/Onemind-Services-LLC/netbox-secrets/tree/HEAD)
 
-[Full Changelog](https://github.com/Onemind-Services-LLC/netbox-secrets/compare/v1.10.0...HEAD)
+[Full Changelog](https://github.com/Onemind-Services-LLC/netbox-secrets/compare/v1.10.2...HEAD)
+
+**Closed issues:**
+
+- Netbox 4.0 Support [\#136](https://github.com/Onemind-Services-LLC/netbox-secrets/issues/136)
+- \[Docs\]: Add help for upgrading from netbox 2.11 to 3.x [\#134](https://github.com/Onemind-Services-LLC/netbox-secrets/issues/134)
+- \[Bug\]:  List View action Buttons not Visible [\#132](https://github.com/Onemind-Services-LLC/netbox-secrets/issues/132)
+- \[Feature\]:  Hashicorp Vault integration? [\#125](https://github.com/Onemind-Services-LLC/netbox-secrets/issues/125)
+- \[Bug\]: User Key Add Error: `'str' object has no attribute '_meta'` [\#116](https://github.com/Onemind-Services-LLC/netbox-secrets/issues/116)
+- \[Bug\]: Cannot create more than one un-named secret for an object [\#100](https://github.com/Onemind-Services-LLC/netbox-secrets/issues/100)
+- \[Feature\]: pass session key in GET/POST requests data [\#85](https://github.com/Onemind-Services-LLC/netbox-secrets/issues/85)
+- \[Feature\]: Add button to export keys to a file for download and a button to copy the private key [\#16](https://github.com/Onemind-Services-LLC/netbox-secrets/issues/16)
+
+**Merged pull requests:**
+
+- Bump braces from 3.0.2 to 3.0.3 in /netbox\_secrets/project-static in the npm\_and\_yarn group across 1 directory [\#140](https://github.com/Onemind-Services-LLC/netbox-secrets/pull/140) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v1.10.2](https://github.com/Onemind-Services-LLC/netbox-secrets/tree/v1.10.2) (2024-01-26)
+
+[Full Changelog](https://github.com/Onemind-Services-LLC/netbox-secrets/compare/v1.9.2...v1.10.2)
+
+**Merged pull requests:**
+
+- Reverted 8257a03 to fix filtersets [\#129](https://github.com/Onemind-Services-LLC/netbox-secrets/pull/129) ([abhi1693](https://github.com/abhi1693))
+
+## [v1.9.2](https://github.com/Onemind-Services-LLC/netbox-secrets/tree/v1.9.2) (2024-01-26)
+
+[Full Changelog](https://github.com/Onemind-Services-LLC/netbox-secrets/compare/v1.10.1...v1.9.2)
+
+**Closed issues:**
+
+- \[Feature\]: Disable encryption? [\#126](https://github.com/Onemind-Services-LLC/netbox-secrets/issues/126)
+- Mismatch in PluginConfig Attributes and Update descriptions in setup.py file [\#124](https://github.com/Onemind-Services-LLC/netbox-secrets/issues/124)
+
+## [v1.10.1](https://github.com/Onemind-Services-LLC/netbox-secrets/tree/v1.10.1) (2024-01-03)
+
+[Full Changelog](https://github.com/Onemind-Services-LLC/netbox-secrets/compare/v1.10.0...v1.10.1)
 
 **Closed issues:**
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG NETBOX_VARIANT=v3.7
+ARG NETBOX_VARIANT=v4.0
 
 FROM netboxcommunity/netbox:${NETBOX_VARIANT}
 

diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ and stability.
 | 3.5.x          | 1.8.x          |
 | 3.6.x          | 1.9.x          |
 | 3.7.x          | 1.10.x         |
+| 4.0.x          | 2.0.x          |
 
 # Installation
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.4'
-
 services:
   netbox:
     build:
@@ -14,7 +12,7 @@ services:
 
   # postgres
   postgres:
-    image: postgres:14-alpine
+    image: postgres:16-alpine
     env_file: env/postgres.env
 
   # redis

diff --git a/netbox_secrets/__init__.py b/netbox_secrets/__init__.py
@@ -1,7 +1,8 @@
 from importlib.metadata import metadata
 
 from django.db.utils import OperationalError, ProgrammingError
-from extras.plugins import PluginConfig
+
+from netbox.plugins import PluginConfig
 
 metadata = metadata('netbox_secrets')
 
@@ -14,8 +15,8 @@ class NetBoxSecrets(PluginConfig):
     author = metadata.get('Author')
     author_email = metadata.get('Author-email')
     base_url = 'secrets'
-    min_version = '3.7.0'
-    max_version = '3.7.99'
+    min_version = '4.0.0'
+    max_version = '4.0.99'
     required_settings = []
     default_settings = {
         'apps': ['dcim.device', 'virtualization.virtualmachine'],

diff --git a/netbox_secrets/admin.py b/netbox_secrets/admin.py
diff --git a/netbox_secrets/api/nested_serializers.py b/netbox_secrets/api/nested_serializers.py