wip

Author: phm07

internal/loadbalancer/data_source.go

@@ -56,12 +56,30 @@ func getCommonDataSchema() map[string]*schema.Schema {
 			Computed: true,
 		},
 		"network_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
+			Type:       schema.TypeInt,
+			Computed:   true,
+			Deprecated: "This attribute is deprecated. Use hcloud_load_balancer.private_net[].id instead.",
 		},
 		"network_ip": {
-			Type:     schema.TypeString,
+			Type:       schema.TypeString,
+			Computed:   true,
+			Deprecated: "This attribute is deprecated. Use hcloud_load_balancer.private_net[].ipv4 instead.",
+		},
+		"private_net": {
+			Type:     schema.TypeList,
 			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"ipv4": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
 		},
 		"algorithm": {
 			Type:     schema.TypeList,

internal/loadbalancer/resource.go

@@ -399,6 +399,8 @@ func getLoadBalancerAttributes(lb *hcloud.LoadBalancer) map[string]any {
 		"network_zone":       lb.Location.NetworkZone,
 		"labels":             lb.Labels,
 		"target":             targetToTerraformTargets(lb.Targets),
+		"service":            serviceToTerraformServices(lb, lb.Services),
+		"private_net":        privateNetToTerraformPrivateNets(lb.PrivateNet),
 		"delete_protection":  lb.Protection.Delete,
 	}
 
@@ -410,6 +412,25 @@ func getLoadBalancerAttributes(lb *hcloud.LoadBalancer) map[string]any {
 	return res
 }
 
+func privateNetToTerraformPrivateNets(nets []hcloud.LoadBalancerPrivateNet) []map[string]any {
+	tfPrivateNets := make([]map[string]any, len(nets))
+	for i, net := range nets {
+		tfPrivateNets[i] = map[string]any{
+			"id":   net.Network.ID,
+			"ipv4": net.IP.String(),
+		}
+	}
+	return tfPrivateNets
+}
+
+func serviceToTerraformServices(lb *hcloud.LoadBalancer, services []hcloud.LoadBalancerService) []map[string]any {
+	tfServices := make([]map[string]any, len(services))
+	for i, service := range services {
+		tfServices[i] = getLoadBalancerServiceAttributes(lb, &service)
+	}
+	return tfServices
+}
+
 func parseTerraformTarget(tfTargets *schema.Set) (opts []hcloud.LoadBalancerCreateOptsTarget) {
 	for _, _tfTarget := range tfTargets.List() {
 		tfTarget := _tfTarget.(map[string]any)

internal/loadbalancer/resource_service.go

@@ -349,14 +349,18 @@ func resourceLoadBalancerServiceDelete(ctx context.Context, d *schema.ResourceDa
 }
 
 func setLoadBalancerServiceSchema(d *schema.ResourceData, lb *hcloud.LoadBalancer, svc *hcloud.LoadBalancerService) {
-	svcID := fmt.Sprintf("%d__%d", lb.ID, svc.ListenPort)
+	util.SetSchemaFromAttributes(d, getLoadBalancerServiceAttributes(lb, svc))
+}
 
-	d.SetId(svcID)
-	d.Set("load_balancer_id", util.FormatID(lb.ID))
-	d.Set("protocol", string(svc.Protocol))
-	d.Set("listen_port", svc.ListenPort)
-	d.Set("destination_port", svc.DestinationPort)
-	d.Set("proxyprotocol", svc.Proxyprotocol)
+func getLoadBalancerServiceAttributes(lb *hcloud.LoadBalancer, svc *hcloud.LoadBalancerService) map[string]any {
+	res := map[string]any{
+		"id":               fmt.Sprintf("%d__%d", lb.ID, svc.ListenPort),
+		"load_balancer_id": util.FormatID(lb.ID),
+		"protocol":         string(svc.Protocol),
+		"listen_port":      svc.ListenPort,
+		"destination_port": svc.DestinationPort,
+		"proxyprotocol":    svc.Proxyprotocol,
+	}
 
 	if svc.Protocol != hcloud.LoadBalancerServiceProtocolTCP {
 		httpMap := make(map[string]any)
@@ -381,14 +385,16 @@ func setLoadBalancerServiceSchema(d *schema.ResourceData, lb *hcloud.LoadBalance
 		}
 		httpMap["redirect_http"] = svc.HTTP.RedirectHTTP
 		if len(httpMap) > 0 {
-			d.Set("http", []any{httpMap})
+			res["http"] = httpMap
 		}
 	}
 
 	healthCheck := toTFHealthCheck(svc.HealthCheck)
 	if len(healthCheck) > 0 {
-		d.Set("health_check", []any{healthCheck})
+		res["health_check"] = []any{healthCheck}
 	}
+
+	return res
 }
 
 var errInvalidLoadBalancerServiceID = errors.New("invalid load balancer service id")