Merge branch 'master' into feat/add_key_managers_resource

Author: jremy42

docs/resources/lb.md

@@ -109,8 +109,6 @@ The following arguments are supported:
     - `private_network_id` - (Required) The ID of the Private Network to attach to.
     - ~> **Important:** Updates to `private_network` will recreate the attachment.
     - `ipam_ids` - (Optional) IPAM ID of a pre-reserved IP address to assign to the Load Balancer on this Private Network.
-    - `dhcp_config` - (Deprecated) Please use `ipam_ids`. Set to `true` if you want to let DHCP assign IP addresses.
-    - `static_config` - (Deprecated) Please use `ipam_ids`. Define a local ip address of your choice for the load balancer instance.
 - `ssl_compatibility_level` - (Optional) Enforces minimal SSL version (in SSL/TLS offloading context). Please check [possible values](https://www.scaleway.com/en/developers/api/load-balancer/zoned-api/#path-load-balancer-create-a-load-balancer).
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) of the Load Balancer.
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the Project the Load Balancer is associated with.

internal/services/lb/lb.go

@@ -131,18 +131,16 @@ func ResourceLb() *schema.Resource {
 						"static_config": {
 							Description: "Define an IP address in the subnet of your private network that will be assigned to your load balancer instance",
 							Type:        schema.TypeList,
-							Optional:    true,
+							Computed:    true,
 							Deprecated:  "static_config field is deprecated, please use `private_network_id` or `ipam_ids` instead",
 							Elem: &schema.Schema{
 								Type:             schema.TypeString,
 								ValidateDiagFunc: verify.IsStandaloneIPorCIDR(),
 							},
-							MaxItems: 1,
 						},
 						"dhcp_config": {
 							Description: "Set to true if you want to let DHCP assign IP addresses",
 							Type:        schema.TypeBool,
-							Optional:    true,
 							Computed:    true,
 							Deprecated:  "dhcp_config field is deprecated, please use `private_network_id` or `ipam_ids` instead",
 						},

internal/services/lb/types.go

@@ -400,13 +400,6 @@ func expandPrivateNetworks(data any) ([]*lb.PrivateNetwork, error) {
 		rawPn := pn.(map[string]any)
 		privateNetwork := &lb.PrivateNetwork{}
 		privateNetwork.PrivateNetworkID = locality.ExpandID(rawPn["private_network_id"].(string))
-
-		if staticConfig, hasStaticConfig := rawPn["static_config"]; hasStaticConfig && len(staticConfig.([]any)) > 0 {
-			privateNetwork.StaticConfig = expandLbPrivateNetworkStaticConfig(staticConfig) //nolint:staticcheck
-		} else {
-			privateNetwork.DHCPConfig = expandLbPrivateNetworkDHCPConfig(rawPn["dhcp_config"]) //nolint:staticcheck
-		}
-
 		privateNetwork.IpamIDs = locality.ExpandIDs(rawPn["ipam_ids"])
 
 		pns = append(pns, privateNetwork)
@@ -415,16 +408,6 @@ func expandPrivateNetworks(data any) ([]*lb.PrivateNetwork, error) {
 	return pns, nil
 }
 
-func expandLbPrivateNetworkStaticConfig(raw any) *lb.PrivateNetworkStaticConfig {
-	if raw == nil || len(raw.([]any)) < 1 {
-		return nil
-	}
-
-	return &lb.PrivateNetworkStaticConfig{
-		IPAddress: types.ExpandStringsPtr(raw),
-	}
-}
-
 func flattenLbPrivateNetworkStaticConfig(cfg *lb.PrivateNetworkStaticConfig) []string {
 	if cfg == nil {
 		return nil
@@ -433,14 +416,6 @@ func flattenLbPrivateNetworkStaticConfig(cfg *lb.PrivateNetworkStaticConfig) []s
 	return *cfg.IPAddress //nolint:staticcheck
 }
 
-func expandLbPrivateNetworkDHCPConfig(raw any) *lb.PrivateNetworkDHCPConfig {
-	if raw == nil || !raw.(bool) {
-		return nil
-	}
-
-	return &lb.PrivateNetworkDHCPConfig{}
-}
-
 func attachLBPrivateNetworks(ctx context.Context, lbAPI *lb.ZonedAPI, zone scw.Zone, pnConfigs []*lb.PrivateNetwork, lbID string, timeout time.Duration) ([]*lb.PrivateNetwork, error) {
 	var privateNetworks []*lb.PrivateNetwork