Skip to content

Commit 175f8c3

Browse files
authored
Merge pull request #151 from ryanmerolle/dev
1.3.0
2 parents 6c744b1 + a8243bd commit 175f8c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+623
-267
lines changed

.devcontainer/Dockerfile-plugin_dev

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
ARG NETBOX_VARIANT=v3.4
1+
ARG NETBOX_VARIANT=v3.5
22

33
FROM netboxcommunity/netbox:${NETBOX_VARIANT}
44

5-
ARG NETBOX_INITIALIZERS_VARIANT=3.4.*
5+
ARG NETBOX_INITIALIZERS_VARIANT=3.5.*
66

77
ARG DEBIAN_FRONTEND=noninteractive
88

.devcontainer/configuration/configuration.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Read secret from file
88
def _read_secret(secret_name, default=None):
99
try:
10-
f = open("/run/secrets/" + secret_name, encoding="utf-8")
10+
f = open(f"/run/secrets/{secret_name}", encoding="utf-8")
1111
except OSError:
1212
return default
1313
else:
@@ -74,8 +74,7 @@ def _read_secret(secret_name, default=None):
7474
environ.get("REDIS_CACHE_PASSWORD", environ.get("REDIS_PASSWORD", "")),
7575
),
7676
"DATABASE": int(environ.get("REDIS_CACHE_DATABASE", 1)),
77-
"SSL": environ.get("REDIS_CACHE_SSL", environ.get("REDIS_SSL", "False")).lower()
78-
== "true",
77+
"SSL": environ.get("REDIS_CACHE_SSL", environ.get("REDIS_SSL", "False")).lower() == "true",
7978
"INSECURE_SKIP_TLS_VERIFY": environ.get(
8079
"REDIS_CACHE_INSECURE_SKIP_TLS_VERIFY",
8180
environ.get("REDIS_INSECURE_SKIP_TLS_VERIFY", "False"),
@@ -252,9 +251,7 @@ def _read_secret(secret_name, default=None):
252251
"netbox.authentication.RemoteUserBackend",
253252
)
254253
REMOTE_AUTH_HEADER = environ.get("REMOTE_AUTH_HEADER", "HTTP_REMOTE_USER")
255-
REMOTE_AUTH_AUTO_CREATE_USER = (
256-
environ.get("REMOTE_AUTH_AUTO_CREATE_USER", "True").lower() == "true"
257-
)
254+
REMOTE_AUTH_AUTO_CREATE_USER = environ.get("REMOTE_AUTH_AUTO_CREATE_USER", "True").lower() == "true"
258255
REMOTE_AUTH_DEFAULT_GROUPS = list(
259256
filter(None, environ.get("REMOTE_AUTH_DEFAULT_GROUPS", "").split(" ")),
260257
)

.devcontainer/devcontainer.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,31 @@
7878
"extensions": [
7979
"DavidAnson.vscode-markdownlint",
8080
"GitHub.codespaces",
81+
"GitHub.copilot-labs",
8182
"GitHub.vscode-pull-request-github",
83+
"Gruntfuggly.todo-tree",
8284
"Tyriar.sort-lines",
8385
"aaron-bond.better-comments",
8486
"batisteo.vscode-django",
87+
"charliermarsh.ruff",
8588
"codezombiech.gitignore",
8689
"esbenp.prettier-vscode",
90+
"exiasr.hadolint",
8791
"formulahendry.auto-rename-tag",
8892
"mintlify.document",
93+
"ms-python.isort",
94+
"ms-python.pylint",
8995
"ms-python.python",
9096
"ms-python.vscode-pylance",
97+
"ms-vscode.makefile-tools",
9198
"mutantdino.resourcemonitor",
99+
"oderwat.indent-rainbow",
92100
"paulomenezes.duplicated-code",
101+
"redhat.vscode-yaml",
93102
"searKing.preview-vscode",
94-
"sourcery.sourcery"
103+
"sourcery.sourcery",
104+
"wholroyd.jinja",
105+
"yzhang.markdown-all-in-one"
95106
]
96107
}
97108
},

.devcontainer/env/netbox.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ REDIS_DATABASE=0
1515
REDIS_HOST=redis
1616
REDIS_INSECURE_SKIP_TLS_VERIFY=false
1717
REDIS_PASSWORD=H733Kdjndks81
18-
SECRET_KEY=r8OwDznj!!dciP9ghmRfdu1Ysxm0AiPeDCQhKE+N_rClfWNj
18+
SECRET_KEY=r8OwDznj!!dciP9ghmRfdu1Ysxm0AiPeDCQhKE+N_rClfWNjaa
1919
SUPERUSER_API_TOKEN=0123456789abcdef0123456789abcdef01234567
2020
SUPERUSER_EMAIL=[email protected]
2121
SUPERUSER_NAME=admin

.devcontainer/requirements-dev.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ pycodestyle
1010
pydocstyle
1111
pylint
1212
pylint-django
13+
ruff
14+
sourcery-analytics
1315
wily
1416
yapf

.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[flake8]
2-
max-line-length = 160
2+
max-line-length = 140
33
extend-ignore = E203

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ body:
2323
attributes:
2424
label: NetBox access-list plugin version
2525
description: What version of the NetBox access-list plugin are you currently running?
26-
placeholder: v1.2.0
26+
placeholder: v1.3.0
2727
validations:
2828
required: true
2929
- type: input
3030
attributes:
3131
label: NetBox version
3232
description: What version of NetBox are you currently running?
33-
placeholder: v3.4.3
33+
placeholder: v3.5.4
3434
validations:
3535
required: true
3636
- type: textarea

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ body:
1515
attributes:
1616
label: NetBox version
1717
description: What version of NetBox are you currently running?
18-
placeholder: v3.4.3
18+
placeholder: v3.5.4
1919
validations:
2020
required: true
2121
- type: dropdown

.github/linters/.flake8

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/linters/.isort.cfg

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)