Merge branch 'e-breuninger:master' into master

Author: rypti

.github/workflows/ci-testing.yml

@@ -34,18 +34,15 @@ jobs:
       fail-fast: false
       matrix:
         netbox-version:
-          - v4.1.0
-          - v4.1.1
-          - v4.1.2
-          - v4.1.3
-          - v4.1.4
-          - v4.1.5
-          - v4.1.6
-          - v4.1.7
-          - v4.1.8
-          # - v4.1.9 has a regression - do not use
-          - v4.1.10
-          - v4.1.11
+          # - v4.2.1 has a bug where mac addresses cannot be assigned
+          - v4.2.2
+          - v4.2.3
+          - v4.2.4
+          - v4.2.5
+          - v4.2.6
+          - v4.2.7
+          - v4.2.8
+          - v4.2.9
     steps:
       - uses: actions/checkout@v4
       - name: Set up Go

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23
+          go-version-file: go.mod
       - name: Import GPG key
         id: import_gpg
         uses: crazy-max/ghaction-import-gpg@v6.3.0

CHANGELOG.md

@@ -1,3 +1,32 @@
+## 4.0.0 (June 12th, 2025)
+
+**BREAKING CHANGES**
+
+NetBox 4.2 came with some breaking changes and these are reflected in the provider.
+
+* resource/netbox_device_interface: Make `mac_address` attribute read-only
+* resource/netbox_device_interface: Add read-only `mac_addresses` attribute
+
+ENHANCEMENTS
+
+provider: Now supports NetBox 4.2.x
+* **New Resource:** `netbox_mac_address`
+* resource/netbox_cluster: Add `location_id`, `site_group_id`, `region_id`, `scope_id` and `scope_type` attributes
+* resource/netbox_prefix: Add `location_id`, `site_group_id` and `region_id` attributes
+* resource/netbox_device_interface: Allow `q-in-q` value in `mode` attribute
+* resource/netbox_circuit_termination: Add `location_id`, `site_group_id`, `region_id`, `site_id` and `provider_network_id` attributes
+
+BUG FIXES
+
+* resource/netbox_location: Mark `site_id` as required
+
+## 3.11.1 (June 12th, 2025)
+
+ENHANCEMENTS
+
+* **New Data Source:** `netbox_device_power_ports` ([#721](https://github.com/e-breuninger/terraform-provider-netbox/pull/721) by [@mraerino](https://github.com/mraerino))
+* **New Resource:** `netbox_available_vlan` ([#717](https://github.com/e-breuninger/terraform-provider-netbox/pull/717) by [@MacherelR](https://github.com/MacherelR))
+
 ## 3.11.0 (May 27th, 2025)
 
 * provider: Add `default_tags` attribute ([#711](https://github.com/e-breuninger/terraform-provider-netbox/pull/711) by [@mraerino](https://github.com/mraerino))

GNUmakefile

@@ -1,9 +1,9 @@
 TEST?=netbox/*.go
-TEST_FUNC?=TestAccNetboxVirtualMachine*
+TEST_FUNC?=TestAccNetboxMACAddr*
 GOFMT_FILES?=$$(find . -name '*.go' | grep -v vendor)
 DOCKER_COMPOSE=docker compose
 
-export NETBOX_VERSION=v4.1.11
+export NETBOX_VERSION=v4.2.2
 export NETBOX_SERVER_URL=http://localhost:8001
 export NETBOX_API_TOKEN=0123456789abcdef0123456789abcdef01234567
 export NETBOX_TOKEN=$(NETBOX_API_TOKEN)

README.md

@@ -1,14 +1,13 @@
 # terraform-provider-netbox
 
-The Terraform Netbox provider is a plugin for Terraform that allows for the full lifecycle management of [Netbox](https://netbox.readthedocs.io/en/stable/) resources.
+The Terraform Netbox provider is a plugin for Terraform that allows for the full lifecycle management of [Netbox](https://netboxlabs.com/docs/netbox/) resources.
 This provider is maintained by E. Breuninger.
 
 See: [Official documentation](https://registry.terraform.io/providers/e-breuninger/netbox/latest/docs) in the Terraform registry.
 
 ## Requirements
 
 - [Terraform](https://www.terraform.io/downloads.html) >= 0.12.x
-- [Go](https://golang.org/doc/install) >= 1.14
 
 ## Supported netbox versions
 
@@ -18,7 +17,8 @@ Since version [1.6.6](https://github.com/e-breuninger/terraform-provider-netbox/
 
 | Netbox version  | Provider version |
 | --------------- | ---------------- |
-| v4.1.0 - 4.1.11 | v3.10.0 and up   |
+| v4.2.2 - 4.2.9  | v4.0.0 and up    |
+| v4.1.0 - 4.1.11 | v3.10.0 - 3.11.1 |
 | v4.0.0 - 4.0.11 | v3.9.0 - 3.9.2   |
 | v3.7.0 - 3.7.8  | v3.8.0 - 3.8.9   |
 | v3.6.0 - 3.6.9  | v3.7.0 - 3.7.7   |
@@ -70,7 +70,7 @@ For a more examples, see the [provider documentation](https://registry.terraform
 
 ## Developing the Provider
 
-If you wish to work on the provider, you need [Go](http://www.golang.org) installed on your machine (see [Requirements](#requirements) above).
+If you wish to work on the provider, you need [Go](http://www.golang.org) installed on your machine.
 
 To compile the provider, run `go install`. This will build the provider and put the provider binary in the `$GOPATH/bin` directory.
 

docker/docker-compose.yml

@@ -1,7 +1,7 @@
 ---
 services:
   postgres:
-    image: postgres:12-alpine
+    image: postgres:14-alpine
     environment:
       - POSTGRES_USER=netbox
       - POSTGRES_PASSWORD=netbox
@@ -34,6 +34,7 @@ services:
       - SUPERUSER_EMAIL=admin@example.com
       - SUPERUSER_PASSWORD=admin
       - SUPERUSER_API_TOKEN=${NETBOX_API_TOKEN}
+      - METRICS_ENABLED=true
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/metrics"]
       interval: 10s

docs/data-sources/cluster.md

@@ -35,6 +35,11 @@ data "netbox_cluster" "vmw_cluster_01" {
 - `comments` (String)
 - `custom_fields` (Map of String)
 - `description` (String)
+- `location_id` (Number)
+- `region_id` (Number)
+- `scope_id` (Number)
+- `scope_type` (String)
+- `site_group_id` (Number)
 - `tags` (Set of String)
 
 

docs/data-sources/device_interfaces.md

@@ -45,13 +45,24 @@ Read-Only:
 - `enabled` (Boolean)
 - `id` (Number)
 - `mac_address` (String)
+- `mac_addresses` (Set of Object) (see [below for nested schema](#nestedobjatt--interfaces--mac_addresses))
 - `mode` (Map of String)
 - `mtu` (Number)
 - `name` (String)
 - `tag_ids` (List of Number)
 - `tagged_vlans` (List of Object) (see [below for nested schema](#nestedobjatt--interfaces--tagged_vlans))
 - `untagged_vlan` (List of Object) (see [below for nested schema](#nestedobjatt--interfaces--untagged_vlan))
 
+<a id="nestedobjatt--interfaces--mac_addresses"></a>
+### Nested Schema for `interfaces.mac_addresses`
+
+Read-Only:
+
+- `description` (String)
+- `id` (Number)
+- `mac_address` (String)
+
+
 <a id="nestedobjatt--interfaces--tagged_vlans"></a>
 ### Nested Schema for `interfaces.tagged_vlans`
 

docs/data-sources/prefix.md

@@ -37,6 +37,9 @@ for more information on available lookup expressions.
 ### Read-Only
 
 - `id` (Number) The ID of this resource.
+- `location_id` (Number)
+- `region_id` (Number)
+- `site_group_id` (Number)
 - `tags` (Set of String)
 
 

docs/data-sources/prefixes.md

@@ -41,7 +41,10 @@ Read-Only:
 
 - `description` (String)
 - `id` (Number)
+- `location_id` (Number)
 - `prefix` (String)
+- `region_id` (Number)
+- `site_group_id` (Number)
 - `site_id` (Number)
 - `status` (String)
 - `tags` (Set of String)