feat: cleanup after location migration (#37)

nitrado · Nov 21, 2024 · b134e92 · b134e92
1 parent ace8aef
commit b134e92
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 42 deletions.
diff --git a/docs/data-sources/core_location.md b/docs/data-sources/core_location.md
@@ -46,6 +46,4 @@ Read-Only:
 
 Optional:
 
-- `region` (String) Region is the location region.
 - `sites` (List of String) Sites are the site names that makes up the location.
-- `type` (String) Type is the type of the datacenter, e.g. cloud or bare metal.
diff --git a/docs/data-sources/core_location_v1.md b/docs/data-sources/core_location_v1.md
@@ -46,6 +46,4 @@ Read-Only:
 
 Optional:
 
-- `region` (String) Region is the location region.
 - `sites` (List of String) Sites are the site names that makes up the location.
-- `type` (String) Type is the type of the datacenter, e.g. cloud or bare metal.
diff --git a/docs/data-sources/core_region.md b/docs/data-sources/core_region.md
@@ -59,7 +59,6 @@ Optional:
 Required:
 
 - `name` (String) Name is the name of the region type.
-- `sites` (List of String) Sites defines the sites for a type.
 
 Optional:
 

diff --git a/docs/data-sources/core_region_v1.md b/docs/data-sources/core_region_v1.md
@@ -59,7 +59,6 @@ Optional:
 Required:
 
 - `name` (String) Name is the name of the region type.
-- `sites` (List of String) Sites defines the sites for a type.
 
 Optional:
 

diff --git a/docs/resources/core_region.md b/docs/resources/core_region.md
@@ -79,7 +79,6 @@ Optional:
 Required:
 
 - `name` (String) Name is the name of the region type.
-- `sites` (List of String) Sites defines the sites for a type.
 
 Optional:
 

diff --git a/docs/resources/core_region_v1.md b/docs/resources/core_region_v1.md
@@ -79,7 +79,6 @@ Optional:
 Required:
 
 - `name` (String) Name is the name of the region type.
-- `sites` (List of String) Sites defines the sites for a type.
 
 Optional:
 

diff --git a/ec/core/data_source_core_region_test.go b/ec/core/data_source_core_region_test.go
@@ -26,9 +26,9 @@ func TestDataSourceRegions(t *testing.T) {
 					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.description", "My Region"),
 					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.#", "1"),
 					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.name", "my-type"),
-					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.sites.#", "2"),
-					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.sites.0", "test-site-1"),
-					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.sites.1", "test-site-2"),
+					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.locations.#", "2"),
+					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.locations.0", "test-loc-1"),
+					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.locations.1", "test-loc-2"),
 				),
 			},
 			{
@@ -41,9 +41,9 @@ func TestDataSourceRegions(t *testing.T) {
 					resource.TestCheckResourceAttr("data.ec_core_region.test", "spec.0.description", "My Region"),
 					resource.TestCheckResourceAttr("data.ec_core_region.test", "spec.0.types.#", "1"),
 					resource.TestCheckResourceAttr("data.ec_core_region.test", "spec.0.types.0.name", "my-type"),
-					resource.TestCheckResourceAttr("data.ec_core_region.test", "spec.0.types.0.sites.#", "2"),
-					resource.TestCheckResourceAttr("data.ec_core_region.test", "spec.0.types.0.sites.0", "test-site-1"),
-					resource.TestCheckResourceAttr("data.ec_core_region.test", "spec.0.types.0.sites.1", "test-site-2"),
+					resource.TestCheckResourceAttr("data.ec_core_region.test", "spec.0.types.0.locations.#", "2"),
+					resource.TestCheckResourceAttr("data.ec_core_region.test", "spec.0.types.0.locations.0", "test-loc-1"),
+					resource.TestCheckResourceAttr("data.ec_core_region.test", "spec.0.types.0.locations.1", "test-loc-2"),
 				),
 			},
 		},
@@ -60,7 +60,7 @@ func testDataSourceRegionsConfigBasic(name, env string) string {
     description = "My Region"
     types {
       name = "my-type"
-      sites = ["test-site-1", "test-site-2"]
+      locations = ["test-loc-1", "test-loc-2"]
     }
   }
 }

diff --git a/ec/core/resource_core_region_test.go b/ec/core/resource_core_region_test.go
@@ -32,9 +32,9 @@ func TestResourceRegions(t *testing.T) {
 					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.description", "My Region"),
 					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.#", "1"),
 					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.name", "my-type"),
-					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.sites.#", "2"),
-					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.sites.0", "test-site-1"),
-					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.sites.1", "test-site-2"),
+					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.locations.#", "2"),
+					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.locations.0", "test-loc-1"),
+					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.locations.1", "test-loc-2"),
 				),
 			},
 			{
@@ -46,9 +46,9 @@ func TestResourceRegions(t *testing.T) {
 					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.description", "My Region"),
 					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.#", "1"),
 					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.name", "my-type"),
-					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.sites.#", "2"),
-					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.sites.0", "test-site-1"),
-					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.sites.1", "test-site-2"),
+					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.locations.#", "2"),
+					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.locations.0", "test-loc-1"),
+					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.locations.1", "test-loc-2"),
 					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.template.0.env.#", "2"),
 					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.template.0.env.0.name", "foo"),
 					resource.TestCheckResourceAttr("ec_core_region.test", "spec.0.types.0.template.0.env.0.value", "bar"),
@@ -75,7 +75,7 @@ func testResourceRegionsConfigBasic(env, name string) string {
     description = "My Region"
     types {
       name = "my-type"
-      sites = ["test-site-1", "test-site-2"]
+      locations = ["test-loc-1", "test-loc-2"]
     }
   }
 }`, name, env)
@@ -91,7 +91,7 @@ func testResourceRegionsConfigBasicWithEnv(env, name string) string {
     description = "My Region"
     types {
       name = "my-type"
-      sites = ["test-site-1", "test-site-2"]
+      locations = ["test-loc-1", "test-loc-2"]
       template {
          env {
            name = "foo"

diff --git a/ec/core/schema_location.go b/ec/core/schema_location.go
diff --git a/ec/core/schema_region.go b/ec/core/schema_region.go
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/nitrado/tfconv v1.2.1
 	github.com/stretchr/testify v1.9.0
 	gitlab.com/nitrado/b2b/ec/apicore v1.3.0
-	gitlab.com/nitrado/b2b/ec/core v0.15.0
+	gitlab.com/nitrado/b2b/ec/core v0.16.1
 	golang.org/x/oauth2 v0.23.0
 	k8s.io/apimachinery v0.30.3
 )

diff --git a/go.sum b/go.sum
@@ -290,8 +290,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
 gitlab.com/nitrado/b2b/ec/apicore v1.3.0 h1:WPBMnOnp9bSv/Vi/nRW9g5jehvPMhV4mD4LhBJqX++Q=
 gitlab.com/nitrado/b2b/ec/apicore v1.3.0/go.mod h1:Jm1WG3CcNmYbZAoIrof/W4I1THJtmtilRIFD/tc3MNs=
-gitlab.com/nitrado/b2b/ec/core v0.15.0 h1:TqL0tW9onanpjNJ2ChjGmwBjN1clMyo3VxMI/YVc8jE=
-gitlab.com/nitrado/b2b/ec/core v0.15.0/go.mod h1:AqkIlKp++Ha5zemqHNryUM1Ck81pX2WLUEQ4O2kmTg0=
+gitlab.com/nitrado/b2b/ec/core v0.16.1 h1:T1QOJHK3/r4v9gboO4uIlafQeDImrIID/0SqNI4OXhA=
+gitlab.com/nitrado/b2b/ec/core v0.16.1/go.mod h1:AqkIlKp++Ha5zemqHNryUM1Ck81pX2WLUEQ4O2kmTg0=
 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/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts=