💽 WIP disks

👆 Update OpenAPI schema to 0.32.1
2026-10-20 05:56:05 +11:00 · 2025-08-17 17:22:26 +08:00 · 2025-08-16 11:12:32 +08:00
26 changed files with 1136 additions and 487 deletions
@@ -23,11 +23,11 @@ jobs:
    needs: test
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
        with:
          # Allow goreleaser to access older tag information.
          fetch-depth: 0
-      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+      - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
        with:
          go-version-file: 'go.mod'
          cache: true
@@ -38,7 +38,7 @@ jobs:
          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
          passphrase: ${{ secrets.PASSPHRASE }}
      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
+        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
        with:
          args: release --clean
        env:
@@ -23,8 +23,8 @@ jobs:
      group: test
      cancel-in-progress: true # would be nice if GH offered cancel-pending instead, https://github.com/orgs/community/discussions/63136
    steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-go@v6
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
        with:
          go-version-file: 'go.mod'
      - uses: hashicorp/setup-terraform@v3
@@ -54,8 +54,8 @@ jobs:
  #   name: Unit Tests
  #   runs-on: ubuntu-latest
  #   steps:
-  #     - uses: actions/checkout@v5
-  #     - uses: actions/setup-go@v6
+  #     - uses: actions/checkout@v4
+  #     - uses: actions/setup-go@v5
  #       with:
  #         go-version-file: 'go.mod'
  #     - run: go test -v -cover ./...
@@ -24,7 +24,8 @@ provider_installation {
 4. Build and test the provider

 ```sh
-go build -o bin/terraform-provider-binarylane
+# Build with line numbers
+go build -ldflags="-s -w"  -o bin/terraform-provider-binarylane
 go install
 cd examples/basic
 terraform plan
@@ -20,9 +20,9 @@ Planned features:
  - [x] Cloud Init
  - [x] Updating server properties
  - [x] "Advanced Features"
-  - [x] IPV6
  - [ ] Customised Backups
  - [ ] Software
+  - [ ] IPV6
  - [ ] Alerts
 - [x] SSH Keys
 - [x] Virtual Private Cloud
@@ -32,7 +32,7 @@ data "binarylane_load_balancer" "example" {
 - `ip` (String) The IPv4 address of the load balancer.
 - `name` (String) The hostname of the load balancer.
 - `region` (String) Leave null to create an anycast load balancer.
- `server_ids` (Set of Number) A list of server IDs to assign to this load balancer.
+- `server_ids` (List of Number) A list of server IDs to assign to this load balancer.

 <a id="nestedatt--forwarding_rules"></a>
 ### Nested Schema for `forwarding_rules`
@@ -33,8 +33,8 @@ data "binarylane_server" "example" {
  - must be a multiple of 5
  - \> 60 GB must be a multiple of 10
  - \> 200 GB must be a multiple of 100
+- `disks` (Attributes List) A list of the disks that are currently attached to the server. (see [below for nested schema](#nestedatt--disks))
 - `image` (String) The slug of the selected operating system, such as `debian-12`. You can fetch a full list of images from the BinaryLane API.
- `ipv6` (Boolean) If `true` this will add a public and private IPv6 address to the server. By default, IPv6 is disabled.
 - `memory` (Number) The total memory in MB for this server. Leave null to accept the default size. Valid values:
  - must be a multiple of 128
  - \> 2048 MB must be a multiple of 1024
@@ -44,9 +44,7 @@ data "binarylane_server" "example" {
 - `permalink` (String) A randomly generated two-word identifier assigned to servers in regions that support this feature
 - `port_blocking` (Boolean) Port blocking of outgoing connections for email, SSH and Remote Desktop (TCP ports 22, 25, and 3389) is enabled by default for all new servers. If this is false port blocking will be disabled. Disabling port blocking is only available to reviewed accounts.
 - `private_ipv4_addresses` (List of String) The private IPv4 addresses assigned to the server.
- `private_ipv6_addresses` (List of String) The private IPv6 addresses assigned to the server.
 - `public_ipv4_addresses` (List of String) The public IPv4 addresses assigned to the server.
- `public_ipv6_addresses` (List of String) The public IPv6 addresses assigned to the server.
 - `region` (String) The slug of the selected region.
 - `size` (String) The slug of the selected size.
 - `source_and_destination_check` (Boolean) This attribute can only be set if your server also has a `vpc_id` attribute set. When enabled (which is `true` by default), your server will only be able to send or receive packets that are directly addressed to one of the IP addresses associated with the Cloud Server. Generally, this is desirable behaviour because it prevents IP conflicts and other hard-to-diagnose networking faults due to incorrect network configuration. When `source_and_destination_check` is `false`, your Cloud Server will be able to send and receive packets addressed to any server. This is typically used when you want to use your Cloud Server as a VPN endpoint, a NAT server to provide internet access, or IP forwarding.
@@ -69,3 +67,14 @@ Read-Only:
 - `qemu_guest_agent` (Boolean)
 - `uefi_boot` (Boolean)
 - `unset_uuid` (Boolean)
+
+
+<a id="nestedatt--disks"></a>
+### Nested Schema for `disks`
+
+Read-Only:
+
+- `description` (String) A description of this disk.
+- `id` (Number) The ID of this disk.
+- `primary` (Boolean) A primary disk is treated differently from other disks.
+- `size_gigabytes` (Number) The size of the disk in GB.
@@ -40,7 +40,7 @@ resource "binarylane_load_balancer" "example" {
 - `forwarding_rules` (Attributes List) The rules that control which traffic the load balancer will forward to servers in the pool. Leave null to accept a default "HTTP" only forwarding rule. (see [below for nested schema](#nestedatt--forwarding_rules))
 - `health_check` (Attributes) The rules that determine which servers are considered 'healthy' and in the server pool for the load balancer. Leave this null to accept appropriate defaults based on the forwarding_rules. (see [below for nested schema](#nestedatt--health_check))
 - `region` (String) Leave null to create an anycast load balancer.
- `server_ids` (Set of Number) A list of server IDs to assign to this load balancer.
+- `server_ids` (List of Number) A list of server IDs to assign to this load balancer.
 - `timeouts` (Attributes) (see [below for nested schema](#nestedatt--timeouts))

 ### Read-Only
@@ -82,7 +82,6 @@ Optional:
 Optional:

 - `create` (String) A string that can be [parsed as a duration](https://pkg.go.dev/time#ParseDuration) consisting of numbers and unit suffixes, such as "30s" or "2h45m". Valid time units are "s" (seconds), "m" (minutes), "h" (hours).
- `update` (String) A string that can be [parsed as a duration](https://pkg.go.dev/time#ParseDuration) consisting of numbers and unit suffixes, such as "30s" or "2h45m". Valid time units are "s" (seconds), "m" (minutes), "h" (hours).

 ## Import

@@ -44,7 +44,7 @@ resource "binarylane_server" "example" {
  - must be a multiple of 5
  - \> 60 GB must be a multiple of 10
  - \> 200 GB must be a multiple of 100
- `ipv6` (Boolean) If `true` this will add a public and private IPv6 address to the server. By default, IPv6 is disabled.
+- `disks` (Attributes List) A list of the disks that are currently attached to the server. (see [below for nested schema](#nestedatt--disks))
 - `memory` (Number) The total memory in MB for this server. Leave null to accept the default size. Valid values:
  - must be a multiple of 128
  - \> 2048 MB must be a multiple of 1024
@@ -65,9 +65,7 @@ resource "binarylane_server" "example" {
 - `password_change_supported` (Boolean) If this is true then the `password` attribute can be changed with Terraform. If this is false then the `password` attribute can only be replaced with a null/empty value, which will clear the root/administrator password allowing the password to be changed via the web console.
 - `permalink` (String) A randomly generated two-word identifier assigned to servers in regions that support this feature
 - `private_ipv4_addresses` (List of String) The private IPv4 addresses assigned to the server.
- `private_ipv6_addresses` (List of String) The private IPv6 addresses assigned to the server.
 - `public_ipv4_addresses` (List of String) The public IPv4 addresses assigned to the server.
- `public_ipv6_addresses` (List of String) The public IPv6 addresses assigned to the server.

 <a id="nestedatt--advanced_features"></a>
 ### Nested Schema for `advanced_features`
@@ -89,6 +87,23 @@ Read-Only:
 - `uefi_boot` (Boolean) When this option is enabled the Cloud Server will use UEFI instead of legacy PC BIOS.


+<a id="nestedatt--disks"></a>
+### Nested Schema for `disks`
+
+Required:
+
+- `size_gigabytes` (Number) The size of the disk in GB.
+
+Optional:
+
+- `description` (String) A description of this disk.
+
+Read-Only:
+
+- `id` (Number) The ID of this disk.
+- `primary` (Boolean) A primary disk is treated differently from other disks.
+
+
 <a id="nestedatt--timeouts"></a>
 ### Nested Schema for `timeouts`

@@ -17,4 +17,11 @@ resource "binarylane_server" "example" {
  size              = "std-min" # 1 VPCU, 1 GB Memory,  20 GB NVME Storage, 1000 GB Data Transfer
  public_ipv4_count = 1
  # Password will be generated automatically and mailed to the account holder
+  disks = [{
+    description    = "Primary Disk"
+    size_gigabytes = 10
+    }, {
+    description    = "Secondary Disk"
+    size_gigabytes = 10
+  }]
 }
@@ -1,6 +1,6 @@
 module terraform-provider-binarylane

-go 1.24.0
+go 1.23.7

 toolchain go1.24.1

@@ -8,13 +8,13 @@ require (
 	github.com/deepmap/oapi-codegen v1.16.3
 	github.com/hashicorp/terraform-plugin-codegen-framework v0.4.1
 	github.com/hashicorp/terraform-plugin-codegen-openapi v0.3.0
-	github.com/hashicorp/terraform-plugin-docs v0.23.0
-	github.com/hashicorp/terraform-plugin-framework v1.16.1
-	github.com/hashicorp/terraform-plugin-framework-timeouts v0.6.0
+	github.com/hashicorp/terraform-plugin-docs v0.22.0
+	github.com/hashicorp/terraform-plugin-framework v1.15.1
+	github.com/hashicorp/terraform-plugin-framework-timeouts v0.5.0
 	github.com/hashicorp/terraform-plugin-framework-validators v0.18.0
-	github.com/hashicorp/terraform-plugin-go v0.29.0
+	github.com/hashicorp/terraform-plugin-go v0.28.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
-	github.com/hashicorp/terraform-plugin-testing v1.13.3
+	github.com/hashicorp/terraform-plugin-testing v1.13.2
 	github.com/oapi-codegen/oapi-codegen/v2 v2.5.0
 	github.com/oapi-codegen/runtime v1.1.2
 )
@@ -32,7 +32,7 @@ require (
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
-	github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect
+	github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
@@ -52,18 +52,18 @@ require (
 	github.com/hashicorp/go-cty v1.5.0 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.7.0 // indirect
+	github.com/hashicorp/go-plugin v1.6.3 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/hashicorp/hc-install v0.9.2 // indirect
 	github.com/hashicorp/hcl/v2 v2.23.0 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/terraform-exec v0.23.1 // indirect
-	github.com/hashicorp/terraform-json v0.27.0 // indirect
+	github.com/hashicorp/terraform-exec v0.23.0 // indirect
+	github.com/hashicorp/terraform-json v0.25.0 // indirect
 	github.com/hashicorp/terraform-plugin-codegen-spec v0.2.0 // indirect
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 // indirect
-	github.com/hashicorp/terraform-registry-address v0.4.0 // indirect
+	github.com/hashicorp/terraform-registry-address v0.3.0 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
 	github.com/hashicorp/yamux v0.1.2 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
@@ -101,20 +101,20 @@ require (
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/yuin/goldmark v1.7.7 // indirect
 	github.com/yuin/goldmark-meta v1.1.0 // indirect
-	github.com/zclconf/go-cty v1.17.0 // indirect
+	github.com/zclconf/go-cty v1.16.3 // indirect
 	go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
-	golang.org/x/crypto v0.41.0 // indirect
+	golang.org/x/crypto v0.40.0 // indirect
 	golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 // indirect
-	golang.org/x/mod v0.27.0 // indirect
-	golang.org/x/net v0.43.0 // indirect
-	golang.org/x/sync v0.17.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
-	golang.org/x/text v0.29.0 // indirect
-	golang.org/x/tools v0.36.0 // indirect
+	golang.org/x/mod v0.25.0 // indirect
+	golang.org/x/net v0.42.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/sys v0.34.0 // indirect
+	golang.org/x/text v0.27.0 // indirect
+	golang.org/x/tools v0.34.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
-	google.golang.org/grpc v1.75.1 // indirect
-	google.golang.org/protobuf v1.36.9 // indirect
+	google.golang.org/grpc v1.74.2 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
@@ -30,10 +30,10 @@ github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xW
 github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
-github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/avrEXE=
-github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
-github.com/bufbuild/protocompile v0.14.1 h1:iA73zAf/fyljNjQKwYzUHD6AD4R8KMasmwa/FBatYVw=
-github.com/bufbuild/protocompile v0.14.1/go.mod h1:ppVdAIhbr2H8asPk6k4pY7t9zB1OU5DoEw9xY/FUi1c=
+github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38=
+github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
+github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
@@ -45,9 +45,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
 github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/deepmap/oapi-codegen v1.16.3 h1:GT9G86SbQtT1r8ZB+4Cybi9VGdu1P5ieNvNdEoCSbrA=
 github.com/deepmap/oapi-codegen v1.16.3/go.mod h1:JD6ErqeX0nYnhdciLc61Konj3NBASREMlkHOgHn8WAM=
 github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960/go.mod h1:9HQzr9D/0PGwMEbC3d5AB7oi67+h4TsQqItC1GVYG58=
@@ -125,8 +124,8 @@ github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVH
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-plugin v1.7.0 h1:YghfQH/0QmPNc/AZMTFE3ac8fipZyZECHdDPshfk+mA=
-github.com/hashicorp/go-plugin v1.7.0/go.mod h1:BExt6KEaIYx804z8k4gRzRLEvxKVb+kn0NMcihqOqb8=
+github.com/hashicorp/go-plugin v1.6.3 h1:xgHB+ZUSYeuJi96WtxEjzi23uh7YQpznjGh0U0UUrwg=
+github.com/hashicorp/go-plugin v1.6.3/go.mod h1:MRobyh+Wc/nYy1V4KAXUiYfzxoYhs7V1mlH1Z7iY2h0=
 github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
 github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -140,34 +139,34 @@ github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3q
 github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=
 github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/terraform-exec v0.23.1 h1:diK5NSSDXDKqHEOIQefBMu9ny+FhzwlwV0xgUTB7VTo=
-github.com/hashicorp/terraform-exec v0.23.1/go.mod h1:e4ZEg9BJDRaSalGm2z8vvrPONt0XWG0/tXpmzYTf+dM=
-github.com/hashicorp/terraform-json v0.27.0 h1:REIlFzMMkIyTbhq69NC30bYiUYLv7iVhwM8ObnLo0p8=
-github.com/hashicorp/terraform-json v0.27.0/go.mod h1:GzPLJ1PLdUG5xL6xn1OXWIjteQRT2CNT9o/6A9mi9hE=
+github.com/hashicorp/terraform-exec v0.23.0 h1:MUiBM1s0CNlRFsCLJuM5wXZrzA3MnPYEsiXmzATMW/I=
+github.com/hashicorp/terraform-exec v0.23.0/go.mod h1:mA+qnx1R8eePycfwKkCRk3Wy65mwInvlpAeOwmA7vlY=
+github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=
+github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=
 github.com/hashicorp/terraform-plugin-codegen-framework v0.4.1 h1:eaI/3dsu2T5QAXbA+7N+B+UBj20GdtYnsRuYypKh3S4=
 github.com/hashicorp/terraform-plugin-codegen-framework v0.4.1/go.mod h1:kpYM23L7NtcfaQdWAN0QFkV/lU0w16qJ2ddAPCI4zAg=
 github.com/hashicorp/terraform-plugin-codegen-openapi v0.3.0 h1:IKpc337XKk50QyQPSxLrHwdqSo1E2XqCMxFkWsZcTvc=
 github.com/hashicorp/terraform-plugin-codegen-openapi v0.3.0/go.mod h1:tT6wl80h7nsMBw+1yZRgJXi+Ys85PUai11weDqysvp4=
 github.com/hashicorp/terraform-plugin-codegen-spec v0.2.0 h1:91dQG1A/DxP6vRz9GiytDTrZTXDbhHPvmpYnAyWA/Vw=
 github.com/hashicorp/terraform-plugin-codegen-spec v0.2.0/go.mod h1:fywrEKpordQypmAjz/HIfm2LuNVmyJ6KDe8XT9GdJxQ=
-github.com/hashicorp/terraform-plugin-docs v0.23.0 h1:sipnfD4/9EJBg9zekym+s1H6qmLAKJHhGWBwvN9v/hE=
-github.com/hashicorp/terraform-plugin-docs v0.23.0/go.mod h1:J4b5AtMRgJlDrwCQz+G4hKABgHY5m56PnsRmdAzBwW8=
-github.com/hashicorp/terraform-plugin-framework v1.16.1 h1:1+zwFm3MEqd/0K3YBB2v9u9DtyYHyEuhVOfeIXbteWA=
-github.com/hashicorp/terraform-plugin-framework v1.16.1/go.mod h1:0xFOxLy5lRzDTayc4dzK/FakIgBhNf/lC4499R9cV4Y=
-github.com/hashicorp/terraform-plugin-framework-timeouts v0.6.0 h1:Vv16e7EW4nT9668IV0RhdpEmnLl0im7BZx6J+QMlUkg=
-github.com/hashicorp/terraform-plugin-framework-timeouts v0.6.0/go.mod h1:rpHo9hZLn4vEkvNL5xsSdLRdaDZKSinuc0xL+BdOpVA=
+github.com/hashicorp/terraform-plugin-docs v0.22.0 h1:fwIDStbFel1PPNkM+mDPnpB4efHZBdGoMz/zt5FbTDw=
+github.com/hashicorp/terraform-plugin-docs v0.22.0/go.mod h1:55DJVyZ7BNK4t/lANcQ1YpemRuS6KsvIO1BbGA+xzGE=
+github.com/hashicorp/terraform-plugin-framework v1.15.1 h1:2mKDkwb8rlx/tvJTlIcpw0ykcmvdWv+4gY3SIgk8Pq8=
+github.com/hashicorp/terraform-plugin-framework v1.15.1/go.mod h1:hxrNI/GY32KPISpWqlCoTLM9JZsGH3CyYlir09bD/fI=
+github.com/hashicorp/terraform-plugin-framework-timeouts v0.5.0 h1:I/N0g/eLZ1ZkLZXUQ0oRSXa8YG/EF0CEuQP1wXdrzKw=
+github.com/hashicorp/terraform-plugin-framework-timeouts v0.5.0/go.mod h1:t339KhmxnaF4SzdpxmqW8HnQBHVGYazwtfxU0qCs4eE=
 github.com/hashicorp/terraform-plugin-framework-validators v0.18.0 h1:OQnlOt98ua//rCw+QhBbSqfW3QbwtVrcdWeQN5gI3Hw=
 github.com/hashicorp/terraform-plugin-framework-validators v0.18.0/go.mod h1:lZvZvagw5hsJwuY7mAY6KUz45/U6fiDR0CzQAwWD0CA=
-github.com/hashicorp/terraform-plugin-go v0.29.0 h1:1nXKl/nSpaYIUBU1IG/EsDOX0vv+9JxAltQyDMpq5mU=
-github.com/hashicorp/terraform-plugin-go v0.29.0/go.mod h1:vYZbIyvxyy0FWSmDHChCqKvI40cFTDGSb3D8D70i9GM=
+github.com/hashicorp/terraform-plugin-go v0.28.0 h1:zJmu2UDwhVN0J+J20RE5huiF3XXlTYVIleaevHZgKPA=
+github.com/hashicorp/terraform-plugin-go v0.28.0/go.mod h1:FDa2Bb3uumkTGSkTFpWSOwWJDwA7bf3vdP3ltLDTH6o=
 github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0=
 github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow=
 github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 h1:NFPMacTrY/IdcIcnUB+7hsore1ZaRWU9cnB6jFoBnIM=
 github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0/go.mod h1:QYmYnLfsosrxjCnGY1p9c7Zj6n9thnEE+7RObeYs3fA=
-github.com/hashicorp/terraform-plugin-testing v1.13.3 h1:QLi/khB8Z0a5L54AfPrHukFpnwsGL8cwwswj4RZduCo=
-github.com/hashicorp/terraform-plugin-testing v1.13.3/go.mod h1:WHQ9FDdiLoneey2/QHpGM/6SAYf4A7AZazVg7230pLE=
-github.com/hashicorp/terraform-registry-address v0.4.0 h1:S1yCGomj30Sao4l5BMPjTGZmCNzuv7/GDTDX99E9gTk=
-github.com/hashicorp/terraform-registry-address v0.4.0/go.mod h1:LRS1Ay0+mAiRkUyltGT+UHWkIqTFvigGn/LbMshfflE=
+github.com/hashicorp/terraform-plugin-testing v1.13.2 h1:mSotG4Odl020vRjIenA3rggwo6Kg6XCKIwtRhYgp+/M=
+github.com/hashicorp/terraform-plugin-testing v1.13.2/go.mod h1:WHQ9FDdiLoneey2/QHpGM/6SAYf4A7AZazVg7230pLE=
+github.com/hashicorp/terraform-registry-address v0.3.0 h1:HMpK3nqaGFPS9VmgRXrJL/dzHNdheGVKk5k7VlFxzCo=
+github.com/hashicorp/terraform-registry-address v0.3.0/go.mod h1:jRGCMiLaY9zii3GLC7hqpSnwhfnCN5yzvY0hh4iCGbM=
 github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=
 github.com/hashicorp/terraform-svchost v0.1.1/go.mod h1:mNsjQfZyf/Jhz35v6/0LWcv26+X7JPS+buii2c9/ctc=
 github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8=
@@ -182,8 +181,8 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
 github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jhump/protoreflect v1.17.0 h1:qOEr613fac2lOuTgWN4tPAtLL7fUSbuJL5X5XumQh94=
-github.com/jhump/protoreflect v1.17.0/go.mod h1:h9+vUUL38jiBzck8ck+6G/aeMX8Z4QUY/NiJPwPNi+8=
+github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
+github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=
@@ -255,9 +254,8 @@ github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0V
 github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
 github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
@@ -317,37 +315,37 @@ github.com/yuin/goldmark v1.7.7 h1:5m9rrB1sW3JUMToKFQfb+FGt1U7r57IHu5GrYrG2nqU=
 github.com/yuin/goldmark v1.7.7/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
 github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUeiOUc=
 github.com/yuin/goldmark-meta v1.1.0/go.mod h1:U4spWENafuA7Zyg+Lj5RqK/MF+ovMYtBvXi1lBb2VP0=
-github.com/zclconf/go-cty v1.17.0 h1:seZvECve6XX4tmnvRzWtJNHdscMtYEx5R7bnnVyd/d0=
-github.com/zclconf/go-cty v1.17.0/go.mod h1:wqFzcImaLTI6A5HfsRwB0nj5n0MRZFwmey8YoFPPs3U=
+github.com/zclconf/go-cty v1.16.3 h1:osr++gw2T61A8KVYHoQiFbFd1Lh3JOCXc/jFLJXKTxk=
+github.com/zclconf/go-cty v1.16.3/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
 go.abhg.dev/goldmark/frontmatter v0.2.0 h1:P8kPG0YkL12+aYk2yU3xHv4tcXzeVnN+gU0tJ5JnxRw=
 go.abhg.dev/goldmark/frontmatter v0.2.0/go.mod h1:XqrEkZuM57djk7zrlRUB02x8I5J0px76YjkOzhB4YlU=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
-go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
-go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
-go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
-go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
-go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
-go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
-go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
-go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
-go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
+go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
+go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
+go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
+go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
+go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
+go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
+go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
+go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
+go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
+go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
-golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
+golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
+golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
 golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 h1:ESSUROHIBHg7USnszlcdmjBEwdMj9VUvU+OPk4yl2mc=
 golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
-golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
+golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
+golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -358,14 +356,14 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
+golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
+golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
-golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -390,8 +388,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -401,27 +399,25 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
-golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
+golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
+golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
-golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
+golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
+golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
-gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
 google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 h1:MAKi5q709QWfnkkpNQ0M12hYJ1+e8qYVDyowc4U1XZM=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
-google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI=
-google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
+google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4=
+google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -430,8 +426,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
-google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1356,16 +1356,16 @@ type DisableSelinuxType string
 // Disk defines model for Disk.
 type Disk struct {
 	// Description A description of this disk.
-	Description *string `json:"description"`
+	Description *string `json:"description" tfsdk:"description"`

 	// Id The ID of this disk.
-	Id *int64 `json:"id,omitempty"`
+	Id *int64 `json:"id,omitempty" tfsdk:"id"`

 	// Primary A primary disk is treated differently from other disks.
-	Primary *bool `json:"primary,omitempty"`
+	Primary *bool `json:"primary,omitempty" tfsdk:"primary"`

 	// SizeGigabytes The size of the disk in GB.
-	SizeGigabytes *float64 `json:"size_gigabytes,omitempty"`
+	SizeGigabytes *float64 `json:"size_gigabytes,omitempty" tfsdk:"size_gigabytes"`
 }

 // DistributionFeature
@@ -1915,11 +1915,6 @@ type License struct {

 // LicensedSoftware defines model for LicensedSoftware.
 type LicensedSoftware struct {
-	// Incompatible Software that is incompatible with the server will be automatically removed at the next plan change.
-	// Servers may have incompatible software due to changes made by support. Software is not incompatible merely because it is disabled;
-	// disabled software may be retained by servers that already have it, incompatible software will be removed.
-	Incompatible bool `json:"incompatible"`
-
 	// LicenceCount The current licence count for the software.
 	LicenceCount int32 `json:"licence_count"`

@@ -2321,7 +2316,7 @@ type Resize struct {
 	// ChangeImage This may be left null to keep the current base image for the server. If this is provided the server disks will be destroyed and the server will be rebuilt from the selected image.
 	ChangeImage *ChangeImage `json:"change_image"`

-	// ChangeLicenses This may be left null to keep the current licenses for the server. If this is provided any licenses that are not included will be removed. Any licences that are invalid will be removed regardless, see the documentation for `servers/{server_id}/software` for more information.
+	// ChangeLicenses This may be left null to keep the current licenses for the server. If this is provided any licenses that are not included will be removed.
 	ChangeLicenses *ChangeLicenses `json:"change_licenses"`

 	// Options If this is null and the server has no selected size options the defaults for the size will be used. If this is null and the server has currently selected size options those will be preserved. If this is provided any option fields that are not included will be removed from the existing server.
@@ -129,9 +129,6 @@ func loadBalancerSchema(ctx context.Context) schema.Schema {
 		Required:            false,
 		Optional:            false,
 		Computed:            true,
-		PlanModifiers: []planmodifier.String{
-			stringplanmodifier.UseStateForUnknown(),
-		},
 	}

 	return s
@@ -143,7 +140,6 @@ func (r *loadBalancerResource) Schema(ctx context.Context, req resource.SchemaRe
 	resp.Schema.Attributes["timeouts"] =
 		timeouts.Attributes(ctx, timeouts.Opts{
 			Create: true,
-			Update: true,
 		})
 }

@@ -157,14 +153,9 @@ func (r *loadBalancerResource) Create(ctx context.Context, req resource.CreateRe
 		return
 	}

-	timeout, diags := data.Timeouts.Create(ctx, 20*time.Minute)
-	resp.Diagnostics.Append(diags...)
-	ctx, cancel := context.WithTimeout(ctx, timeout)
-	defer cancel()
-
 	// Create API call logic
 	forwardingRules := []binarylane.ForwardingRuleRequest{}
-	diags = data.LoadBalancerModel.ForwardingRules.ElementsAs(ctx, &forwardingRules, false)
+	diags := data.LoadBalancerModel.ForwardingRules.ElementsAs(ctx, &forwardingRules, false)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -218,20 +209,60 @@ func (r *loadBalancerResource) Create(ctx context.Context, req resource.CreateRe
 	// Save data into Terraform state
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)

-	// Wait for load balancer to be ready
-	var actionId int64
+	// Wait for server to be ready
+	var createActionId int64
 	for _, action := range *lbResp.JSON200.Links.Actions {
 		if *action.Rel == "create_load_balancer" {
-			actionId = *action.Id
+			createActionId = *action.Id
 			break
 		}
 	}
-
-	err = r.waitForAction(ctx, actionId)
-	if err != nil {
-		resp.Diagnostics.AddError("Error waiting for load balancer to be created", err.Error())
+	if createActionId == 0 {
+		resp.Diagnostics.AddError(
+			"Unable to wait for load balancer to be created, links.actions with rel=create_load_balancer missing from response",
+			fmt.Sprintf("Received %s creating new load balancer: name=%s. Details: %s", lbResp.Status(), data.Name.ValueString(), lbResp.Body))
 		return
 	}
+
+	createTimeout, diags := data.Timeouts.Create(ctx, 20*time.Minute)
+	resp.Diagnostics.Append(diags...)
+	ctx, cancel := context.WithTimeout(ctx, createTimeout)
+	defer cancel()
+	var lastReadyResp *binarylane.GetActionsActionIdResponse
+
+retryLoop:
+	for {
+		select {
+		case <-ctx.Done():
+			if lastReadyResp == nil {
+				return
+			}
+			resp.Diagnostics.AddError(
+				"Timed out waiting for load balancer to be created",
+				fmt.Sprintf(
+					"Timed out waiting for load balancer %s to be created, last response was status=%s, body: %s",
+					data.Name.ValueString(),
+					lastReadyResp.Status(),
+					lastReadyResp.Body,
+				),
+			)
+			return
+		default:
+			readyResp, err := r.bc.client.GetActionsActionIdWithResponse(ctx, createActionId)
+			if err != nil {
+				resp.Diagnostics.AddError("Error waiting for load balancer to be created", err.Error())
+				return
+			}
+
+			if readyResp.StatusCode() == http.StatusOK && readyResp.JSON200.Action.CompletedAt != nil {
+				break retryLoop
+			}
+
+			lastReadyResp = readyResp
+			tflog.Debug(ctx, fmt.Sprintf("Waiting for load balancer to be created: name=%s, status=%s, details: %s", data.Name.ValueString(), readyResp.Status(), readyResp.Body))
+		}
+		time.Sleep(time.Second * 5)
+	}
 }

 func (r *loadBalancerResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
@@ -315,11 +346,6 @@ func (r *loadBalancerResource) Update(ctx context.Context, req resource.UpdateRe
 		ServerIds: serverIds,
 	}

-	timeout, diags := data.Timeouts.Update(ctx, 20*time.Minute)
-	resp.Diagnostics.Append(diags...)
-	ctx, cancel := context.WithTimeout(ctx, timeout)
-	defer cancel()
-
 	lbResp, err := r.bc.client.PutLoadBalancersLoadBalancerIdWithResponse(ctx, data.Id.ValueInt64(), body)
 	if err != nil {
 		resp.Diagnostics.AddError(
@@ -343,21 +369,6 @@ func (r *loadBalancerResource) Update(ctx context.Context, req resource.UpdateRe
 		return
 	}

-	// Wait for load balancer to be ready
-	var actionId int64
-	for _, action := range *lbResp.JSON200.Links.Actions {
-		if *action.Rel == "update_load_balancer" {
-			actionId = *action.Id
-			break
-		}
-	}
-
-	err = r.waitForAction(ctx, actionId)
-	if err != nil {
-		resp.Diagnostics.AddError("Error waiting for load balancer to be updated", err.Error())
-		return
-	}
-
 	// Save updated data into Terraform state
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }
@@ -462,7 +473,7 @@ func setLoadBalancerModelState(ctx context.Context, data *loadBalancerDataModel,
 		data.Region = types.StringValue(*lb.Region.Slug)
 	}

-	data.ServerIds, diags = types.SetValueFrom(ctx, types.Int64Type, lb.ServerIds)
+	data.ServerIds, diags = types.ListValueFrom(ctx, types.Int64Type, lb.ServerIds)

 	data.HealthCheck, diag = resources.NewHealthCheckValue(
 		resources.HealthCheckValue{}.AttributeTypes(ctx),
@@ -481,37 +492,3 @@ func setLoadBalancerModelState(ctx context.Context, data *loadBalancerDataModel,

 	return diags
 }
-
-func (r *loadBalancerResource) waitForAction(ctx context.Context, actionId int64) error {
-	var lastReadyResp *binarylane.GetActionsActionIdResponse
-
-	for {
-		select {
-		case <-ctx.Done():
-			if lastReadyResp == nil {
-				return fmt.Errorf("timed out waiting for action: action_id=%d", actionId)
-			} else {
-				return fmt.Errorf("timed out waiting for action: action_id=%d, last response was status=%s, body: %s",
-					actionId, lastReadyResp.Status(), lastReadyResp.Body)
-			}
-		default:
-			readyResp, err := r.bc.client.GetActionsActionIdWithResponse(ctx, actionId)
-			if err != nil {
-				return fmt.Errorf("unexpected error waiting for action: action_id=%d, error: %w", actionId, err)
-			}
-			if readyResp.StatusCode() == http.StatusOK && *readyResp.JSON200.Action.Status == binarylane.Errored {
-				return fmt.Errorf("action failed with error: action_id=%d, error: %s", actionId, readyResp.Body)
-			}
-			if readyResp.StatusCode() == http.StatusOK && readyResp.JSON200.Action.CompletedAt != nil {
-				return nil
-			}
-			lastReadyResp = readyResp
-			tflog.Debug(ctx,
-				fmt.Sprintf("waiting for action for action_id=%d: last response was status=%s, details: %s",
-					actionId, readyResp.Status(), readyResp.Body,
-				),
-			)
-		}
-		time.Sleep(time.Second * 5)
-	}
-}
@@ -4,15 +4,12 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"maps"
 	"net/http"
-	"slices"
 	"strings"
 	"terraform-provider-binarylane/internal/binarylane"
 	"testing"

 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
-	"github.com/hashicorp/terraform-plugin-testing/terraform"
 )

 func TestLoadBalancerResource(t *testing.T) {
@@ -53,8 +50,8 @@ data "binarylane_load_balancer" "test" {
 					resource.TestCheckResourceAttr("binarylane_load_balancer.test", "name", "tf-test-lb"),
 					resource.TestCheckNoResourceAttr("binarylane_load_balancer.test", "region"),
 					resource.TestCheckResourceAttr("binarylane_load_balancer.test", "server_ids.#", "2"),
-					testCheckIfResourceAttrContainsAttr("binarylane_load_balancer.test", "server_ids", "binarylane_server.test.0", "id"),
-					testCheckIfResourceAttrContainsAttr("binarylane_load_balancer.test", "server_ids", "binarylane_server.test.1", "id"),
+					resource.TestCheckResourceAttrPair("binarylane_load_balancer.test", "server_ids.0", "binarylane_server.test.0", "id"),
+					resource.TestCheckResourceAttrPair("binarylane_load_balancer.test", "server_ids.1", "binarylane_server.test.1", "id"),
 					resource.TestCheckResourceAttr("binarylane_load_balancer.test", "forwarding_rules.#", "1"),
 					resource.TestCheckResourceAttr("binarylane_load_balancer.test", "forwarding_rules.0.entry_protocol", "http"),
 					resource.TestCheckResourceAttr("binarylane_load_balancer.test", "health_check.path", "/"),
@@ -66,8 +63,8 @@ data "binarylane_load_balancer" "test" {
 					resource.TestCheckResourceAttr("data.binarylane_load_balancer.test", "name", "tf-test-lb"),
 					resource.TestCheckNoResourceAttr("data.binarylane_load_balancer.test", "region"),
 					resource.TestCheckResourceAttr("data.binarylane_load_balancer.test", "server_ids.#", "2"),
-					testCheckIfResourceAttrContainsAttr("data.binarylane_load_balancer.test", "server_ids", "binarylane_server.test.0", "id"),
-					testCheckIfResourceAttrContainsAttr("data.binarylane_load_balancer.test", "server_ids", "binarylane_server.test.1", "id"),
+					resource.TestCheckResourceAttrPair("data.binarylane_load_balancer.test", "server_ids.0", "binarylane_server.test.0", "id"),
+					resource.TestCheckResourceAttrPair("data.binarylane_load_balancer.test", "server_ids.1", "binarylane_server.test.1", "id"),
 					resource.TestCheckResourceAttr("data.binarylane_load_balancer.test", "forwarding_rules.#", "1"),
 					resource.TestCheckResourceAttr("data.binarylane_load_balancer.test", "forwarding_rules.0.entry_protocol", "http"),
 					resource.TestCheckResourceAttr("data.binarylane_load_balancer.test", "health_check.path", "/"),
@@ -89,7 +86,6 @@ data "binarylane_load_balancer" "test" {
 				ImportStateVerify: true,
 			},
 			{
-				Taint: []string{"binarylane_server.test[0]"},
 				Config: providerConfig + `
 resource "binarylane_server" "test" {
  count             = 2
@@ -124,8 +120,8 @@ data "binarylane_load_balancer" "test" {
 					resource.TestCheckResourceAttr("binarylane_load_balancer.test", "name", "tf-test-lb"),
 					resource.TestCheckNoResourceAttr("binarylane_load_balancer.test", "region"),
 					resource.TestCheckResourceAttr("binarylane_load_balancer.test", "server_ids.#", "2"),
-					testCheckIfResourceAttrContainsAttr("binarylane_load_balancer.test", "server_ids", "binarylane_server.test.0", "id"),
-					testCheckIfResourceAttrContainsAttr("binarylane_load_balancer.test", "server_ids", "binarylane_server.test.1", "id"),
+					resource.TestCheckResourceAttrPair("binarylane_load_balancer.test", "server_ids.0", "binarylane_server.test.0", "id"),
+					resource.TestCheckResourceAttrPair("binarylane_load_balancer.test", "server_ids.1", "binarylane_server.test.1", "id"),
 					resource.TestCheckResourceAttr("binarylane_load_balancer.test", "forwarding_rules.#", "1"),
 					resource.TestCheckResourceAttr("binarylane_load_balancer.test", "forwarding_rules.0.entry_protocol", "https"),
 					resource.TestCheckResourceAttr("binarylane_load_balancer.test", "health_check.path", "/test-health"),
@@ -137,8 +133,8 @@ data "binarylane_load_balancer" "test" {
 					resource.TestCheckResourceAttr("data.binarylane_load_balancer.test", "name", "tf-test-lb"),
 					resource.TestCheckNoResourceAttr("data.binarylane_load_balancer.test", "region"),
 					resource.TestCheckResourceAttr("data.binarylane_load_balancer.test", "server_ids.#", "2"),
-					testCheckIfResourceAttrContainsAttr("data.binarylane_load_balancer.test", "server_ids", "binarylane_server.test.0", "id"),
-					testCheckIfResourceAttrContainsAttr("data.binarylane_load_balancer.test", "server_ids", "binarylane_server.test.1", "id"),
+					resource.TestCheckResourceAttrPair("data.binarylane_load_balancer.test", "server_ids.0", "binarylane_server.test.0", "id"),
+					resource.TestCheckResourceAttrPair("data.binarylane_load_balancer.test", "server_ids.1", "binarylane_server.test.1", "id"),
 					resource.TestCheckResourceAttr("data.binarylane_load_balancer.test", "forwarding_rules.#", "1"),
 					resource.TestCheckResourceAttr("data.binarylane_load_balancer.test", "forwarding_rules.0.entry_protocol", "https"),
 					resource.TestCheckResourceAttr("data.binarylane_load_balancer.test", "health_check.path", "/test-health"),
@@ -206,65 +202,3 @@ func init() {
 		},
 	})
 }
-
-func primaryInstanceState(s *terraform.State, name string) (*terraform.InstanceState, error) {
-	ms := s.RootModule()
-
-	rs, ok := ms.Resources[name]
-	if !ok {
-		return nil, fmt.Errorf("Not found: %s in %s, resources: %v", name, ms.Path, slices.Collect(maps.Keys(ms.Resources)))
-	}
-	is := rs.Primary
-	if is == nil {
-		return nil, fmt.Errorf("No primary instance: %s in %s", name, ms.Path)
-	}
-	return is, nil
-}
-
-func testCheckIfResourceAttrContainsAttr(collectionKey, collectionPath, otherResourceKey, otherAttrPath string) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		collectionState, err := primaryInstanceState(s, collectionKey)
-		if err != nil {
-			return err
-		}
-
-		elementState, err := primaryInstanceState(s, otherResourceKey)
-		if err != nil {
-			return err
-		}
-
-		if collectionKey == otherResourceKey && collectionPath == otherAttrPath {
-			return fmt.Errorf(
-				"comparing self: resource %s attribute %s",
-				collectionKey,
-				collectionPath,
-			)
-		}
-
-		vElement, okElement := elementState.Attributes[otherAttrPath]
-		if !okElement {
-			return fmt.Errorf("%s: Attribute %q not set, cannot be contained in %q from %s", otherResourceKey, otherAttrPath, collectionPath, collectionKey)
-		}
-
-		vCollection, okCollection := collectionState.Attributes[collectionPath+".#"]
-		if !okCollection {
-			return fmt.Errorf("%s: Attribute %q not a collection, cannot contain %q from %s", collectionKey, collectionPath, otherAttrPath, otherResourceKey)
-		}
-
-		for attrKey, attrValue := range collectionState.Attributes {
-			if strings.HasPrefix(attrKey, collectionPath+".") &&
-				!(strings.HasSuffix(attrKey, ".%")) &&
-				!strings.HasSuffix(attrKey, ".#") &&
-				attrValue == vElement {
-				return nil
-			}
-		}
-
-		return fmt.Errorf(
-			"%s: Attribute '%s' expected to contain %#v, got %#v",
-			collectionKey,
-			collectionPath,
-			vElement,
-			vCollection)
-	}
-}
@@ -31,8 +31,6 @@ type serverDataModel struct {
 	resources.ServerModel
 	PublicIpv4Addresses       types.List   `tfsdk:"public_ipv4_addresses"`
 	PrivateIPv4Addresses      types.List   `tfsdk:"private_ipv4_addresses"`
-	PublicIpv6Addresses       types.List   `tfsdk:"public_ipv6_addresses"`
-	PrivateIpv6Addresses      types.List   `tfsdk:"private_ipv6_addresses"`
 	Permalink                 types.String `tfsdk:"permalink"`
 	Memory                    types.Int32  `tfsdk:"memory"`
 	Disk                      types.Int32  `tfsdk:"disk"`
@@ -111,7 +109,6 @@ func (d *serverDataSource) Read(ctx context.Context, req datasource.ReadRequest,
 	data.Region = types.StringValue(*serverResp.JSON200.Server.Region.Slug)
 	data.Size = types.StringValue(*serverResp.JSON200.Server.Size.Slug)
 	data.Backups = types.BoolValue(serverResp.JSON200.Server.NextBackupWindow != nil)
-	data.Ipv6 = types.BoolValue(len(serverResp.JSON200.Server.Networks.V6) > 0)
 	data.PortBlocking = types.BoolValue(serverResp.JSON200.Server.Networks.PortBlocking)
 	data.VpcId = types.Int64PointerValue(serverResp.JSON200.Server.VpcId)
 	data.Permalink = types.StringValue(*serverResp.JSON200.Server.Permalink)
@@ -165,31 +162,12 @@ func (d *serverDataSource) Read(ctx context.Context, req datasource.ReadRequest,
 		data.PrivateIPv4Addresses = tfPrivateIpv4Addresses
 	}

-	publicIpv6Addresses := []string{}
-	privateIpv6Addresses := []string{}
-
-	for _, v6address := range serverResp.JSON200.Server.Networks.V6 {
-		if v6address.Type == "public" {
-			publicIpv6Addresses = append(publicIpv6Addresses, v6address.IpAddress)
-		} else {
-			privateIpv6Addresses = append(privateIpv6Addresses, v6address.IpAddress)
-		}
-	}
-
-	tfPublicIpv6Addresses, diag := types.ListValueFrom(ctx, types.StringType, publicIpv6Addresses)
+	disks, diag := types.ListValueFrom(ctx, data.Disks.ElementType(ctx), serverResp.JSON200.Server.Disks)
 	diags.Append(diag...)
 	if diag.HasError() {
-		data.PublicIpv6Addresses = types.ListUnknown(data.PublicIpv6Addresses.ElementType(ctx))
+		data.Disks = types.ListUnknown(data.Disks.ElementType(ctx))
 	} else {
-		data.PublicIpv6Addresses = tfPublicIpv6Addresses
-	}
-
-	tfPrivateIpv6Addresses, diag := types.ListValueFrom(ctx, types.StringType, privateIpv6Addresses)
-	diags.Append(diag...)
-	if diag.HasError() {
-		data.PrivateIpv6Addresses = types.ListUnknown(data.PrivateIpv6Addresses.ElementType(ctx))
-	} else {
-		data.PrivateIpv6Addresses = tfPrivateIpv6Addresses
+		data.Disks = disks
 	}

 	// Get user data script
@@ -256,40 +256,6 @@ func serverSchema(ctx context.Context) schema.Schema {
 		},
 	}

-	ipv6Description := "If `true` this will add a public and private IPv6 address to the server. By default, IPv6 is disabled."
-	s.Attributes["ipv6"] = schema.BoolAttribute{
-		Description:         ipv6Description,
-		MarkdownDescription: ipv6Description,
-		Optional:            true,
-		Computed:            true,
-		Default:             booldefault.StaticBool(false), // Add default to ipv6
-	}
-
-	publicIpv6AddressesDescription := "The public IPv6 addresses assigned to the server."
-	s.Attributes["public_ipv6_addresses"] = schema.ListAttribute{
-		Description:         publicIpv6AddressesDescription,
-		MarkdownDescription: publicIpv6AddressesDescription,
-		ElementType:         types.StringType,
-		// read only
-		Optional: false,
-		Required: false,
-		Computed: true,
-	}
-
-	privateIpv6AddressesDescription := "The private IPv6 addresses assigned to the server."
-	s.Attributes["private_ipv6_addresses"] = schema.ListAttribute{
-		Description:         privateIpv6AddressesDescription,
-		MarkdownDescription: privateIpv6AddressesDescription,
-		ElementType:         types.StringType,
-		// read only
-		Optional: false,
-		Required: false,
-		Computed: true,
-		PlanModifiers: []planmodifier.List{
-			listplanmodifier.UseStateForUnknown(),
-		},
-	}
-
 	s.Attributes["permalink"] = schema.StringAttribute{
 		Description:         "A randomly generated two-word identifier assigned to servers in regions that support this feature",
 		MarkdownDescription: "A randomly generated two-word identifier assigned to servers in regions that support this feature",
@@ -448,16 +414,6 @@ func (r *serverResource) ModifyPlan(ctx context.Context, req resource.ModifyPlan
 		)
 	}

-	if !plan.Ipv6.Equal(state.Ipv6) {
-		if plan.Ipv6.ValueBool() {
-			plan.PublicIpv6Addresses = types.ListUnknown(state.PublicIpv6Addresses.ElementType(ctx))
-			plan.PrivateIpv6Addresses = types.ListUnknown(state.PrivateIpv6Addresses.ElementType(ctx))
-		} else {
-			plan.PublicIpv6Addresses = types.ListNull(state.PublicIpv6Addresses.ElementType(ctx))
-			plan.PrivateIpv6Addresses = types.ListNull(state.PrivateIpv6Addresses.ElementType(ctx))
-		}
-	}
-
 	// Use state for unknown disk/memory values, as long as server size is the same
 	if (plan.Memory.IsNull() || plan.Memory.IsUnknown()) && plan.Size.Equal(state.Size) {
 		plan.Memory = state.Memory
@@ -465,8 +421,13 @@ func (r *serverResource) ModifyPlan(ctx context.Context, req resource.ModifyPlan
 	if (plan.Disk.IsNull() || plan.Disk.IsUnknown()) && plan.Size.Equal(state.Size) {
 		plan.Disk = state.Disk
 	}
+	if (plan.Disks.IsNull() || plan.Disks.IsUnknown()) && plan.Size.Equal(state.Size) {
+		plan.Disks = state.Disks
+	}

-	if isAdvFeatChanged(&config.AdvancedFeatures, &state.AdvancedFeatures) {
+	if !isAdvFeatChanged(&config.AdvancedFeatures, &state.AdvancedFeatures) {
+		plan.AdvancedFeatures = state.AdvancedFeatures
+	} else {
 		advFeatResp, err := r.bc.client.GetServersServerIdAvailableAdvancedFeaturesWithResponse(ctx, state.Id.ValueInt64())
 		if err != nil {
 			resp.Diagnostics.AddError(
@@ -571,7 +532,6 @@ func (r *serverResource) Create(ctx context.Context, req resource.CreateRequest,
 			Ipv4Addresses: data.PublicIpv4Count.ValueInt32Pointer(),
 		},
 		Backups: data.Backups.ValueBoolPointer(),
-		Ipv6:    data.Ipv6.ValueBoolPointer(),
 	}

 	if !data.Memory.IsNull() && !data.Memory.IsUnknown() {
@@ -629,7 +589,6 @@ func (r *serverResource) Create(ctx context.Context, req resource.CreateRequest,
 	data.Region = types.StringValue(*serverResp.JSON200.Server.Region.Slug)
 	data.Size = types.StringValue(*serverResp.JSON200.Server.Size.Slug)
 	data.Backups = types.BoolValue(serverResp.JSON200.Server.NextBackupWindow != nil)
-	data.Ipv6 = types.BoolValue(len(serverResp.JSON200.Server.Networks.V6) > 0)
 	data.PortBlocking = types.BoolValue(serverResp.JSON200.Server.Networks.PortBlocking)
 	data.VpcId = types.Int64PointerValue(serverResp.JSON200.Server.VpcId)
 	data.Permalink = types.StringValue(*serverResp.JSON200.Server.Permalink)
@@ -674,6 +633,14 @@ func (r *serverResource) Create(ctx context.Context, req resource.CreateRequest,
 	data.PrivateIPv4Addresses, diags = types.ListValueFrom(ctx, types.StringType, privateIpv4Addresses)
 	resp.Diagnostics.Append(diags...)

+	disks, diags := types.ListValueFrom(ctx, data.Disks.ElementType(ctx), serverResp.JSON200.Server.Disks)
+	resp.Diagnostics.Append(diags...)
+	if diags.HasError() {
+		data.Disks = types.ListUnknown(data.Disks.ElementType(ctx))
+	} else {
+		data.Disks = disks
+	}
+
 	// Save data into Terraform state
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 	if resp.Diagnostics.HasError() {
@@ -704,8 +671,14 @@ func (r *serverResource) Create(ctx context.Context, req resource.CreateRequest,

 	// One extra read to check the final state of enabled_advanced_features, needed because
 	// some flags (like "cloud-init") are not set until the server is fully created. See #13
-	diag := r.fetchServerResourceState(ctx, &data)
-	resp.Diagnostics.Append(diag...)
+	diags = r.fetchServerResourceState(ctx, &data)
+	resp.Diagnostics.Append(diags...)
+
+	// Update disks
+	if !config.Disks.IsNull() && !config.Disks.Equal(data.Disks) {
+		diags = r.updateDisks(ctx, &data, config.Disks)
+		resp.Diagnostics.Append(diags...)
+	}

 	// Save data into Terraform state
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
@@ -936,43 +909,6 @@ func (r *serverResource) Update(ctx context.Context, req resource.UpdateRequest,
 		}
 	}

-	// Change ipv6
-	if !plan.Ipv6.Equal(state.Ipv6) {
-		ipv6Resp, err := r.bc.client.PostServersServerIdActionsChangeIpv6WithResponse(
-			ctx,
-			state.Id.ValueInt64(),
-			binarylane.PostServersServerIdActionsChangeIpv6JSONRequestBody{
-				Type:    "change_ipv6",
-				Enabled: plan.Ipv6.ValueBool(),
-			},
-		)
-		if err != nil {
-			resp.Diagnostics.AddError("Error changing IPv6", err.Error())
-			return
-		}
-
-		err = r.waitForServerAction(ctx, state.Id.ValueInt64(), *ipv6Resp.JSON200.Action.Id)
-		if err != nil {
-			resp.Diagnostics.AddError("Error waiting for changing IPv6", err.Error())
-			return
-		}
-
-		state.Ipv6 = plan.Ipv6
-		state.PublicIpv6Addresses = plan.PublicIpv6Addresses
-		state.PrivateIpv6Addresses = plan.PrivateIpv6Addresses
-
-		if state.PublicIpv6Addresses.IsUnknown() || state.PrivateIpv6Addresses.IsUnknown() || listContainsUnknown(ctx, state.PublicIpv6Addresses) || listContainsUnknown(ctx, state.PrivateIpv6Addresses) {
-			refreshNeeded = true
-		}
-
-		// Save updated data into Terraform state
-		resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)
-		if resp.Diagnostics.HasError() {
-			return
-		}
-
-	}
-
 	// Rebuild operation
 	if !plan.SshKeys.Equal(state.SshKeys) || !plan.UserData.IsNull() && !plan.UserData.Equal(state.UserData) {
 		var rebuildReq *binarylane.PostServersServerIdActionsRebuildJSONRequestBody
@@ -1082,6 +1018,18 @@ func (r *serverResource) Update(ctx context.Context, req resource.UpdateRequest,
 		}
 	}

+	// Update disks
+	if !config.Disks.IsNull() && !config.Disks.Equal(plan.Disks) {
+		diags := r.updateDisks(ctx, &state, config.Disks)
+		resp.Diagnostics.Append(diags...)
+
+		// Save updated data into Terraform state
+		resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)
+		if resp.Diagnostics.HasError() {
+			return
+		}
+	}
+
 	// Enable or disable backups
 	if !plan.Backups.Equal(state.Backups) {
 		if plan.Backups.ValueBool() {
@@ -1306,6 +1254,181 @@ func (r *serverResource) updateSourceDestCheck(
 	return nil
 }

+func (r *serverResource) updateDisks(ctx context.Context, state *serverResourceModel, disks types.List) diag.Diagnostics {
+	var diags diag.Diagnostics
+
+	if state.Disk.IsUnknown() || state.Disk.IsNull() {
+		diags.AddError("Error updating disks", "Unable to update disks because the `disk` attribute is unknown or null.")
+		return diags
+	}
+	if state.Disks.IsUnknown() || state.Disks.IsNull() {
+		diags.AddError("Error updating disks", "Unable to update disks because the `disks` attribute is unknown or null.")
+		return diags
+	}
+	if state.Disks.Equal(disks) {
+		tflog.Debug(ctx, "No changes to disks, skipping update")
+		return diags
+	}
+
+	var current []resources.DisksValue
+	diags.Append(state.Disks.ElementsAs(ctx, &current, false)...)
+	if diags.HasError() {
+		return diags
+	}
+
+	var desired []resources.DisksValue
+	diags.Append(disks.ElementsAs(ctx, &desired, false)...)
+	if diags.HasError() {
+		return diags
+	}
+
+	// 1. Check that desired disks fit within max VM disk size
+	var totalDesired float64
+	for _, d := range desired {
+		totalDesired += d.SizeGigabytes.ValueFloat64()
+	}
+	if int32(totalDesired) > state.Disk.ValueInt32() {
+		diags.AddError("Error updating disks",
+			fmt.Sprintf("Total desired disk size %d GB exceeds maximum allowed %d GB",
+				int32(totalDesired), state.Disk.ValueInt32()))
+		return diags
+	}
+
+	// Build maps for diffing
+	currentMap := make(map[int64]resources.DisksValue)
+	for _, d := range current {
+		currentMap[d.Id.ValueInt64()] = d
+	}
+
+	desiredMap := make(map[int64]resources.DisksValue)
+	for _, d := range desired {
+		// Only disks with IDs are "existing". New ones will have Id.IsNull()
+		if !d.Id.IsNull() && !d.Id.IsUnknown() {
+			desiredMap[d.Id.ValueInt64()] = d
+		}
+	}
+
+	// Remove unused disks
+	for id := range currentMap {
+		if _, ok := desiredMap[id]; !ok {
+			tflog.Debug(ctx, "Deleting disk", map[string]any{"disk_id": id})
+			resp, err := r.bc.client.PostServersServerIdActionsDeleteDiskWithResponse(ctx, state.Id.ValueInt64(), binarylane.DeleteDisk{
+				DiskId: id,
+				Type:   "delete_disk",
+			})
+			if err != nil {
+				diags.AddError("Error deleting disk", err.Error())
+				return diags
+			}
+			// WIP
+
+			// binarylane_server.example: Modifying... [name=tf-example-basic]
+			// ╷
+			// │ Error: Unexpected HTTP status code deleting disk
+			// │
+			// │   with binarylane_server.example,
+			// │   on main.tf line 13, in resource "binarylane_server" "example":
+			// │   13: resource "binarylane_server" "example" {
+			// │
+			// │ Received 400 Bad Request deleting disk: server_id=523165, disk_id=1. Details:
+			// │ {"type":"https://tools.ietf.org/html/rfc7231#section-6.5.1","title":"One or more validation errors
+			// │ occurred","status":400,"errors":{"disk_id":["May not delete primary disk."]},"message":"May not delete
+			// │ primary disk."}
+			if resp.StatusCode() != http.StatusOK {
+				diags.AddError("Unexpected HTTP status code deleting disk",
+					fmt.Sprintf("Received %s deleting disk: server_id=%s, disk_id=%d. Details: %s",
+						resp.Status(), state.Id.String(), id, resp.Body))
+				return diags
+			}
+			err = r.waitForServerAction(ctx, state.Id.ValueInt64(), *resp.JSON200.Action.Id)
+			if err != nil {
+				diags.AddError("Error waiting for disks to be deleted", err.Error())
+				return diags
+			}
+		}
+	}
+
+	// Downsize disks
+	for id, desiredDisk := range desiredMap {
+		if currentDisk, ok := currentMap[id]; ok {
+			curSize := int32(currentDisk.SizeGigabytes.ValueFloat64())
+			newSize := int32(desiredDisk.SizeGigabytes.ValueFloat64())
+			if newSize < curSize {
+				tflog.Debug(ctx, "Downsizing disk", map[string]any{"disk_id": id, "from": curSize, "to": newSize})
+				resp, err := r.bc.client.PostServersServerIdActionsResizeDiskWithResponse(ctx, state.Id.ValueInt64(), binarylane.ResizeDisk{
+					DiskId:        id,
+					SizeGigabytes: newSize,
+					Type:          "resize_disk",
+				})
+				if err != nil {
+					diags.AddError("Error downsizing disk", err.Error())
+					return diags
+				}
+				if resp.StatusCode() != http.StatusOK {
+					diags.AddError("Unexpected HTTP status code downsizing disks",
+						fmt.Sprintf("Received %s downsizing disks: server_id=%s, disk_id=%d. Details: %s",
+							resp.Status(), state.Id.String(), id, resp.Body))
+					return diags
+				}
+				err = r.waitForServerAction(ctx, state.Id.ValueInt64(), *resp.JSON200.Action.Id)
+				if err != nil {
+					diags.AddError("Error waiting for disks to downsize", err.Error())
+					return diags
+				}
+			}
+		}
+	}
+
+	// Upsize disks
+	for id, desiredDisk := range desiredMap {
+		if currentDisk, ok := currentMap[id]; ok {
+			curSize := int32(currentDisk.SizeGigabytes.ValueFloat64())
+			newSize := int32(desiredDisk.SizeGigabytes.ValueFloat64())
+			if newSize > curSize {
+				tflog.Debug(ctx, "Upsizing disk", map[string]any{"disk_id": id, "from": curSize, "to": newSize})
+				resp, err := r.bc.client.PostServersServerIdActionsResizeDiskWithResponse(ctx, state.Id.ValueInt64(), binarylane.ResizeDisk{
+					DiskId:        id,
+					SizeGigabytes: newSize,
+					Type:          "resize_disk",
+				})
+				if err != nil {
+					diags.AddError("Error upsizing disk", err.Error())
+					return diags
+				}
+				err = r.waitForServerAction(ctx, state.Id.ValueInt64(), *resp.JSON200.Action.Id)
+				if err != nil {
+					diags.AddError("Error waiting for new disks to upsize", err.Error())
+					return diags
+				}
+			}
+		}
+	}
+
+	// 5. Add new disks (those with no ID in desired)
+	for _, desiredDisk := range desired {
+		if desiredDisk.Id.IsNull() || desiredDisk.Id.IsUnknown() {
+			desc := desiredDisk.Description.ValueStringPointer()
+			tflog.Debug(ctx, "Creating new disk", map[string]any{"size": desiredDisk.SizeGigabytes.ValueFloat64()})
+			resp, err := r.bc.client.PostServersServerIdActionsAddDiskWithResponse(ctx, state.Id.ValueInt64(), binarylane.AddDisk{
+				Description:   desc,
+				SizeGigabytes: int32(desiredDisk.SizeGigabytes.ValueFloat64()),
+				Type:          "add_disk",
+			})
+			if err != nil {
+				diags.AddError("Error creating disk", err.Error())
+				return diags
+			}
+			err = r.waitForServerAction(ctx, state.Id.ValueInt64(), *resp.JSON200.Action.Id)
+			if err != nil {
+				diags.AddError("Error waiting for new disk to be added", err.Error())
+				return diags
+			}
+		}
+	}
+
+	return diags
+}
+
 func (r *serverResource) fetchServerResourceState(ctx context.Context, state *serverResourceModel) diag.Diagnostics {
 	var diags diag.Diagnostics

@@ -1341,7 +1464,6 @@ func (r *serverResource) fetchServerResourceState(ctx context.Context, state *se
 	state.Memory = types.Int32Value(*serverResp.JSON200.Server.Memory)
 	state.Disk = types.Int32Value(*serverResp.JSON200.Server.Disk)
 	state.Backups = types.BoolValue(serverResp.JSON200.Server.NextBackupWindow != nil)
-	state.Ipv6 = types.BoolValue(len(serverResp.JSON200.Server.Networks.V6) > 0)

 	advFeat := *serverResp.JSON200.Server.AdvancedFeatures.EnabledAdvancedFeatures
 	state.AdvancedFeatures, diags = resources.NewAdvancedFeaturesValue(
@@ -1366,10 +1488,16 @@ func (r *serverResource) fetchServerResourceState(ctx context.Context, state *se
 	privateIpv4Addresses := []string{}

 	for _, v4address := range serverResp.JSON200.Server.Networks.V4 {
-		if v4address.Type == "public" {
+		switch v4address.Type {
+		case "public":
 			publicIpv4Addresses = append(publicIpv4Addresses, v4address.IpAddress)
-		} else if v4address.Type == "private" {
+		case "private":
 			privateIpv4Addresses = append(privateIpv4Addresses, v4address.IpAddress)
+		default:
+			diags.AddError(
+				"Unexpected IP address type",
+				fmt.Sprintf("Received unexpected IP address type '%s' for server: id=%d, name=%s", v4address.Type, *serverResp.JSON200.Server.Id, *serverResp.JSON200.Server.Name),
+			)
 		}
 	}

@@ -1391,31 +1519,12 @@ func (r *serverResource) fetchServerResourceState(ctx context.Context, state *se
 		state.PrivateIPv4Addresses = tfPrivateIpv4Addresses
 	}

-	publicIpv6Addresses := []string{}
-	privateIpv6Addresses := []string{}
-
-	for _, v6address := range serverResp.JSON200.Server.Networks.V6 {
-		if v6address.Type == "public" {
-			publicIpv6Addresses = append(publicIpv6Addresses, v6address.IpAddress)
-		} else {
-			privateIpv6Addresses = append(privateIpv6Addresses, v6address.IpAddress)
-		}
-	}
-
-	tfPublicIpv6Addresses, diag := types.ListValueFrom(ctx, types.StringType, publicIpv6Addresses)
+	disks, diag := types.ListValueFrom(ctx, state.Disks.ElementType(ctx), serverResp.JSON200.Server.Disks)
 	diags.Append(diag...)
-	if diag.HasError() || tfPublicIpv6Addresses.IsNull() {
-		state.PublicIpv6Addresses = types.ListUnknown(state.PublicIpv6Addresses.ElementType(ctx))
+	if diag.HasError() {
+		state.Disks = types.ListUnknown(state.Disks.ElementType(ctx))
 	} else {
-		state.PublicIpv6Addresses = tfPublicIpv6Addresses
-	}
-
-	tfPrivateIpv6Addresses, diag := types.ListValueFrom(ctx, types.StringType, privateIpv6Addresses)
-	diags.Append(diag...)
-	if diag.HasError() || tfPrivateIpv6Addresses.IsNull() {
-		state.PrivateIpv6Addresses = types.ListUnknown(state.PrivateIpv6Addresses.ElementType(ctx))
-	} else {
-		state.PrivateIpv6Addresses = tfPrivateIpv6Addresses
+		state.Disks = disks
 	}

 	return diags
@@ -104,8 +104,11 @@ echo "Hello World" > /var/tmp/output.txt
 					resource.TestCheckResourceAttr("binarylane_server.test", "advanced_features.cloud_init", "true"),
 					resource.TestCheckResourceAttr("binarylane_server.test", "advanced_features.qemu_guest_agent", "false"),
 					resource.TestCheckResourceAttr("binarylane_server.test", "advanced_features.uefi_boot", "false"),
-					resource.TestCheckResourceAttr("binarylane_server.test", "ipv6", "false"),
-					resource.TestCheckResourceAttr("binarylane_server.test", "public_ipv6_addresses.#", "0"),
+					resource.TestCheckResourceAttr("binarylane_server.test", "disks.#", "1"),
+					resource.TestCheckResourceAttrSet("binarylane_server.test", "disks.0.id"),
+					resource.TestCheckResourceAttrSet("binarylane_server.test", "disks.0.description"),
+					resource.TestCheckResourceAttr("binarylane_server.test", "disks.0.primary", "true"),
+					resource.TestCheckResourceAttr("binarylane_server.test", "disks.0.size_gigabytes", "20"),

 					// Verify data source values
 					resource.TestCheckResourceAttrPair("data.binarylane_server.test", "id", "binarylane_server.test", "id"),
@@ -132,8 +135,11 @@ echo "Hello World" > /var/tmp/output.txt
 					resource.TestCheckResourceAttr("data.binarylane_server.test", "advanced_features.cloud_init", "true"),
 					resource.TestCheckResourceAttr("data.binarylane_server.test", "advanced_features.qemu_guest_agent", "false"),
 					resource.TestCheckResourceAttr("data.binarylane_server.test", "advanced_features.uefi_boot", "false"),
-					resource.TestCheckResourceAttr("data.binarylane_server.test", "ipv6", "false"),
-					resource.TestCheckResourceAttr("data.binarylane_server.test", "public_ipv6_addresses.#", "0"),
+					resource.TestCheckResourceAttr("data.binarylane_server.test", "disks.#", "1"),
+					resource.TestCheckResourceAttrSet("data.binarylane_server.test", "disks.0.id"),
+					resource.TestCheckResourceAttrSet("data.binarylane_server.test", "disks.0.description"),
+					resource.TestCheckResourceAttr("data.binarylane_server.test", "disks.0.primary", "true"),
+					resource.TestCheckResourceAttr("data.binarylane_server.test", "disks.0.size_gigabytes", "20"),
 				),
 			},
 			// Test import by ID
@@ -184,7 +190,6 @@ resource "binarylane_server" "test" {
 	advanced_features = {
 	  emulated_hyperv = true
 	}
-	ipv6							= true

 	# source_and_destination_check =  null  # defaults to null
 	# backups				  = false  # defaults to false
@@ -219,9 +224,6 @@ echo "Hello Whitespace" > /var/tmp/output.txt


 `),
-					resource.TestCheckResourceAttr("binarylane_server.test", "ipv6", "true"),
-					resource.TestCheckResourceAttr("binarylane_server.test", "public_ipv6_addresses.#", "1"),
-					resource.TestCheckResourceAttr("binarylane_server.test", "private_ipv6_addresses.#", "1"),
 				),
 			},
 			// Change password testing (Cannot run at same time as Rebuild operation, so it has it's own test)
@@ -321,6 +323,85 @@ resource "binarylane_server" "test" {
 	})
 }

+func TestServerResourceDisks(t *testing.T) {
+	// Must assign a password to the server or Binary Lane will send emails
+	password := GenerateTestPassword(t)
+
+	resource.ParallelTest(t, resource.TestCase{
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		Steps: []resource.TestStep{
+			// Create and Read testing
+			{
+				Config: providerConfig + `
+resource "binarylane_server" "test" {
+  name     = "tf-test-server-resource"
+  region   = "per"
+  image    = "debian-12"
+  size     = "std-min"
+  password = "` + password + `"
+	public_ipv4_count = 0
+	disks    = [
+		{
+			description = "Primary Disk"
+			size_gigabytes = 9
+		},
+		{
+			description = "Secondary Disk"
+			size_gigabytes = 2
+		},
+		{
+			description = "Tertiary Disk"
+			size_gigabytes = 4
+		}
+	]
+}
+`,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr("binarylane_server.test", "disks.#", "2"),
+					resource.TestCheckResourceAttrSet("binarylane_server.test", "disks.0.id"),
+					resource.TestCheckResourceAttr("binarylane_server.test", "disks.0.description", "Renamed Primary Disk"),
+					resource.TestCheckResourceAttr("binarylane_server.test", "disks.0.primary", "true"),
+					resource.TestCheckResourceAttr("binarylane_server.test", "disks.0.size_gigabytes", "10"),
+					resource.TestCheckResourceAttrSet("binarylane_server.test", "disks.1.id"),
+					resource.TestCheckResourceAttr("binarylane_server.test", "disks.1.description", "Secondary Disk"),
+					resource.TestCheckResourceAttr("binarylane_server.test", "disks.1.primary", "false"),
+					resource.TestCheckResourceAttr("binarylane_server.test", "disks.1.size_gigabytes", "5"),
+				),
+			},
+			// Test import by ID
+			{
+				ResourceName:            "binarylane_server.test",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"password", "ssh_keys", "timeouts"},
+			},
+			// Test import by ID
+			{
+				Config: providerConfig + `
+resource "binarylane_server" "test" {
+  name     = "tf-test-server-resource"
+  region   = "per"
+  image    = "debian-12"
+  size     = "std-min"
+  password = "` + password + `"
+	public_ipv4_count = 0
+	disks    = [
+		{
+			description = "Renamed Primary Disk"
+			size_gigabytes = 10
+		},
+		{
+			description = "Secondary Disk"
+			size_gigabytes = 10
+		}
+	]
+}
+`,
+			},
+		},
+	})
+}
+
 func GenerateTestPassword(t *testing.T) string {
 	t.Helper()
 	pwBytes := make([]byte, 12)
@@ -127,45 +127,6 @@ func convertResourceAttrToDataSourceAttr(name string, attribute r_schema.Attribu
 		}, nil

 	default:
-		if t, isSet := attribute.(r_schema.SetNestedAttribute); isSet {
-			nestedObjectAttrs := make(map[string]d_schema.Attribute)
-			for name, attribute := range t.NestedObject.Attributes {
-				nestedAttribute, err := convertResourceAttrToDataSourceAttr(name, attribute, required, optional)
-				if err != nil {
-					return nil, err
-				}
-				nestedObjectAttrs[name] = nestedAttribute
-			}
-			return d_schema.SetNestedAttribute{
-				NestedObject: d_schema.NestedAttributeObject{
-					Attributes: nestedObjectAttrs,
-					CustomType: t.NestedObject.CustomType,
-					Validators: t.NestedObject.Validators,
-				},
-				CustomType:          t.CustomType,
-				Description:         attribute.GetDescription(),
-				Required:            required,
-				Optional:            optional,
-				Computed:            !required,
-				Sensitive:           attribute.IsSensitive(),
-				MarkdownDescription: attribute.GetMarkdownDescription(),
-				DeprecationMessage:  attribute.GetDeprecationMessage(),
-			}, nil
-		}
-
-		if t, isSet := attribute.GetType().(types.SetType); isSet {
-			return d_schema.SetAttribute{
-				ElementType:         t.ElemType,
-				Description:         attribute.GetDescription(),
-				Required:            required,
-				Optional:            optional,
-				Computed:            !required,
-				Sensitive:           attribute.IsSensitive(),
-				MarkdownDescription: attribute.GetMarkdownDescription(),
-				DeprecationMessage:  attribute.GetDeprecationMessage(),
-			}, nil
-		}
-
 		if t, isList := attribute.(r_schema.ListNestedAttribute); isList {
 			nestedObjectAttrs := make(map[string]d_schema.Attribute)
 			for name, attribute := range t.NestedObject.Attributes {
@@ -204,7 +165,6 @@ func convertResourceAttrToDataSourceAttr(name string, attribute r_schema.Attribu
 				DeprecationMessage:  attribute.GetDeprecationMessage(),
 			}, nil
 		}
-
 		if t, isObject := attribute.(r_schema.SingleNestedAttribute); isObject {
 			attributeTypes := make(map[string]attr.Type, len(t.GetAttributes()))
 			for name, attribute := range t.GetAttributes() {
@@ -95,7 +95,7 @@ func LoadBalancerResourceSchema(ctx context.Context) schema.Schema {
 				Description:         "Leave null to create an anycast load balancer.",
 				MarkdownDescription: "Leave null to create an anycast load balancer.",
 			},
-			"server_ids": schema.SetAttribute{
+			"server_ids": schema.ListAttribute{
 				ElementType:         types.Int64Type,
 				Optional:            true,
 				Computed:            true,
@@ -112,7 +112,7 @@ type LoadBalancerModel struct {
 	Id              types.Int64      `tfsdk:"id"`
 	Name            types.String     `tfsdk:"name"`
 	Region          types.String     `tfsdk:"region"`
-	ServerIds       types.Set        `tfsdk:"server_ids"`
+	ServerIds       types.List       `tfsdk:"server_ids"`
 }

 var _ basetypes.ObjectTypable = ForwardingRulesType{}
@@ -94,6 +94,42 @@ func ServerResourceSchema(ctx context.Context) schema.Schema {
 				Description:         "If true this will enable two daily backups for the server. `options.daily_backups` will override this value if provided. Setting this to false has no effect.\n",
 				MarkdownDescription: "If true this will enable two daily backups for the server. `options.daily_backups` will override this value if provided. Setting this to false has no effect.\n",
 			},
+			"disks": schema.ListNestedAttribute{
+				NestedObject: schema.NestedAttributeObject{
+					Attributes: map[string]schema.Attribute{
+						"description": schema.StringAttribute{
+							Optional:            true,
+							Computed:            true,
+							Description:         "A description of this disk.",
+							MarkdownDescription: "A description of this disk.",
+						},
+						"id": schema.Int64Attribute{
+							Computed:            true,
+							Description:         "The ID of this disk.",
+							MarkdownDescription: "The ID of this disk.",
+						},
+						"primary": schema.BoolAttribute{
+							Computed:            true,
+							Description:         "A primary disk is treated differently from other disks.",
+							MarkdownDescription: "A primary disk is treated differently from other disks.",
+						},
+						"size_gigabytes": schema.Float64Attribute{
+							Required:            true,
+							Description:         "The size of the disk in GB.",
+							MarkdownDescription: "The size of the disk in GB.",
+						},
+					},
+					CustomType: DisksType{
+						ObjectType: types.ObjectType{
+							AttrTypes: DisksValue{}.AttributeTypes(ctx),
+						},
+					},
+				},
+				Optional:            true,
+				Computed:            true,
+				Description:         "A list of the disks that are currently attached to the server.",
+				MarkdownDescription: "A list of the disks that are currently attached to the server.",
+			},
 			"id": schema.Int64Attribute{
 				Optional:            true,
 				Computed:            true,
@@ -105,12 +141,6 @@ func ServerResourceSchema(ctx context.Context) schema.Schema {
 				Description:         "The slug of the selected operating system.",
 				MarkdownDescription: "The slug of the selected operating system.",
 			},
-			"ipv6": schema.BoolAttribute{
-				Optional:            true,
-				Computed:            true,
-				Description:         "If true this will enable IPv6 for this server.",
-				MarkdownDescription: "If true this will enable IPv6 for this server.",
-			},
 			"name": schema.StringAttribute{
 				Optional:            true,
 				Computed:            true,
@@ -168,9 +198,9 @@ func ServerResourceSchema(ctx context.Context) schema.Schema {
 type ServerModel struct {
 	AdvancedFeatures AdvancedFeaturesValue `tfsdk:"advanced_features"`
 	Backups          types.Bool            `tfsdk:"backups"`
+	Disks            types.List            `tfsdk:"disks"`
 	Id               types.Int64           `tfsdk:"id"`
 	Image            types.String          `tfsdk:"image"`
-	Ipv6             types.Bool            `tfsdk:"ipv6"`
 	Name             types.String          `tfsdk:"name"`
 	PortBlocking     types.Bool            `tfsdk:"port_blocking"`
 	Region           types.String          `tfsdk:"region"`
@@ -998,3 +1028,492 @@ func (v AdvancedFeaturesValue) AttributeTypes(ctx context.Context) map[string]at
 		"unset_uuid":       basetypes.BoolType{},
 	}
 }
+
+var _ basetypes.ObjectTypable = DisksType{}
+
+type DisksType struct {
+	basetypes.ObjectType
+}
+
+func (t DisksType) Equal(o attr.Type) bool {
+	other, ok := o.(DisksType)
+
+	if !ok {
+		return false
+	}
+
+	return t.ObjectType.Equal(other.ObjectType)
+}
+
+func (t DisksType) String() string {
+	return "DisksType"
+}
+
+func (t DisksType) ValueFromObject(ctx context.Context, in basetypes.ObjectValue) (basetypes.ObjectValuable, diag.Diagnostics) {
+	var diags diag.Diagnostics
+
+	attributes := in.Attributes()
+
+	descriptionAttribute, ok := attributes["description"]
+
+	if !ok {
+		diags.AddError(
+			"Attribute Missing",
+			`description is missing from object`)
+
+		return nil, diags
+	}
+
+	descriptionVal, ok := descriptionAttribute.(basetypes.StringValue)
+
+	if !ok {
+		diags.AddError(
+			"Attribute Wrong Type",
+			fmt.Sprintf(`description expected to be basetypes.StringValue, was: %T`, descriptionAttribute))
+	}
+
+	idAttribute, ok := attributes["id"]
+
+	if !ok {
+		diags.AddError(
+			"Attribute Missing",
+			`id is missing from object`)
+
+		return nil, diags
+	}
+
+	idVal, ok := idAttribute.(basetypes.Int64Value)
+
+	if !ok {
+		diags.AddError(
+			"Attribute Wrong Type",
+			fmt.Sprintf(`id expected to be basetypes.Int64Value, was: %T`, idAttribute))
+	}
+
+	primaryAttribute, ok := attributes["primary"]
+
+	if !ok {
+		diags.AddError(
+			"Attribute Missing",
+			`primary is missing from object`)
+
+		return nil, diags
+	}
+
+	primaryVal, ok := primaryAttribute.(basetypes.BoolValue)
+
+	if !ok {
+		diags.AddError(
+			"Attribute Wrong Type",
+			fmt.Sprintf(`primary expected to be basetypes.BoolValue, was: %T`, primaryAttribute))
+	}
+
+	sizeGigabytesAttribute, ok := attributes["size_gigabytes"]
+
+	if !ok {
+		diags.AddError(
+			"Attribute Missing",
+			`size_gigabytes is missing from object`)
+
+		return nil, diags
+	}
+
+	sizeGigabytesVal, ok := sizeGigabytesAttribute.(basetypes.Float64Value)
+
+	if !ok {
+		diags.AddError(
+			"Attribute Wrong Type",
+			fmt.Sprintf(`size_gigabytes expected to be basetypes.Float64Value, was: %T`, sizeGigabytesAttribute))
+	}
+
+	if diags.HasError() {
+		return nil, diags
+	}
+
+	return DisksValue{
+		Description:   descriptionVal,
+		Id:            idVal,
+		Primary:       primaryVal,
+		SizeGigabytes: sizeGigabytesVal,
+		state:         attr.ValueStateKnown,
+	}, diags
+}
+
+func NewDisksValueNull() DisksValue {
+	return DisksValue{
+		state: attr.ValueStateNull,
+	}
+}
+
+func NewDisksValueUnknown() DisksValue {
+	return DisksValue{
+		state: attr.ValueStateUnknown,
+	}
+}
+
+func NewDisksValue(attributeTypes map[string]attr.Type, attributes map[string]attr.Value) (DisksValue, diag.Diagnostics) {
+	var diags diag.Diagnostics
+
+	// Reference: https://github.com/hashicorp/terraform-plugin-framework/issues/521
+	ctx := context.Background()
+
+	for name, attributeType := range attributeTypes {
+		attribute, ok := attributes[name]
+
+		if !ok {
+			diags.AddError(
+				"Missing DisksValue Attribute Value",
+				"While creating a DisksValue value, a missing attribute value was detected. "+
+					"A DisksValue must contain values for all attributes, even if null or unknown. "+
+					"This is always an issue with the provider and should be reported to the provider developers.\n\n"+
+					fmt.Sprintf("DisksValue Attribute Name (%s) Expected Type: %s", name, attributeType.String()),
+			)
+
+			continue
+		}
+
+		if !attributeType.Equal(attribute.Type(ctx)) {
+			diags.AddError(
+				"Invalid DisksValue Attribute Type",
+				"While creating a DisksValue value, an invalid attribute value was detected. "+
+					"A DisksValue must use a matching attribute type for the value. "+
+					"This is always an issue with the provider and should be reported to the provider developers.\n\n"+
+					fmt.Sprintf("DisksValue Attribute Name (%s) Expected Type: %s\n", name, attributeType.String())+
+					fmt.Sprintf("DisksValue Attribute Name (%s) Given Type: %s", name, attribute.Type(ctx)),
+			)
+		}
+	}
+
+	for name := range attributes {
+		_, ok := attributeTypes[name]
+
+		if !ok {
+			diags.AddError(
+				"Extra DisksValue Attribute Value",
+				"While creating a DisksValue value, an extra attribute value was detected. "+
+					"A DisksValue must not contain values beyond the expected attribute types. "+
+					"This is always an issue with the provider and should be reported to the provider developers.\n\n"+
+					fmt.Sprintf("Extra DisksValue Attribute Name: %s", name),
+			)
+		}
+	}
+
+	if diags.HasError() {
+		return NewDisksValueUnknown(), diags
+	}
+
+	descriptionAttribute, ok := attributes["description"]
+
+	if !ok {
+		diags.AddError(
+			"Attribute Missing",
+			`description is missing from object`)
+
+		return NewDisksValueUnknown(), diags
+	}
+
+	descriptionVal, ok := descriptionAttribute.(basetypes.StringValue)
+
+	if !ok {
+		diags.AddError(
+			"Attribute Wrong Type",
+			fmt.Sprintf(`description expected to be basetypes.StringValue, was: %T`, descriptionAttribute))
+	}
+
+	idAttribute, ok := attributes["id"]
+
+	if !ok {
+		diags.AddError(
+			"Attribute Missing",
+			`id is missing from object`)
+
+		return NewDisksValueUnknown(), diags
+	}
+
+	idVal, ok := idAttribute.(basetypes.Int64Value)
+
+	if !ok {
+		diags.AddError(
+			"Attribute Wrong Type",
+			fmt.Sprintf(`id expected to be basetypes.Int64Value, was: %T`, idAttribute))
+	}
+
+	primaryAttribute, ok := attributes["primary"]
+
+	if !ok {
+		diags.AddError(
+			"Attribute Missing",
+			`primary is missing from object`)
+
+		return NewDisksValueUnknown(), diags
+	}
+
+	primaryVal, ok := primaryAttribute.(basetypes.BoolValue)
+
+	if !ok {
+		diags.AddError(
+			"Attribute Wrong Type",
+			fmt.Sprintf(`primary expected to be basetypes.BoolValue, was: %T`, primaryAttribute))
+	}
+
+	sizeGigabytesAttribute, ok := attributes["size_gigabytes"]
+
+	if !ok {
+		diags.AddError(
+			"Attribute Missing",
+			`size_gigabytes is missing from object`)
+
+		return NewDisksValueUnknown(), diags
+	}
+
+	sizeGigabytesVal, ok := sizeGigabytesAttribute.(basetypes.Float64Value)
+
+	if !ok {
+		diags.AddError(
+			"Attribute Wrong Type",
+			fmt.Sprintf(`size_gigabytes expected to be basetypes.Float64Value, was: %T`, sizeGigabytesAttribute))
+	}
+
+	if diags.HasError() {
+		return NewDisksValueUnknown(), diags
+	}
+
+	return DisksValue{
+		Description:   descriptionVal,
+		Id:            idVal,
+		Primary:       primaryVal,
+		SizeGigabytes: sizeGigabytesVal,
+		state:         attr.ValueStateKnown,
+	}, diags
+}
+
+func NewDisksValueMust(attributeTypes map[string]attr.Type, attributes map[string]attr.Value) DisksValue {
+	object, diags := NewDisksValue(attributeTypes, attributes)
+
+	if diags.HasError() {
+		// This could potentially be added to the diag package.
+		diagsStrings := make([]string, 0, len(diags))
+
+		for _, diagnostic := range diags {
+			diagsStrings = append(diagsStrings, fmt.Sprintf(
+				"%s | %s | %s",
+				diagnostic.Severity(),
+				diagnostic.Summary(),
+				diagnostic.Detail()))
+		}
+
+		panic("NewDisksValueMust received error(s): " + strings.Join(diagsStrings, "\n"))
+	}
+
+	return object
+}
+
+func (t DisksType) ValueFromTerraform(ctx context.Context, in tftypes.Value) (attr.Value, error) {
+	if in.Type() == nil {
+		return NewDisksValueNull(), nil
+	}
+
+	if !in.Type().Equal(t.TerraformType(ctx)) {
+		return nil, fmt.Errorf("expected %s, got %s", t.TerraformType(ctx), in.Type())
+	}
+
+	if !in.IsKnown() {
+		return NewDisksValueUnknown(), nil
+	}
+
+	if in.IsNull() {
+		return NewDisksValueNull(), nil
+	}
+
+	attributes := map[string]attr.Value{}
+
+	val := map[string]tftypes.Value{}
+
+	err := in.As(&val)
+
+	if err != nil {
+		return nil, err
+	}
+
+	for k, v := range val {
+		a, err := t.AttrTypes[k].ValueFromTerraform(ctx, v)
+
+		if err != nil {
+			return nil, err
+		}
+
+		attributes[k] = a
+	}
+
+	return NewDisksValueMust(DisksValue{}.AttributeTypes(ctx), attributes), nil
+}
+
+func (t DisksType) ValueType(ctx context.Context) attr.Value {
+	return DisksValue{}
+}
+
+var _ basetypes.ObjectValuable = DisksValue{}
+
+type DisksValue struct {
+	Description   basetypes.StringValue  `tfsdk:"description"`
+	Id            basetypes.Int64Value   `tfsdk:"id"`
+	Primary       basetypes.BoolValue    `tfsdk:"primary"`
+	SizeGigabytes basetypes.Float64Value `tfsdk:"size_gigabytes"`
+	state         attr.ValueState
+}
+
+func (v DisksValue) ToTerraformValue(ctx context.Context) (tftypes.Value, error) {
+	attrTypes := make(map[string]tftypes.Type, 4)
+
+	var val tftypes.Value
+	var err error
+
+	attrTypes["description"] = basetypes.StringType{}.TerraformType(ctx)
+	attrTypes["id"] = basetypes.Int64Type{}.TerraformType(ctx)
+	attrTypes["primary"] = basetypes.BoolType{}.TerraformType(ctx)
+	attrTypes["size_gigabytes"] = basetypes.Float64Type{}.TerraformType(ctx)
+
+	objectType := tftypes.Object{AttributeTypes: attrTypes}
+
+	switch v.state {
+	case attr.ValueStateKnown:
+		vals := make(map[string]tftypes.Value, 4)
+
+		val, err = v.Description.ToTerraformValue(ctx)
+
+		if err != nil {
+			return tftypes.NewValue(objectType, tftypes.UnknownValue), err
+		}
+
+		vals["description"] = val
+
+		val, err = v.Id.ToTerraformValue(ctx)
+
+		if err != nil {
+			return tftypes.NewValue(objectType, tftypes.UnknownValue), err
+		}
+
+		vals["id"] = val
+
+		val, err = v.Primary.ToTerraformValue(ctx)
+
+		if err != nil {
+			return tftypes.NewValue(objectType, tftypes.UnknownValue), err
+		}
+
+		vals["primary"] = val
+
+		val, err = v.SizeGigabytes.ToTerraformValue(ctx)
+
+		if err != nil {
+			return tftypes.NewValue(objectType, tftypes.UnknownValue), err
+		}
+
+		vals["size_gigabytes"] = val
+
+		if err := tftypes.ValidateValue(objectType, vals); err != nil {
+			return tftypes.NewValue(objectType, tftypes.UnknownValue), err
+		}
+
+		return tftypes.NewValue(objectType, vals), nil
+	case attr.ValueStateNull:
+		return tftypes.NewValue(objectType, nil), nil
+	case attr.ValueStateUnknown:
+		return tftypes.NewValue(objectType, tftypes.UnknownValue), nil
+	default:
+		panic(fmt.Sprintf("unhandled Object state in ToTerraformValue: %s", v.state))
+	}
+}
+
+func (v DisksValue) IsNull() bool {
+	return v.state == attr.ValueStateNull
+}
+
+func (v DisksValue) IsUnknown() bool {
+	return v.state == attr.ValueStateUnknown
+}
+
+func (v DisksValue) String() string {
+	return "DisksValue"
+}
+
+func (v DisksValue) ToObjectValue(ctx context.Context) (basetypes.ObjectValue, diag.Diagnostics) {
+	var diags diag.Diagnostics
+
+	attributeTypes := map[string]attr.Type{
+		"description":    basetypes.StringType{},
+		"id":             basetypes.Int64Type{},
+		"primary":        basetypes.BoolType{},
+		"size_gigabytes": basetypes.Float64Type{},
+	}
+
+	if v.IsNull() {
+		return types.ObjectNull(attributeTypes), diags
+	}
+
+	if v.IsUnknown() {
+		return types.ObjectUnknown(attributeTypes), diags
+	}
+
+	objVal, diags := types.ObjectValue(
+		attributeTypes,
+		map[string]attr.Value{
+			"description":    v.Description,
+			"id":             v.Id,
+			"primary":        v.Primary,
+			"size_gigabytes": v.SizeGigabytes,
+		})
+
+	return objVal, diags
+}
+
+func (v DisksValue) Equal(o attr.Value) bool {
+	other, ok := o.(DisksValue)
+
+	if !ok {
+		return false
+	}
+
+	if v.state != other.state {
+		return false
+	}
+
+	if v.state != attr.ValueStateKnown {
+		return true
+	}
+
+	if !v.Description.Equal(other.Description) {
+		return false
+	}
+
+	if !v.Id.Equal(other.Id) {
+		return false
+	}
+
+	if !v.Primary.Equal(other.Primary) {
+		return false
+	}
+
+	if !v.SizeGigabytes.Equal(other.SizeGigabytes) {
+		return false
+	}
+
+	return true
+}
+
+func (v DisksValue) Type(ctx context.Context) attr.Type {
+	return DisksType{
+		basetypes.ObjectType{
+			AttrTypes: v.AttributeTypes(ctx),
+		},
+	}
+}
+
+func (v DisksValue) AttributeTypes(ctx context.Context) map[string]attr.Type {
+	return map[string]attr.Type{
+		"description":    basetypes.StringType{},
+		"id":             basetypes.Int64Type{},
+		"primary":        basetypes.BoolType{},
+		"size_gigabytes": basetypes.Float64Type{},
+	}
+}
@@ -8,7 +8,7 @@
      "url": "https://support.binarylane.com.au",
      "email": "support@binarylane.com.au"
    },
-    "version": "0.33.0",
+    "version": "0.32.1",
    "x-logo": {
      "url": "https://www.binarylane.com.au/res/images/binarylane/logo.png",
      "backgroundColor": "#000000",
@@ -7995,24 +7995,36 @@
            "type": "integer",
            "description": "The ID of this disk.",
            "format": "int64",
-            "readOnly": true
+            "readOnly": true,
+            "x-oapi-codegen-extra-tags": {
+              "tfsdk": "id"
+            }
          },
          "size_gigabytes": {
            "type": "number",
            "description": "The size of the disk in GB.",
            "format": "double",
-            "readOnly": true
+            "readOnly": true,
+            "x-oapi-codegen-extra-tags": {
+              "tfsdk": "size_gigabytes"
+            }
          },
          "description": {
            "type": "string",
            "description": "A description of this disk.",
            "nullable": true,
-            "readOnly": true
+            "readOnly": true,
+            "x-oapi-codegen-extra-tags": {
+              "tfsdk": "description"
+            }
          },
          "primary": {
            "type": "boolean",
            "description": "A primary disk is treated differently from other disks.",
-            "readOnly": true
+            "readOnly": true,
+            "x-oapi-codegen-extra-tags": {
+              "tfsdk": "primary"
+            }
          }
        }
      },
@@ -9336,7 +9348,6 @@
      },
      "LicensedSoftware": {
        "required": [
-          "incompatible",
          "licence_count",
          "software"
        ],
@@ -9354,10 +9365,6 @@
            "type": "integer",
            "description": "The current licence count for the software.",
            "format": "int32"
-          },
-          "incompatible": {
-            "type": "boolean",
-            "description": "Software that is incompatible with the server will be automatically removed at the next plan change.\nServers may have incompatible software due to changes made by support. Software is not incompatible merely because it is disabled;\ndisabled software may be retained by servers that already have it, incompatible software will be removed."
          }
        }
      },
@@ -10273,7 +10280,7 @@
                "$ref": "#/components/schemas/ChangeLicenses"
              }
            ],
-            "description": "This may be left null to keep the current licenses for the server. If this is provided any licenses that are not included will be removed. Any licences that are invalid will be removed regardless, see the documentation for `servers/{server_id}/software` for more information.",
+            "description": "This may be left null to keep the current licenses for the server. If this is provided any licenses that are not included will be removed.",
            "nullable": true
          },
          "pre_action_backup": {
@@ -798,7 +798,7 @@
 					},
 					{
 						"name": "server_ids",
-						"set": {
+						"list": {
 							"computed_optional_required": "computed_optional",
 							"element_type": {
 								"int64": {}
@@ -834,13 +834,6 @@
 							"description": "The slug of the selected operating system."
 						}
 					},
-					{
-						"name": "ipv6",
-						"bool": {
-							"computed_optional_required": "computed_optional",
-							"description": "If true this will enable IPv6 for this server."
-						}
-					},
 					{
 						"name": "name",
 						"string": {
@@ -1013,6 +1006,45 @@
 								}
 							]
 						}
+					},
+					{
+						"name": "disks",
+						"list_nested": {
+							"computed_optional_required": "computed_optional",
+							"nested_object": {
+								"attributes": [
+									{
+										"name": "description",
+										"string": {
+											"computed_optional_required": "computed_optional",
+											"description": "A description of this disk."
+										}
+									},
+									{
+										"name": "id",
+										"int64": {
+											"computed_optional_required": "computed",
+											"description": "The ID of this disk."
+										}
+									},
+									{
+										"name": "primary",
+										"bool": {
+											"computed_optional_required": "computed",
+											"description": "A primary disk is treated differently from other disks."
+										}
+									},
+									{
+										"name": "size_gigabytes",
+										"float64": {
+											"computed_optional_required": "required",
+											"description": "The size of the disk in GB."
+										}
+									}
+								]
+							},
+							"description": "A list of the disks that are currently attached to the server."
+						}
 					}
 				]
 			}
@@ -1316,6 +1348,5 @@
 			}
 		}
 	],
-	"version": "0.1",
-	"$schema": "https://raw.githubusercontent.com/hashicorp/terraform-plugin-codegen-spec/main/spec/v0.1/schema.json"
+	"version": "0.1"
 }
@@ -40,6 +40,7 @@ resources:
              default will be deployed (assuming the operating system supports SSH Keys). Submit an empty list to
              disable deployment of default keys.
      ignores:
+        - ipv6
        - licenses
        - links
        - server
@@ -0,0 +1,39 @@
+{
+  "name": "disks",
+  "list_nested": {
+    "computed_optional_required": "computed_optional",
+    "nested_object": {
+      "attributes": [
+        {
+          "name": "description",
+          "string": {
+            "computed_optional_required": "computed_optional",
+            "description": "A description of this disk."
+          }
+        },
+        {
+          "name": "id",
+          "int64": {
+            "computed_optional_required": "computed",
+            "description": "The ID of this disk."
+          }
+        },
+        {
+          "name": "primary",
+          "bool": {
+            "computed_optional_required": "computed",
+            "description": "A primary disk is treated differently from other disks."
+          }
+        },
+        {
+          "name": "size_gigabytes",
+          "float64": {
+            "computed_optional_required": "required",
+            "description": "The size of the disk in GB."
+          }
+        }
+      ]
+    },
+    "description": "A list of the disks that are currently attached to the server."
+  }
+}
@@ -2,24 +2,9 @@

 GENERATOR_CONFIG=$(dirname "$0")/../provider_code_spec.json

-# Add JSON schema
-cat <<<$(jq --tab '. + {"$schema": "https://raw.githubusercontent.com/hashicorp/terraform-plugin-codegen-spec/main/spec/v0.1/schema.json"}' $GENERATOR_CONFIG) >$GENERATOR_CONFIG
-
 # Server configuration
 ADVANCED_FEATURES_CONFIG=$(dirname "$0")/data/server_advanced_features.json
 cat <<<$(jq --tab --slurpfile adv_feat_cfg $ADVANCED_FEATURES_CONFIG '.resources[1].schema.attributes |= . + $adv_feat_cfg' $GENERATOR_CONFIG) >$GENERATOR_CONFIG

-# Use set instead of list for server_ids in load_balancer resource
-jq --tab '
-  .resources |= map(
-    if .name == "load_balancer" then
-      .schema.attributes |= map(
-        if .name == "server_ids" then
-          with_entries(.key |= gsub("list"; "set"))
-        else .
-        end
-      )
-    else .
-    end
-  )
-' "$GENERATOR_CONFIG" >"$GENERATOR_CONFIG.tmp" && mv "$GENERATOR_CONFIG.tmp" "$GENERATOR_CONFIG"
+DISKS_CONFIG=$(dirname "$0")/data/server_disks.json
+cat <<<$(jq --tab --slurpfile disks_cfg $DISKS_CONFIG '.resources[1].schema.attributes |= . + $disks_cfg' $GENERATOR_CONFIG) >$GENERATOR_CONFIG
@@ -142,5 +142,11 @@ cat <<<$(jq '.components.schemas.SizeType.properties.slug += {"x-oapi-codegen-ex
 cat <<<$(jq '.components.schemas.SizeType.properties.name += {"x-oapi-codegen-extra-tags": {"tfsdk": "name"}}' $OPENAPI_FILE) >$OPENAPI_FILE
 cat <<<$(jq '.components.schemas.SizeType.properties.description += {"x-oapi-codegen-extra-tags": {"tfsdk": "description"}}' $OPENAPI_FILE) >$OPENAPI_FILE

+## Disks
+cat <<<$(jq '.components.schemas.Disk.properties.id += {"x-oapi-codegen-extra-tags": {"tfsdk": "id"}}' $OPENAPI_FILE) >$OPENAPI_FILE
+cat <<<$(jq '.components.schemas.Disk.properties.description += {"x-oapi-codegen-extra-tags": {"tfsdk": "description"}}' $OPENAPI_FILE) >$OPENAPI_FILE
+cat <<<$(jq '.components.schemas.Disk.properties.primary += {"x-oapi-codegen-extra-tags": {"tfsdk": "primary"}}' $OPENAPI_FILE) >$OPENAPI_FILE
+cat <<<$(jq '.components.schemas.Disk.properties.size_gigabytes += {"x-oapi-codegen-extra-tags": {"tfsdk": "size_gigabytes"}}' $OPENAPI_FILE) >$OPENAPI_FILE
+
 # Edit description here because it's hard to override nested schema properties
 cat <<<$(jq '.components.schemas.ForwardingRule.properties.entry_protocol.description = "The protocol that traffic must match for the load balancer to forward it. Valid values are \"http\" and \"https\"."' $OPENAPI_FILE) >$OPENAPI_FILE
Author	SHA1	Message	Date
Oscar Hermoso	32e9056957	💽 WIP disks	2025-08-17 17:22:26 +08:00
Oscar Hermoso	325b2e96ea	👆 Update OpenAPI schema to 0.32.1	2025-08-16 11:12:32 +08:00