From fd449a12d910e50716186c4048ac7b01528ee602 Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Sat, 21 Jan 2023 22:36:40 -0500 Subject: [PATCH] lint fixes --- .devcontainer/devcontainer.json | 5 +- .devcontainer/docker-compose.override.yml | 1 + .devcontainer/docker-compose.yml | 9 +-- .devcontainer/initializers/aggregates.yml | 1 + .devcontainer/initializers/asns.yml | 1 + .devcontainer/initializers/cables.yml | 1 + .devcontainer/initializers/circuit_types.yml | 1 + .devcontainer/initializers/circuits.yml | 1 + .devcontainer/initializers/cluster_groups.yml | 1 + .devcontainer/initializers/cluster_types.yml | 1 + .devcontainer/initializers/clusters.yml | 1 + .devcontainer/initializers/contact_groups.yml | 1 + .devcontainer/initializers/contact_roles.yml | 1 + .devcontainer/initializers/contacts.yml | 1 + .devcontainer/initializers/custom_fields.yml | 55 +++++++++--------- .devcontainer/initializers/custom_links.yml | 1 + .devcontainer/initializers/device_roles.yml | 1 + .devcontainer/initializers/device_types.yml | 1 + .devcontainer/initializers/devices.yml | 1 + .devcontainer/initializers/groups.yml | 1 + .devcontainer/initializers/interfaces.yml | 1 + .devcontainer/initializers/ip_addresses.yml | 1 + .devcontainer/initializers/locations.yml | 1 + .devcontainer/initializers/manufacturers.yml | 1 + .../initializers/object_permissions.yml | 1 + .devcontainer/initializers/platforms.yml | 1 + .devcontainer/initializers/power_feeds.yml | 1 + .devcontainer/initializers/power_panels.yml | 1 + .../initializers/prefix_vlan_roles.yml | 1 + .devcontainer/initializers/prefixes.yml | 1 + .devcontainer/initializers/providers.yml | 1 + .devcontainer/initializers/rack_roles.yml | 1 + .devcontainer/initializers/racks.yml | 1 + .devcontainer/initializers/regions.yml | 1 + .devcontainer/initializers/rirs.yml | 1 + .devcontainer/initializers/route_targets.yml | 1 + .devcontainer/initializers/services.yml | 1 + .devcontainer/initializers/sites.yml | 1 + .devcontainer/initializers/tags.yml | 1 + .devcontainer/initializers/tenant_groups.yml | 1 + .devcontainer/initializers/tenants.yml | 1 + .devcontainer/initializers/users.yml | 1 + .../initializers/virtual_machines.yml | 1 + .../virtualization_interfaces.yml | 1 + .devcontainer/initializers/vlan_groups.yml | 1 + .devcontainer/initializers/vlans.yml | 1 + .devcontainer/initializers/vrfs.yml | 1 + .devcontainer/initializers/webhooks.yml | 1 + .github/linters/.jscpd.json | 2 +- .github/workflows/codeql-analysis.yml | 56 +++++++++---------- .github/workflows/greetings.yml | 10 ++-- .github/workflows/super-linter.yml | 4 +- .pre-commit-config.yaml | 12 ++-- README.md | 4 +- .../0002_alter_accesslist_options_and_more.py | 15 +++-- 55 files changed, 132 insertions(+), 85 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2c47708..a3fc26f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -25,11 +25,12 @@ // "source.organizeImports": true // } //}, - "python.sortImports.args": [ + "isort.args": [ "--profile=black" ], - "python.sortImports.path": "/opt/netbox/venv/bin/isort", + "isort.path": "/opt/netbox/venv/bin/isort", "python.analysis.typeCheckingMode": "strict", + python.Jedi "python.analysis.extraPaths": [ "/opt/netbox/netbox" ], diff --git a/.devcontainer/docker-compose.override.yml b/.devcontainer/docker-compose.override.yml index 31816f6..705885f 100644 --- a/.devcontainer/docker-compose.override.yml +++ b/.devcontainer/docker-compose.override.yml @@ -1,3 +1,4 @@ +--- version: '3.4' services: netbox: diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index f9513a2..a213cbe 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,3 +1,4 @@ +--- version: '3.4' services: netbox: &netbox @@ -35,15 +36,15 @@ services: image: postgres:14-alpine env_file: env/postgres.env volumes: - - netbox-postgres-data:/var/lib/postgresql/data + - netbox-postgres-data:/var/lib/postgresql/data # redis redis: image: redis:6-alpine command: - - sh - - -c # this is to evaluate the $REDIS_PASSWORD from the env - - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose + - sh + - -c # this is to evaluate the $REDIS_PASSWORD from the env + - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose env_file: env/redis.env #volumes: # - netbox-redis-data:/data diff --git a/.devcontainer/initializers/aggregates.yml b/.devcontainer/initializers/aggregates.yml index ae92ec0..d41539d 100644 --- a/.devcontainer/initializers/aggregates.yml +++ b/.devcontainer/initializers/aggregates.yml @@ -1,3 +1,4 @@ +--- - prefix: 10.0.0.0/16 rir: RFC1918 tenant: tenant1 diff --git a/.devcontainer/initializers/asns.yml b/.devcontainer/initializers/asns.yml index 8e6393e..b65197c 100644 --- a/.devcontainer/initializers/asns.yml +++ b/.devcontainer/initializers/asns.yml @@ -1,3 +1,4 @@ +--- - asn: 1 rir: RFC1918 tenant: tenant1 diff --git a/.devcontainer/initializers/cables.yml b/.devcontainer/initializers/cables.yml index 9d100a5..0e9b83d 100644 --- a/.devcontainer/initializers/cables.yml +++ b/.devcontainer/initializers/cables.yml @@ -1,3 +1,4 @@ +--- # Required parameters for termination X ('a' or 'b'): # # ``` diff --git a/.devcontainer/initializers/circuit_types.yml b/.devcontainer/initializers/circuit_types.yml index 95dee30..5bd53e4 100644 --- a/.devcontainer/initializers/circuit_types.yml +++ b/.devcontainer/initializers/circuit_types.yml @@ -1,3 +1,4 @@ +--- - name: VPLS slug: vpls - name: MPLS diff --git a/.devcontainer/initializers/circuits.yml b/.devcontainer/initializers/circuits.yml index 6dd8602..b69efb3 100644 --- a/.devcontainer/initializers/circuits.yml +++ b/.devcontainer/initializers/circuits.yml @@ -1,3 +1,4 @@ +--- - cid: Circuit_ID-1 provider: Provider1 type: Internet diff --git a/.devcontainer/initializers/cluster_groups.yml b/.devcontainer/initializers/cluster_groups.yml index b8a54b4..503fd7e 100644 --- a/.devcontainer/initializers/cluster_groups.yml +++ b/.devcontainer/initializers/cluster_groups.yml @@ -1,3 +1,4 @@ +--- - name: Group 1 slug: group-1 - name: Group 2 diff --git a/.devcontainer/initializers/cluster_types.yml b/.devcontainer/initializers/cluster_types.yml index 0ca1f8d..c2342ac 100644 --- a/.devcontainer/initializers/cluster_types.yml +++ b/.devcontainer/initializers/cluster_types.yml @@ -1,2 +1,3 @@ +--- - name: Hyper-V slug: hyper-v diff --git a/.devcontainer/initializers/clusters.yml b/.devcontainer/initializers/clusters.yml index 3ed7c8e..c47ca5f 100644 --- a/.devcontainer/initializers/clusters.yml +++ b/.devcontainer/initializers/clusters.yml @@ -1,3 +1,4 @@ +--- - name: cluster1 type: Hyper-V group: Group 1 diff --git a/.devcontainer/initializers/contact_groups.yml b/.devcontainer/initializers/contact_groups.yml index 843b902..db171af 100644 --- a/.devcontainer/initializers/contact_groups.yml +++ b/.devcontainer/initializers/contact_groups.yml @@ -1,3 +1,4 @@ +--- - name: Network-Team slug: network-team description: This is a new contact group for the Network-Team diff --git a/.devcontainer/initializers/contact_roles.yml b/.devcontainer/initializers/contact_roles.yml index 8253ea5..858a225 100644 --- a/.devcontainer/initializers/contact_roles.yml +++ b/.devcontainer/initializers/contact_roles.yml @@ -1,3 +1,4 @@ +--- - name: New Contact Role slug: new-contact-role description: This is a new contact role description diff --git a/.devcontainer/initializers/contacts.yml b/.devcontainer/initializers/contacts.yml index 622f3d0..e48a81e 100644 --- a/.devcontainer/initializers/contacts.yml +++ b/.devcontainer/initializers/contacts.yml @@ -1,3 +1,4 @@ +--- - name: Lee Widget title: CEO of Widget Corp phone: 221-555-1212 diff --git a/.devcontainer/initializers/custom_fields.yml b/.devcontainer/initializers/custom_fields.yml index 25da99b..0687a2b 100644 --- a/.devcontainer/initializers/custom_fields.yml +++ b/.devcontainer/initializers/custom_fields.yml @@ -1,3 +1,4 @@ +--- ## Possible Choices: ## type: ## - text @@ -23,14 +24,14 @@ text_field: required: false weight: 0 on_objects: - - dcim.models.Device - - dcim.models.Rack - - dcim.models.Site - - dcim.models.DeviceType - - ipam.models.IPAddress - - ipam.models.Prefix - - tenancy.models.Tenant - - virtualization.models.VirtualMachine + - dcim.models.Device + - dcim.models.Rack + - dcim.models.Site + - dcim.models.DeviceType + - ipam.models.IPAddress + - ipam.models.Prefix + - tenancy.models.Tenant + - virtualization.models.VirtualMachine integer_field: type: integer label: Custom Number @@ -41,7 +42,7 @@ integer_field: validation_maximum: 255 weight: 10 on_objects: - - tenancy.models.Tenant + - tenancy.models.Tenant select_field: type: select label: Choose between items @@ -50,13 +51,13 @@ select_field: weight: 30 default: First Item on_objects: - - dcim.models.Device + - dcim.models.Device choices: - - First Item - - Second Item - - Third Item - - Fifth Item - - Fourth Item + - First Item + - Second Item + - Third Item + - Fifth Item + - Fourth Item select_field_legacy_format: type: select label: Choose between items @@ -64,14 +65,14 @@ select_field_legacy_format: filter_logic: loose weight: 30 on_objects: - - dcim.models.Device + - dcim.models.Device choices: - - value: A # this is the deprecated format. - - value: B # we only use it for the tests. - - value: C # please see above for the new format. - - value: "D like deprecated" - weight: 999 - - value: E + - value: A # this is the deprecated format. + - value: B # we only use it for the tests. + - value: C # please see above for the new format. + - value: "D like deprecated" + weight: 999 + - value: E boolean_field: type: boolean label: Yes Or No? @@ -80,7 +81,7 @@ boolean_field: default: "false" # important: put "false" in quotes! weight: 90 on_objects: - - dcim.models.Device + - dcim.models.Device url_field: type: url label: Hyperlink @@ -89,14 +90,14 @@ url_field: filter_logic: disabled validation_regex: ^https:// on_objects: - - tenancy.models.Tenant + - tenancy.models.Tenant date_field: type: date label: Important Date required: false filter_logic: disabled on_objects: - - dcim.models.Device + - dcim.models.Device multiobject_field: type: multiobject label: Related Objects @@ -104,7 +105,7 @@ multiobject_field: required: true filter_logic: loose on_objects: - - dcim.models.Location + - dcim.models.Location object_type: ipam.models.IPAddress object_field: type: object @@ -113,5 +114,5 @@ object_field: required: false filter_logic: loose on_objects: - - dcim.models.Device + - dcim.models.Device object_type: ipam.models.ASN diff --git a/.devcontainer/initializers/custom_links.yml b/.devcontainer/initializers/custom_links.yml index 2ac822b..c7348bc 100644 --- a/.devcontainer/initializers/custom_links.yml +++ b/.devcontainer/initializers/custom_links.yml @@ -1,3 +1,4 @@ +--- ## Possible Choices: ## new_window: ## - True diff --git a/.devcontainer/initializers/device_roles.yml b/.devcontainer/initializers/device_roles.yml index 2f327e1..aa829c9 100644 --- a/.devcontainer/initializers/device_roles.yml +++ b/.devcontainer/initializers/device_roles.yml @@ -1,3 +1,4 @@ +--- - name: switch slug: switch color: Grey diff --git a/.devcontainer/initializers/device_types.yml b/.devcontainer/initializers/device_types.yml index b056cc3..08c472f 100644 --- a/.devcontainer/initializers/device_types.yml +++ b/.devcontainer/initializers/device_types.yml @@ -1,3 +1,4 @@ +--- - model: Model 1 manufacturer: Manufacturer 1 slug: model-1 diff --git a/.devcontainer/initializers/devices.yml b/.devcontainer/initializers/devices.yml index dbd9182..06a0fbf 100644 --- a/.devcontainer/initializers/devices.yml +++ b/.devcontainer/initializers/devices.yml @@ -1,3 +1,4 @@ +--- ## Possible Choices: ## face: ## - front diff --git a/.devcontainer/initializers/groups.yml b/.devcontainer/initializers/groups.yml index 705a992..c49242f 100644 --- a/.devcontainer/initializers/groups.yml +++ b/.devcontainer/initializers/groups.yml @@ -1,3 +1,4 @@ +--- applications: users: - technical_user diff --git a/.devcontainer/initializers/interfaces.yml b/.devcontainer/initializers/interfaces.yml index 6c57f53..f3c8309 100644 --- a/.devcontainer/initializers/interfaces.yml +++ b/.devcontainer/initializers/interfaces.yml @@ -1,3 +1,4 @@ +--- ## Possible Choices: ## type: ## - virtual diff --git a/.devcontainer/initializers/ip_addresses.yml b/.devcontainer/initializers/ip_addresses.yml index 7f0debf..a81cb3a 100644 --- a/.devcontainer/initializers/ip_addresses.yml +++ b/.devcontainer/initializers/ip_addresses.yml @@ -1,3 +1,4 @@ +--- ## Possible Choices: ## status: ## - active diff --git a/.devcontainer/initializers/locations.yml b/.devcontainer/initializers/locations.yml index ff8cb42..3595f7d 100644 --- a/.devcontainer/initializers/locations.yml +++ b/.devcontainer/initializers/locations.yml @@ -1,3 +1,4 @@ +--- - name: cage 101 slug: cage-101 site: SING 1 diff --git a/.devcontainer/initializers/manufacturers.yml b/.devcontainer/initializers/manufacturers.yml index f8e5cca..8463d76 100644 --- a/.devcontainer/initializers/manufacturers.yml +++ b/.devcontainer/initializers/manufacturers.yml @@ -1,3 +1,4 @@ +--- - name: Manufacturer 1 slug: manufacturer-1 - name: Manufacturer 2 diff --git a/.devcontainer/initializers/object_permissions.yml b/.devcontainer/initializers/object_permissions.yml index fdd5cfb..4914bdc 100644 --- a/.devcontainer/initializers/object_permissions.yml +++ b/.devcontainer/initializers/object_permissions.yml @@ -1,3 +1,4 @@ +--- all.ro: actions: - view diff --git a/.devcontainer/initializers/platforms.yml b/.devcontainer/initializers/platforms.yml index 8fc82be..510ab04 100644 --- a/.devcontainer/initializers/platforms.yml +++ b/.devcontainer/initializers/platforms.yml @@ -1,3 +1,4 @@ +--- - name: Platform 1 slug: platform-1 manufacturer: Manufacturer 1 diff --git a/.devcontainer/initializers/power_feeds.yml b/.devcontainer/initializers/power_feeds.yml index 595c3d2..a32e3dd 100644 --- a/.devcontainer/initializers/power_feeds.yml +++ b/.devcontainer/initializers/power_feeds.yml @@ -1,3 +1,4 @@ +--- - name: power feed 1 power_panel: power panel AMS 1 voltage: 208 diff --git a/.devcontainer/initializers/power_panels.yml b/.devcontainer/initializers/power_panels.yml index 4bb656b..757b4b3 100644 --- a/.devcontainer/initializers/power_panels.yml +++ b/.devcontainer/initializers/power_panels.yml @@ -1,3 +1,4 @@ +--- - name: power panel AMS 1 site: AMS 1 - name: power panel SING 1 diff --git a/.devcontainer/initializers/prefix_vlan_roles.yml b/.devcontainer/initializers/prefix_vlan_roles.yml index 20043c9..4f269c7 100644 --- a/.devcontainer/initializers/prefix_vlan_roles.yml +++ b/.devcontainer/initializers/prefix_vlan_roles.yml @@ -1,2 +1,3 @@ +--- - name: Main Management slug: main-management diff --git a/.devcontainer/initializers/prefixes.yml b/.devcontainer/initializers/prefixes.yml index 9c0439b..78ae23c 100644 --- a/.devcontainer/initializers/prefixes.yml +++ b/.devcontainer/initializers/prefixes.yml @@ -1,3 +1,4 @@ +--- ## Possible Choices: ## status: ## - container diff --git a/.devcontainer/initializers/providers.yml b/.devcontainer/initializers/providers.yml index 4d0e5b0..6465b82 100644 --- a/.devcontainer/initializers/providers.yml +++ b/.devcontainer/initializers/providers.yml @@ -1,3 +1,4 @@ +--- - name: Provider1 slug: provider1 asn: 121 diff --git a/.devcontainer/initializers/rack_roles.yml b/.devcontainer/initializers/rack_roles.yml index 7af7a74..54e95ed 100644 --- a/.devcontainer/initializers/rack_roles.yml +++ b/.devcontainer/initializers/rack_roles.yml @@ -1,3 +1,4 @@ +--- - name: Role 1 slug: role-1 color: Pink diff --git a/.devcontainer/initializers/racks.yml b/.devcontainer/initializers/racks.yml index 881dec8..05d6b22 100644 --- a/.devcontainer/initializers/racks.yml +++ b/.devcontainer/initializers/racks.yml @@ -1,3 +1,4 @@ +--- ## Possible Choices: ## width: ## - 19 diff --git a/.devcontainer/initializers/regions.yml b/.devcontainer/initializers/regions.yml index 11db5bf..a818c6f 100644 --- a/.devcontainer/initializers/regions.yml +++ b/.devcontainer/initializers/regions.yml @@ -1,3 +1,4 @@ +--- - name: Singapore slug: singapore - name: Amsterdam diff --git a/.devcontainer/initializers/rirs.yml b/.devcontainer/initializers/rirs.yml index a74d484..34777f9 100644 --- a/.devcontainer/initializers/rirs.yml +++ b/.devcontainer/initializers/rirs.yml @@ -1,3 +1,4 @@ +--- - is_private: true name: RFC1918 slug: rfc1918 diff --git a/.devcontainer/initializers/route_targets.yml b/.devcontainer/initializers/route_targets.yml index 786d24e..2fa188e 100644 --- a/.devcontainer/initializers/route_targets.yml +++ b/.devcontainer/initializers/route_targets.yml @@ -1,3 +1,4 @@ +--- - name: 65000:1001 tenant: tenant1 - name: 65000:1002 diff --git a/.devcontainer/initializers/services.yml b/.devcontainer/initializers/services.yml index e04bee8..88cd473 100644 --- a/.devcontainer/initializers/services.yml +++ b/.devcontainer/initializers/services.yml @@ -1,3 +1,4 @@ +--- - name: DNS protocol: TCP ports: diff --git a/.devcontainer/initializers/sites.yml b/.devcontainer/initializers/sites.yml index ed5a28e..cbc20b8 100644 --- a/.devcontainer/initializers/sites.yml +++ b/.devcontainer/initializers/sites.yml @@ -1,3 +1,4 @@ +--- - name: AMS 1 slug: ams1 region: Downtown diff --git a/.devcontainer/initializers/tags.yml b/.devcontainer/initializers/tags.yml index ff582d3..2697237 100644 --- a/.devcontainer/initializers/tags.yml +++ b/.devcontainer/initializers/tags.yml @@ -1,3 +1,4 @@ +--- - name: Tag 1 slug: tag-1 color: Pink diff --git a/.devcontainer/initializers/tenant_groups.yml b/.devcontainer/initializers/tenant_groups.yml index a535b25..79fa5cb 100644 --- a/.devcontainer/initializers/tenant_groups.yml +++ b/.devcontainer/initializers/tenant_groups.yml @@ -1,3 +1,4 @@ +--- - name: Tenant Group 1 slug: tenant-group-1 - name: Tenant Group 2 diff --git a/.devcontainer/initializers/tenants.yml b/.devcontainer/initializers/tenants.yml index fd63d1c..d3a983e 100644 --- a/.devcontainer/initializers/tenants.yml +++ b/.devcontainer/initializers/tenants.yml @@ -1,3 +1,4 @@ +--- - name: tenant1 slug: tenant1 - name: tenant2 diff --git a/.devcontainer/initializers/users.yml b/.devcontainer/initializers/users.yml index 0d83523..d6ebd18 100644 --- a/.devcontainer/initializers/users.yml +++ b/.devcontainer/initializers/users.yml @@ -1,3 +1,4 @@ +--- technical_user: api_token: "" # a token is generated automatically unless the value is explicity set to empty reader: diff --git a/.devcontainer/initializers/virtual_machines.yml b/.devcontainer/initializers/virtual_machines.yml index 1dad3d4..bc2c4ee 100644 --- a/.devcontainer/initializers/virtual_machines.yml +++ b/.devcontainer/initializers/virtual_machines.yml @@ -1,3 +1,4 @@ +--- ## Possible Choices: ## status: ## - active diff --git a/.devcontainer/initializers/virtualization_interfaces.yml b/.devcontainer/initializers/virtualization_interfaces.yml index 29e9965..396a8c8 100644 --- a/.devcontainer/initializers/virtualization_interfaces.yml +++ b/.devcontainer/initializers/virtualization_interfaces.yml @@ -1,3 +1,4 @@ +--- - description: Network Interface 1 enabled: true mac_address: 00:77:77:77:77:77 diff --git a/.devcontainer/initializers/vlan_groups.yml b/.devcontainer/initializers/vlan_groups.yml index c385b44..6aae0d8 100644 --- a/.devcontainer/initializers/vlan_groups.yml +++ b/.devcontainer/initializers/vlan_groups.yml @@ -1,3 +1,4 @@ +--- - name: VLAN group 1 scope_type: dcim.region scope: Amsterdam diff --git a/.devcontainer/initializers/vlans.yml b/.devcontainer/initializers/vlans.yml index eb596f1..d2c8543 100644 --- a/.devcontainer/initializers/vlans.yml +++ b/.devcontainer/initializers/vlans.yml @@ -1,3 +1,4 @@ +--- ## Possible Choices: ## status: ## - active diff --git a/.devcontainer/initializers/vrfs.yml b/.devcontainer/initializers/vrfs.yml index 6f91b90..accb990 100644 --- a/.devcontainer/initializers/vrfs.yml +++ b/.devcontainer/initializers/vrfs.yml @@ -1,3 +1,4 @@ +--- - enforce_unique: true name: vrf1 tenant: tenant1 diff --git a/.devcontainer/initializers/webhooks.yml b/.devcontainer/initializers/webhooks.yml index 5386b14..f25260c 100644 --- a/.devcontainer/initializers/webhooks.yml +++ b/.devcontainer/initializers/webhooks.yml @@ -1,3 +1,4 @@ +--- ## Possible Choices: ## object_types: ## - device diff --git a/.github/linters/.jscpd.json b/.github/linters/.jscpd.json index 297e436..a474b30 100644 --- a/.github/linters/.jscpd.json +++ b/.github/linters/.jscpd.json @@ -1,3 +1,3 @@ { "threshold": 10 -} \ No newline at end of file +} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 777eb0a..94e8b63 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -14,10 +14,10 @@ name: "CodeQL" on: push: - branches: [ "dev" ] + branches: ["dev"] pull_request: # The branches below must be a subset of the branches above - branches: [ "dev" ] + branches: ["dev"] schedule: - cron: '24 4 * * 5' @@ -33,41 +33,41 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'python' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + language: ['python'] + # CodeQL supports ['cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby'] # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support steps: - - name: Checkout repository - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. - # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality + # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index b48ffe8..9c446ca 100644 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -10,8 +10,8 @@ jobs: issues: write pull-requests: write steps: - - uses: actions/first-interaction@v1 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - issue-message: "Thanks for opening this Issue! We really appreciate the feedback & testing from users like you!" - pr-message: "🎉 Thanks for opening this pull request! We really appreciate contributors like you! 🙌" + - uses: actions/first-interaction@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + issue-message: "Thanks for opening this Issue! We really appreciate the feedback & testing from users like you!" + pr-message: "🎉 Thanks for opening this pull request! We really appreciate contributors like you! 🙌" diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml index ed20562..49aa1ee 100644 --- a/.github/workflows/super-linter.yml +++ b/.github/workflows/super-linter.yml @@ -9,9 +9,9 @@ name: Lint Code Base on: push: - branches: [ "dev" ] + branches: ["dev"] pull_request: - branches: [ "dev" ] + branches: ["dev"] jobs: run-lint: runs-on: ubuntu-latest diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6c8ceb0..9f31f9d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -37,15 +37,11 @@ repos: hooks: - id: pyupgrade args: - - "--py37-plus" - #- repo: https://github.com/adrienverge/yamllint - # rev: v1.26.3 - # hooks: - # - id: yamllint - - repo: https://github.com/psf/black - rev: 22.12.0 + - "--py39-plus" + - repo: https://github.com/adrienverge/yamllint + rev: v1.29.0 hooks: - - id: black + - id: yamllint #- repo: https://github.com/Lucas-C/pre-commit-hooks-nodejs # rev: v1.1.2 # hooks: diff --git a/README.md b/README.md index 30026d2..35400de 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ This project just looks to build on top of this framework and model presented. This project is currently maintained jointly by: -* [Abhimanyu Saharan](https://github.com/abhi1693) -* [Ryan Merolle](https://github.com/ryanmerolle) +- [Abhimanyu Saharan](https://github.com/abhi1693) +- [Ryan Merolle](https://github.com/ryanmerolle) See the [CONTRIBUTING](CONTRIBUTING.md) for more information. diff --git a/netbox_acls/migrations/0002_alter_accesslist_options_and_more.py b/netbox_acls/migrations/0002_alter_accesslist_options_and_more.py index 9d26d87..ea5ab86 100644 --- a/netbox_acls/migrations/0002_alter_accesslist_options_and_more.py +++ b/netbox_acls/migrations/0002_alter_accesslist_options_and_more.py @@ -64,10 +64,11 @@ class Migration(migrations.Migration): models.Q(("app_label", "dcim"), ("model", "device")), models.Q(("app_label", "dcim"), ("model", "virtualchassis")), models.Q( - ("app_label", "virtualization"), ("model", "virtualmachine") + ("app_label", "virtualization"), + ("model", "virtualmachine"), ), _connector="OR", - ) + ), ), on_delete=django.db.models.deletion.PROTECT, to="contenttypes.contenttype", @@ -82,7 +83,7 @@ class Migration(migrations.Migration): django.core.validators.RegexValidator( "^[0-9a-zA-Z,-,_]*$", "Only alphanumeric, hyphens, and underscores characters are allowed.", - ) + ), ], ), ), @@ -111,7 +112,8 @@ class Migration(migrations.Migration): model_name="aclinterfaceassignment", name="access_list", field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="netbox_acls.accesslist" + on_delete=django.db.models.deletion.CASCADE, + to="netbox_acls.accesslist", ), ), migrations.AlterField( @@ -127,10 +129,11 @@ class Migration(migrations.Migration): models.Q( models.Q(("app_label", "dcim"), ("model", "interface")), models.Q( - ("app_label", "virtualization"), ("model", "vminterface") + ("app_label", "virtualization"), + ("model", "vminterface"), ), _connector="OR", - ) + ), ), on_delete=django.db.models.deletion.PROTECT, to="contenttypes.contenttype",