Skip to content

Commit fd4ff8a

Browse files
snaseljsnaselj
authored
Cookie updated by NetworkToCode Cookie Drift Manager Tool (#106)
* Cookie updated by NetworkToCode Cookie Drift Manager Tool Template: ``` { "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git", "dir": "nautobot-app", "ref": "develop", "path": null } ``` Cookie: ``` { "remote": "https://github.com/nautobot/nautobot-plugin-secrets-providers.git", "path": "/opt/ntc/outputs/nautobot-plugin-secrets-providers", "repository_path": "/opt/ntc/outputs/nautobot-plugin-secrets-providers", "dir": "", "branch_prefix": "drift-manager", "context": { "codeowner_github_usernames": "@smith-ntc", "full_name": "Network to Code, LLC", "email": "[email protected]", "github_org": "nautobot", "plugin_name": "nautobot_secrets_providers", "verbose_name": "Nautobot's Secrets Providers Plugin", "plugin_slug": "nautobot-secrets-providers", "project_slug": "nautobot-plugin-secrets-providers", "repo_url": "https://github.com/nautobot/nautobot-plugin-secrets-providers", "base_url": "secrets-providers", "min_nautobot_version": "1.4.0", "max_nautobot_version": "1.9999", "nautobot_version": "latest", "camel_name": "NautobotSecretsProviders", "project_short_description": "Nautobot's Secrets Providers Plugin", "version": "0.1.0", "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": "/opt/ntc/outputs", "_repo_dir": "/home/jsn/.cookiecutters/cookiecutter-nautobot-app/nautobot-app" }, "base_branch": "develop", "remote_name": "origin" } ``` CLI Arguments: ``` { "cookie_dir": "", "input": false, "json_filename": "", "output_dir": "/opt/ntc/outputs", "push": true, "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git", "template_dir": "nautobot-app", "template_ref": "develop" } ``` * fix: Poetry lock * fix: Missing requests_mock dependency
1 parent 4cf2469 commit fd4ff8a

18 files changed

+1040
-90
lines changed

‎.cookiecutter.json

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
11
{
2-
"cookiecutter": {
3-
"codeowner_github_usernames": "@smith-ntc",
4-
"full_name": "Network to Code, LLC",
5-
"email": "[email protected]",
6-
"github_org": "nautobot",
7-
"base_name": "secrets_providers",
8-
"plugin_name": "nautobot_secrets_providers",
9-
"verbose_name": "Nautobot's Secrets Providers Plugin",
10-
"plugin_slug": "nautobot-secrets-providers",
11-
"project_slug": "nautobot-plugin-secrets-providers",
12-
"repo_url": "https://github.com/nautobot/nautobot-plugin-secrets-providers",
13-
"base_url": "secrets-providers",
14-
"min_nautobot_version": "1.4.0",
15-
"max_nautobot_version": "1.9999",
16-
"nautobot_version": "latest",
17-
"camel_name": "NautobotSecretsProviders",
18-
"project_short_description": "Nautobot's Secrets Providers Plugin",
19-
"version": "0.1.0",
20-
"model_class_name": "None",
21-
"open_source_license": "Apache-2.0",
22-
"docs_base_url": "https://docs.nautobot.com",
23-
"docs_app_url": "https://docs.nautobot.com/projects/secrets-providers/en/latest",
24-
"_template_directory": "nautobot-plugin",
25-
"_drift_manager": {
26-
"template": "https://github.com/networktocode-llc/cookiecutter-ntc.git",
27-
"template_dir": "nautobot-plugin",
28-
"template_ref": "nautobot-plugin-v1.0",
29-
"cookie_dir": "",
30-
"branch_prefix": "drift-manager"
2+
"cookiecutter": {
3+
"codeowner_github_usernames": "@smith-ntc",
4+
"full_name": "Network to Code, LLC",
5+
"email": "[email protected]",
6+
"github_org": "nautobot",
7+
"plugin_name": "nautobot_secrets_providers",
8+
"verbose_name": "Nautobot's Secrets Providers Plugin",
9+
"plugin_slug": "nautobot-secrets-providers",
10+
"project_slug": "nautobot-plugin-secrets-providers",
11+
"repo_url": "https://github.com/nautobot/nautobot-plugin-secrets-providers",
12+
"base_url": "secrets-providers",
13+
"min_nautobot_version": "1.4.0",
14+
"max_nautobot_version": "1.9999",
15+
"nautobot_version": "latest",
16+
"camel_name": "NautobotSecretsProviders",
17+
"project_short_description": "Nautobot's Secrets Providers Plugin",
18+
"version": "0.1.0",
19+
"model_class_name": "None",
20+
"open_source_license": "Apache-2.0",
21+
"docs_base_url": "https://docs.nautobot.com",
22+
"docs_app_url": "https://docs.nautobot.com/projects/secrets-providers/en/latest",
23+
"_drift_manager": {
24+
"template": "https://github.com/nautobot/cookiecutter-nautobot-app.git",
25+
"template_dir": "nautobot-app",
26+
"template_ref": "develop",
27+
"cookie_dir": "",
28+
"branch_prefix": "drift-manager"
29+
}
3130
}
32-
}
3331
}

‎.flake8

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[flake8]
2-
# E501: Line length is enforced by Black, so flake8 doesn't need to check it
3-
# W503: Black disagrees with this rule, as does PEP 8; Black wins
4-
ignore = E501, W503
2+
ignore =
3+
E501, # Line length is enforced by Black, so flake8 doesn't need to check it
4+
W503 # Black disagrees with this rule, as does PEP 8; Black wins
55
exclude =
66
migrations,
77
__pycache__,

‎.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
INVOKE_NAUTOBOT_SECRETS_PROVIDERS_LOCAL: "True"
2323
steps:
2424
- name: "Check out repository code"
25-
uses: "actions/checkout@v2"
25+
uses: "actions/checkout@v3"
2626
- name: "Setup environment"
2727
uses: "networktocode/gh-action-setup-poetry-environment@v4"
2828
- name: "Linting: black"
@@ -33,7 +33,7 @@ jobs:
3333
INVOKE_NAUTOBOT_SECRETS_PROVIDERS_LOCAL: "True"
3434
steps:
3535
- name: "Check out repository code"
36-
uses: "actions/checkout@v2"
36+
uses: "actions/checkout@v3"
3737
- name: "Setup environment"
3838
uses: "networktocode/gh-action-setup-poetry-environment@v4"
3939
- name: "Linting: bandit"
@@ -44,7 +44,7 @@ jobs:
4444
INVOKE_NAUTOBOT_SECRETS_PROVIDERS_LOCAL: "True"
4545
steps:
4646
- name: "Check out repository code"
47-
uses: "actions/checkout@v2"
47+
uses: "actions/checkout@v3"
4848
- name: "Setup environment"
4949
uses: "networktocode/gh-action-setup-poetry-environment@v4"
5050
- name: "Linting: pydocstyle"
@@ -55,7 +55,7 @@ jobs:
5555
INVOKE_NAUTOBOT_SECRETS_PROVIDERS_LOCAL: "True"
5656
steps:
5757
- name: "Check out repository code"
58-
uses: "actions/checkout@v2"
58+
uses: "actions/checkout@v3"
5959
- name: "Setup environment"
6060
uses: "networktocode/gh-action-setup-poetry-environment@v4"
6161
- name: "Linting: flake8"
@@ -66,7 +66,7 @@ jobs:
6666
INVOKE_NAUTOBOT_SECRETS_PROVIDERS_LOCAL: "True"
6767
steps:
6868
- name: "Check out repository code"
69-
uses: "actions/checkout@v2"
69+
uses: "actions/checkout@v3"
7070
- name: "Setup environment"
7171
uses: "networktocode/gh-action-setup-poetry-environment@v4"
7272
- name: "Linting: yamllint"
@@ -89,7 +89,7 @@ jobs:
8989
INVOKE_NAUTOBOT_SECRETS_PROVIDERS_NAUTOBOT_VER: "${{ matrix.nautobot-version }}"
9090
steps:
9191
- name: "Check out repository code"
92-
uses: "actions/checkout@v2"
92+
uses: "actions/checkout@v3"
9393
- name: "Setup environment"
9494
uses: "networktocode/gh-action-setup-poetry-environment@v4"
9595
- name: "Set up Docker Buildx"
@@ -130,7 +130,7 @@ jobs:
130130
INVOKE_NAUTOBOT_SECRETS_PROVIDERS_NAUTOBOT_VER: "${{ matrix.nautobot-version }}"
131131
steps:
132132
- name: "Check out repository code"
133-
uses: "actions/checkout@v2"
133+
uses: "actions/checkout@v3"
134134
- name: "Setup environment"
135135
uses: "networktocode/gh-action-setup-poetry-environment@v4"
136136
- name: "Set up Docker Buildx"
@@ -165,7 +165,7 @@ jobs:
165165
if: "startsWith(github.ref, 'refs/tags/v')"
166166
steps:
167167
- name: "Check out repository code"
168-
uses: "actions/checkout@v2"
168+
uses: "actions/checkout@v3"
169169
- name: "Set up Python"
170170
uses: "actions/setup-python@v2"
171171
with:
@@ -181,7 +181,7 @@ jobs:
181181
- name: "Upload binaries to release"
182182
uses: "svenstaro/upload-release-action@v2"
183183
with:
184-
repo_token: "${{ secrets.NTC_GITHUB_TOKEN }}"
184+
repo_token: "${{ secrets.NTC_GITHUB_TOKEN }}" # use GH_NAUTOBOT_BOT_TOKEN for Nautobot Org repos.
185185
file: "dist/*"
186186
tag: "${{ github.ref }}"
187187
overwrite: true
@@ -194,7 +194,7 @@ jobs:
194194
if: "startsWith(github.ref, 'refs/tags/v')"
195195
steps:
196196
- name: "Check out repository code"
197-
uses: "actions/checkout@v2"
197+
uses: "actions/checkout@v3"
198198
- name: "Set up Python"
199199
uses: "actions/setup-python@v2"
200200
with:

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,3 +306,5 @@ invoke.yml
306306
docs/README.md
307307
docs/CHANGELOG.md
308308
public
309+
/compose.yaml
310+
/dump.sql

‎.yamllint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ rules:
1010
quote-type: "double"
1111
ignore: |
1212
.venv/
13+
compose.yaml

‎development/docker-compose.base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ services:
2222
db:
2323
condition: "service_healthy"
2424
<<:
25-
- *nautobot-build
2625
- *nautobot-base
26+
- *nautobot-build
2727
worker:
2828
entrypoint:
2929
- "sh"

‎development/docker-compose.dev.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ services:
1212
volumes:
1313
- "./nautobot_config.py:/opt/nautobot/nautobot_config.py"
1414
- "../:/source"
15+
healthcheck:
16+
test: ["CMD", "true"] # Due to layering, disable: true won't work. Instead, change the test
1517
docs:
1618
entrypoint: "mkdocs serve -v -a 0.0.0.0:8080"
1719
ports:
@@ -30,6 +32,8 @@ services:
3032
volumes:
3133
- "./nautobot_config.py:/opt/nautobot/nautobot_config.py"
3234
- "../:/source"
35+
healthcheck:
36+
test: ["CMD", "true"] # Due to layering, disable: true won't work. Instead, change the test
3337
# To expose postgres or redis to the host uncomment the following
3438
# postgres:
3539
# ports:

‎development/docker-compose.mysql.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,20 @@ services:
2020
image: "mysql:8"
2121
command:
2222
- "--default-authentication-plugin=mysql_native_password"
23+
- "--max_connections=1000"
2324
env_file:
2425
- "development.env"
2526
- "creds.env"
2627
- "development_mysql.env"
2728
volumes:
2829
- "mysql_data:/var/lib/mysql"
2930
healthcheck:
30-
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
31+
test:
32+
- "CMD"
33+
- "mysqladmin"
34+
- "ping"
35+
- "-h"
36+
- "localhost"
3137
timeout: "20s"
3238
retries: 10
3339
volumes:

‎development/docker-compose.postgres.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ services:
77
- "NAUTOBOT_DB_ENGINE=django.db.backends.postgresql"
88
db:
99
image: "postgres:13-alpine"
10+
command:
11+
- "-c"
12+
- "max_connections=200"
1013
env_file:
1114
- "development.env"
1215
- "creds.env"

‎development/nautobot_config.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from nautobot.core.settings import * # noqa: F403 # pylint: disable=wildcard-import,unused-wildcard-import
77
from nautobot.core.settings_funcs import parse_redis_connection, is_truthy
88

9-
109
# Enforce required configuration parameters
1110
for key in [
1211
"NAUTOBOT_ALLOWED_HOSTS",

0 commit comments

Comments
 (0)