From 5b6c6f6c73bf3caca98ebe5df066f5b89cedbb1a Mon Sep 17 00:00:00 2001
From: Toni Kangas <toni.kangas@upcloud.com>
Date: Thu, 29 Feb 2024 13:08:10 +0200
Subject: [PATCH] refactor(lbaaas): remove deprecated `DNSName` and
 `NetworkUUID` field

---
 CHANGELOG.md                          | 3 +++
 upcloud/load_balancer.go              | 2 --
 upcloud/load_balancer_test.go         | 3 ---
 upcloud/request/load_balancer.go      | 1 -
 upcloud/request/load_balancer_test.go | 2 --
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e133de4d..dff42454 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+### Removed
+- **Breaking**, Managed Load Balancer: remove deprecated `DNSName` and `NetworkUUID` fields.
+
 ## [7.0.0]
 
 ### Added
diff --git a/upcloud/load_balancer.go b/upcloud/load_balancer.go
index 0c5e9062..bdac79c9 100644
--- a/upcloud/load_balancer.go
+++ b/upcloud/load_balancer.go
@@ -252,9 +252,7 @@ type LoadBalancer struct {
 	Name             string                       `json:"name,omitempty"`
 	Zone             string                       `json:"zone,omitempty"`
 	Plan             string                       `json:"plan,omitempty"`
-	NetworkUUID      string                       `json:"network_uuid,omitempty"` // deprecated
 	Networks         []LoadBalancerNetwork        `json:"networks,omitempty"`
-	DNSName          string                       `json:"dns_name,omitempty"` // deprecated
 	Labels           []Label                      `json:"labels,omitempty"`
 	ConfiguredStatus LoadBalancerConfiguredStatus `json:"configured_status,omitempty"`
 	OperationalState LoadBalancerOperationalState `json:"operational_state,omitempty"`
diff --git a/upcloud/load_balancer_test.go b/upcloud/load_balancer_test.go
index 0015505e..e94842bf 100644
--- a/upcloud/load_balancer_test.go
+++ b/upcloud/load_balancer_test.go
@@ -13,7 +13,6 @@ func TestMarshalLoadBalancer(t *testing.T) {
 	[
 		{
 			"name": "example-service",
-			"network_uuid": "03631160-d57a-4926-ad48-a2f828229dcb",
 			"operational_state": "running",
 			"plan": "development",
 			"configured_status": "started",
@@ -145,8 +144,6 @@ func TestMarshalLoadBalancer(t *testing.T) {
 		Name:             "example-service",
 		Zone:             "fi-hel1",
 		Plan:             "development",
-		NetworkUUID:      "03631160-d57a-4926-ad48-a2f828229dcb",
-		DNSName:          "lb-0aff6dac143c43009b33ee2756f6592d.upcloudlb.com",
 		ConfiguredStatus: LoadBalancerConfiguredStatusStarted,
 		OperationalState: LoadBalancerOperationalStateRunning,
 		CreatedAt:        timeParse("2021-12-07T13:58:30.817272Z"),
diff --git a/upcloud/request/load_balancer.go b/upcloud/request/load_balancer.go
index 2ddd64dc..9a11cea9 100644
--- a/upcloud/request/load_balancer.go
+++ b/upcloud/request/load_balancer.go
@@ -53,7 +53,6 @@ type CreateLoadBalancerRequest struct {
 	Name             string                               `json:"name,omitempty"`
 	Plan             string                               `json:"plan,omitempty"`
 	Zone             string                               `json:"zone,omitempty"`
-	NetworkUUID      string                               `json:"network_uuid,omitempty"`
 	Networks         []LoadBalancerNetwork                `json:"networks,omitempty"`
 	ConfiguredStatus upcloud.LoadBalancerConfiguredStatus `json:"configured_status,omitempty"`
 	Frontends        []LoadBalancerFrontend               `json:"frontends"`
diff --git a/upcloud/request/load_balancer_test.go b/upcloud/request/load_balancer_test.go
index c388313e..0f382580 100644
--- a/upcloud/request/load_balancer_test.go
+++ b/upcloud/request/load_balancer_test.go
@@ -54,7 +54,6 @@ func TestCreateLoadBalancerRequest(t *testing.T) {
 		"name": "example-service",
 		"plan": "development",
 		"zone": "fi-hel1",
-		"network_uuid": "03631160-d57a-4926-ad48-a2f828229dcb",
 		"configured_status": "started",
 		"frontends": [
 			{
@@ -1392,7 +1391,6 @@ func TestCreateLoadBalancerLabelsRequest(t *testing.T) {
 		"name": "example-service",
 		"plan": "development",
 		"zone": "fi-hel1",
-		"network_uuid": "03631160-d57a-4926-ad48-a2f828229dcb",
 		"configured_status": "started",
 		"frontends": [],
 		"backends": [],