lint fixes

ryanmerolle · ryanmerolle · commit fd449a12d910 · 2023-01-21T22:36:40.000-05:00
diff --git 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
@@ -1,3 +1,4 @@
+---
 version: '3.4'
 services:
   netbox:
diff --git 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
@@ -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
@@ -1,3 +1,4 @@
+---
 - asn: 1
   rir: RFC1918
   tenant: tenant1
diff --git 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
@@ -1,3 +1,4 @@
+---
 - name: VPLS
   slug: vpls
 - name: MPLS
diff --git 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
@@ -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
@@ -1,2 +1,3 @@
+---
 - name: Hyper-V
   slug: hyper-v
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,28 +51,28 @@ 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
   required: false
   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,22 +90,22 @@ 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
   description: IP addresses that belong to this location
   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
@@ -1,3 +1,4 @@
+---
 ## Possible Choices:
 ##   new_window:
 ##   - True
diff --git 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
@@ -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
@@ -1,3 +1,4 @@
+---
 ## Possible Choices:
 ##   face:
 ##   - front
diff --git 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
@@ -1,3 +1,4 @@
+---
 ## Possible Choices:
 ##   type:
 ##   - virtual
diff --git 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
@@ -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
@@ -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
@@ -1,3 +1,4 @@
+---
 all.ro:
   actions:
     - view
diff --git 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
@@ -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
@@ -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
@@ -1,2 +1,3 @@
+---
 - name: Main Management
   slug: main-management
diff --git 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
@@ -1,3 +1,4 @@
+---
 - name: Provider1
   slug: provider1
   asn: 121
diff --git 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
@@ -1,3 +1,4 @@
+---
 ## Possible Choices:
 ##   width:
 ##   - 19
diff --git 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
@@ -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
@@ -1,3 +1,4 @@
+---
 - name: 65000:1001
   tenant: tenant1
 - name: 65000:1002
diff --git 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
@@ -1,3 +1,4 @@
+---
 - name: AMS 1
   slug: ams1
   region: Downtown
diff --git 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
@@ -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
@@ -1,3 +1,4 @@
+---
 - name: tenant1
   slug: tenant1
 - name: tenant2
diff --git 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
@@ -1,3 +1,4 @@
+---
 ## Possible Choices:
 ##   status:
 ##   - active
diff --git 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
@@ -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
@@ -1,3 +1,4 @@
+---
 ## Possible Choices:
 ##   status:
 ##   - active
diff --git 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
@@ -1,3 +1,4 @@
+---
 ## Possible Choices:
 ##   object_types:
 ##   - device
diff --git a/.github/linters/.jscpd.json b/.github/linters/.jscpd.json
@@ -1,3 +1,3 @@
 {
     "threshold": 10
-}
+}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
diff --git a/README.md b/README.md
diff --git a/netbox_acls/migrations/0002_alter_accesslist_options_and_more.py b/netbox_acls/migrations/0002_alter_accesslist_options_and_more.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`version: '3.4'`
`2`	`3`	`services:`
`3`	`4`	`netbox:`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`- prefix: 10.0.0.0/16`
`2`	`3`	`rir: RFC1918`
`3`	`4`	`tenant: tenant1`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`- asn: 1`
`2`	`3`	`rir: RFC1918`
`3`	`4`	`tenant: tenant1`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`# Required parameters for termination X ('a' or 'b'):`
`2`	`3`	`#`
`3`	`4`	# ```
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`- name: VPLS`
`2`	`3`	`slug: vpls`
`3`	`4`	`- name: MPLS`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`- cid: Circuit_ID-1`
`2`	`3`	`provider: Provider1`
`3`	`4`	`type: Internet`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`- name: Group 1`
`2`	`3`	`slug: group-1`
`3`	`4`	`- name: Group 2`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+---`
`1`	`2`	`- name: Hyper-V`
`2`	`3`	`slug: hyper-v`