Merge pull request #5065 from nautobot/release/2.1.1

Release/2.1.1
nautobot · Jan 8, 2024 · cf31f79 · cf31f79
2 parents ff3c81d + 2f5d9a9
commit cf31f79
Show file tree

Hide file tree

Showing 624 changed files with 1,744 additions and 33,108 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -17,6 +17,3 @@
 
 # Add specific exclusions
 **/__pycache__
-nautobot/ui/build
-nautobot/ui/generated
-nautobot/ui/node_modules
diff --git a/.eslintignore b/.eslintignore
diff --git a/.flake8 b/.flake8
diff --git a/.github/workflows/ci_integration.yml b/.github/workflows/ci_integration.yml
@@ -115,27 +115,6 @@ jobs:
         run: "poetry run invoke unittest --failfast --keepdb"
       - name: "Run coverage"
         run: "poetry run invoke unittest-coverage"
-  tests-ui:
-    runs-on: "ubuntu-20.04"
-    env:
-      INVOKE_NAUTOBOT_LOCAL: "True"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v2"
-      - name: "Install NPM Dependencies"
-        working-directory: ./nautobot/ui
-        run: "npm ci"
-      - name: "Setup base aliases for tests"
-        working-directory: ./nautobot/ui
-        run: "mkdir generated && cp src/file_templates/jsconfig-base.json generated/jsconfig.paths.json"
-      - name: "Setup base app_imports for mock"
-        working-directory: ./nautobot/ui
-        run: "echo 'export const NautobotApps = {}; export default NautobotApps;' > generated/app_imports.js"
-      - name: "Run unittest-ui"
-        working-directory: ./nautobot/ui
-        run: "poetry run invoke unittest-ui"
   migration-tests-mysql:
     name: "Run migrations against test dataset (MySQL and Python 3.8)"
     runs-on: "ubuntu-20.04"
@@ -259,7 +238,6 @@ jobs:
       - "migration-tests-postgres"
       - "tests-mysql"
       - "tests-postgres"
-      - "tests-ui"
     strategy:
       fail-fast: true
       matrix:

diff --git a/.github/workflows/ci_pullrequest.yml b/.github/workflows/ci_pullrequest.yml
@@ -9,28 +9,6 @@ on:  # yamllint disable
   workflow_call:
 
 jobs:
-  black:
-    runs-on: "ubuntu-20.04"
-    env:
-      INVOKE_NAUTOBOT_LOCAL: "True"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v2"
-      - name: "Linting: black"
-        run: "poetry run invoke black"
-  flake8:
-    runs-on: "ubuntu-20.04"
-    env:
-      INVOKE_NAUTOBOT_LOCAL: "True"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v2"
-      - name: "Linting: flake8"
-        run: "poetry run invoke flake8"
   ruff:
     runs-on: "ubuntu-20.04"
     env:
@@ -42,34 +20,6 @@ jobs:
         uses: "networktocode/gh-action-setup-poetry-environment@v2"
       - name: "Linting: ruff"
         run: "poetry run invoke ruff --output-format github"
-  prettier:
-    runs-on: "ubuntu-20.04"
-    env:
-      INVOKE_NAUTOBOT_LOCAL: "True"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v2"
-      - name: "Install NPM Dependencies"
-        working-directory: "./nautobot/ui"
-        run: "npm ci"
-      - name: "Linting: prettier"
-        run: "poetry run invoke prettier"
-  eslint:
-    runs-on: "ubuntu-20.04"
-    env:
-      INVOKE_NAUTOBOT_LOCAL: "True"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v2"
-      - name: "Install NPM Dependencies"
-        working-directory: "./nautobot/ui"
-        run: "npm ci"
-      - name: "Linting: eslint"
-        run: "poetry run invoke eslint"
   yamllint:
     runs-on: "ubuntu-20.04"
     env:
@@ -90,9 +40,8 @@ jobs:
         uses: "actions/checkout@v2"
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v2"
-      - name: "Install NPM Dependencies"
-        working-directory: "./nautobot/ui"
-        run: "npm ci"
+      - name: "Install markdownlint"
+        run: "npm install markdownlint-cli@0.38.0"
       - name: "Linting: markdownlint"
         run: "poetry run invoke markdownlint"
   hadolint:
@@ -217,10 +166,8 @@ jobs:
       - name: "Run coverage"
         run: "poetry run invoke unittest-coverage"
     needs:
-      - "black"
       - "check-migrations"
       - "check-schema"
-      - "flake8"
       - "hadolint"
       - "markdownlint"
       - "ruff"
@@ -268,38 +215,12 @@ jobs:
       - name: "Run coverage"
         run: "poetry run invoke unittest-coverage"
     needs:
-      - "black"
       - "check-migrations"
       - "check-schema"
-      - "flake8"
       - "hadolint"
       - "markdownlint"
       - "ruff"
       - "yamllint"
-  tests-ui:
-    runs-on: "ubuntu-20.04"
-    env:
-      INVOKE_NAUTOBOT_LOCAL: "True"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v2"
-      - name: "Install NPM Dependencies"
-        working-directory: ./nautobot/ui
-        run: "npm ci"
-      - name: "Setup base aliases for tests"
-        working-directory: ./nautobot/ui
-        run: "mkdir generated && cp src/file_templates/jsconfig-base.json generated/jsconfig.paths.json"
-      - name: "Setup base app_imports for mock"
-        working-directory: ./nautobot/ui
-        run: "echo 'export const NautobotApps = {}; export default NautobotApps;' > generated/app_imports.js"
-      - name: "Run unittest-ui"
-        working-directory: ./nautobot/ui
-        run: "poetry run invoke unittest-ui"
-    needs:
-      - "prettier"
-      - "eslint"
   migration-tests-mysql:
     name: "Run migrations against test dataset (MySQL and Python 3.8)"
     runs-on: "ubuntu-20.04"
@@ -339,10 +260,8 @@ jobs:
       - name: "Run migration test"
         run: "poetry run invoke migration-test --db-engine mysql --dataset $MIGRATION_TEST_DATASET"
     needs:
-      - "black"
       - "check-migrations"
       - "check-schema"
-      - "flake8"
       - "hadolint"
       - "markdownlint"
       - "ruff"
@@ -381,10 +300,8 @@ jobs:
       - name: "Run migration test"
         run: "poetry run invoke migration-test --db-engine postgres --dataset $MIGRATION_TEST_DATASET"
     needs:
-      - "black"
       - "check-migrations"
       - "check-schema"
-      - "flake8"
       - "hadolint"
       - "markdownlint"
       - "ruff"
@@ -429,16 +346,14 @@ jobs:
       - name: "Run coverage"
         run: "poetry run invoke unittest-coverage"
     needs:
-      - "black"
       - "check-migrations"
       - "check-schema"
-      - "flake8"
       - "hadolint"
       - "markdownlint"
       - "ruff"
       - "yamllint"
   changelog:
-    if: contains(fromJson('["develop","next","develop-1.6"]'), github.base_ref)
+    if: ${{ (contains(fromJson('["develop","next"]'), github.base_ref)) || (startsWith(github.base_ref, 'ltm')) }}
     runs-on: "ubuntu-20.04"
     steps:
       - name: "Check out repository code"
@@ -455,10 +370,8 @@ jobs:
     name: "Test Container Build (amd64 only on Python 3.11)"
     runs-on: "ubuntu-22.04"
     needs:
-      - "black"
       - "check-migrations"
       - "check-schema"
-      - "flake8"
       - "hadolint"
       - "markdownlint"
       - "ruff"
@@ -500,4 +413,3 @@ jobs:
       - "pylint"
       - "tests-mysql"
       - "tests-postgres"
-      - "tests-ui"
diff --git a/.gitignore b/.gitignore
@@ -31,4 +31,3 @@ htmlcov/*
 /examples/example_plugin/example_plugin/static/example_plugin/docs/
 development/factory_dump.json
 node_modules
-nautobot/ui/generated
diff --git a/.prettierignore b/.prettierignore
diff --git a/development/docker-compose.dev.yml b/development/docker-compose.dev.yml
@@ -20,30 +20,3 @@ services:
   mkdocs:
     volumes:
       - ../:/source
-  nodejs:
-    image: "local/nautobot-dev:local-py${PYTHON_VER}"
-    environment:
-      PORT: "3000"
-      # DEBUG: "express:*" # nodejs web server debug logging
-    ports:
-      - "3000:3000"
-    working_dir: /opt/nautobot/ui
-    volumes:
-      - ../:/source
-      - ../nautobot/ui/lib:/opt/nautobot/ui/lib
-      - ../nautobot/ui/public:/opt/nautobot/ui/public
-      - ../nautobot/ui/src:/opt/nautobot/ui/src
-    entrypoint: >
-      bash -c "npm run start"
-  storybook:
-    profiles:
-      - storybook
-    # TODO: can we use a lighter-weight base image?
-    image: "local/nautobot-dev:local-py${PYTHON_VER}"
-    environment:
-      PORT: "6006"
-    ports:
-      - "6006:6006"
-    entrypoint: ""
-    # TODO this needs to ensure the version of nautobot-ui remains in sync with package-lock.json
-    command: bash -c "git clone https://github.com/nautobot/nautobot-ui.git && cd nautobot-ui && npm ci && npm run storybook|| npm run storybook"
diff --git a/development/docker-compose.yml b/development/docker-compose.yml
@@ -28,7 +28,7 @@ services:
     healthcheck:
       interval: 5s
       timeout: 5s
-      start_period: 10m  # intentionally conservative upper bound for `npm install` time in a fresh setup
+      start_period: 1m
       retries: 3
       test:
         - "CMD"

diff --git a/development/nautobot_config.py b/development/nautobot_config.py
@@ -1,7 +1,11 @@
 """Nautobot development configuration file."""
 import os
 
-from nautobot.core.settings import *  # noqa: F403
+from nautobot.core.settings import *  # noqa: F403  # undefined-local-with-import-star
+
+# The above results in various F405 undefined-local-with-import-star-usage,
+# "may be undefined, or defined from star imports",
+# which we suppress on a case-by-case basis below
 from nautobot.core.settings_funcs import is_truthy
 
 SECRET_KEY = os.getenv("NAUTOBOT_SECRET_KEY", "012345678901234567890123456789012345678901234567890123456789")
@@ -59,12 +63,12 @@
         "nautobot.core.authentication.ObjectPermissionBackend",
     )
     SOCIAL_AUTH_KEYCLOAK_KEY = "nautobot"
-    SOCIAL_AUTH_KEYCLOAK_SECRET = "7b1c3527-8702-4742-af69-2b74ee5742e8"
+    SOCIAL_AUTH_KEYCLOAK_SECRET = "7b1c3527-8702-4742-af69-2b74ee5742e8"  # noqa: S105  # hardcoded-password-string
     SOCIAL_AUTH_KEYCLOAK_PUBLIC_KEY = requests.get("http://keycloak:8087/realms/nautobot/", timeout=15).json()[
         "public_key"
     ]
     SOCIAL_AUTH_KEYCLOAK_AUTHORIZATION_URL = "http://localhost:8087/realms/nautobot/protocol/openid-connect/auth"
-    SOCIAL_AUTH_KEYCLOAK_ACCESS_TOKEN_URL = "http://keycloak:8087/realms/nautobot/protocol/openid-connect/token"
+    SOCIAL_AUTH_KEYCLOAK_ACCESS_TOKEN_URL = "http://keycloak:8087/realms/nautobot/protocol/openid-connect/token"  # noqa: S105  # hardcoded-password-string
     SOCIAL_AUTH_KEYCLOAK_VERIFY_SSL = False
 
 METRICS_ENABLED = True