fix(managedobjectstorage): public network validation

UpCloudLtd · Oct 24, 2023 · 23f5cf7 · 23f5cf7
1 parent d0d5b2d
commit 23f5cf7
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+### Fixed
+- managed_object_storage: `managed_object_storage` resource public network validation
 
 ## [3.0.1] - 2023-10-23
 

diff --git a/internal/service/managedobjectstorage/managed_object_storage.go b/internal/service/managedobjectstorage/managed_object_storage.go
@@ -302,14 +302,21 @@ func networksFromResourceData(d *schema.ResourceData) ([]upcloud.ManagedObjectSt
 				Name:   n["name"].(string),
 				Type:   n["type"].(string),
 				Family: n["family"].(string),
-				UUID:   upcloud.StringPtr(n["uuid"].(string)),
 			}
-			if r.Type == "private" && *r.UUID == "" {
-				return req, fmt.Errorf("private network (#%d) UUID is required", i)
-			}
-			if r.Type == "public" && *r.UUID != "" {
-				return req, fmt.Errorf("setting UUID for a public network (#%d) is not supported", i)
+			uuid := n["uuid"].(string)
+
+			switch r.Type {
+			case "public":
+				if uuid != "" {
+					return req, fmt.Errorf("setting UUID for a public network (#%d) is not supported", i)
+				}
+			case "private":
+				if uuid == "" {
+					return req, fmt.Errorf("private network (#%d) UUID is required", i)
+				}
+				r.UUID = upcloud.StringPtr(uuid)
 			}
+
 			req = append(req, r)
 		}
 	}

diff --git a/upcloud/resource_upcloud_managed_object_storage_test.go b/upcloud/resource_upcloud_managed_object_storage_test.go
@@ -25,10 +25,10 @@ func TestAccUpcloudManagedObjectStorage(t *testing.T) {
 				Config: testDataS1,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(name, "region", "europe-1"),
-					resource.TestCheckResourceAttr(name, "configured_status", "stopped"),
+					resource.TestCheckResourceAttr(name, "configured_status", "started"),
 					resource.TestCheckResourceAttr(name, "labels.%", "2"),
 					resource.TestCheckResourceAttr(name, "labels.test", "objsto2-tf"),
-					resource.TestCheckResourceAttr(name, "network.#", "1"),
+					resource.TestCheckResourceAttr(name, "network.#", "2"),
 				),
 			},
 			{
@@ -37,6 +37,7 @@ func TestAccUpcloudManagedObjectStorage(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(name, "configured_status", "started"),
 					resource.TestCheckResourceAttr(name, "labels.owned-by", "team-devex"),
+					resource.TestCheckResourceAttr(name, "network.#", "1"),
 				),
 			},
 		},

diff --git a/upcloud/testdata/upcloud_managed_object_storage/managed_object_storage_s1.tf b/upcloud/testdata/upcloud_managed_object_storage/managed_object_storage_s1.tf
@@ -33,7 +33,7 @@ resource "upcloud_network" "this" {
 resource "upcloud_managed_object_storage" "this" {
   region = var.region
 
-  configured_status = "stopped"
+  configured_status = "started"
 
   network {
     family = "IPv4"
@@ -42,6 +42,12 @@ resource "upcloud_managed_object_storage" "this" {
     uuid   = upcloud_network.this.id
   }
 
+  network {
+    family = "IPv4"
+    name   = "${var.prefix}net2"
+    type   = "public"
+  }
+
   labels = {
     test     = "objsto2-tf"
     owned-by = "team-services"