Merge pull request #32 from omc/dx/omit-empty-values-for-cluster

DX: omit empty fields like 'private_network' which have an empty valu…
omc · May 15, 2024 · 74e7476 · 74e7476
2 parents 69dd640 + ce4bab3
commit 74e7476
Show file tree

Hide file tree

Showing 28 changed files with 327 additions and 1,199 deletions.
diff --git a/bonsai/bonsai_impl_test.go b/bonsai/bonsai_impl_test.go
@@ -0,0 +1,5 @@
+package bonsai
+
+func Pointer[T any](d T) *T {
+	return &d
+}
diff --git a/bonsai/cluster_test.go b/bonsai/cluster_test.go
@@ -493,7 +493,7 @@ func (s *ClientVCRTestSuite) TestClusterClient_Create() {
 func (s *ClientVCRTestSuite) TestClusterClient_Update() {
 	ctx := context.Background()
 
-	plan, err := s.client.Cluster.Update(ctx, "bonsai-api-go-2471463249", bonsai.ClusterUpdateOpts{
+	plan, err := s.client.Cluster.Update(ctx, "bonsai-api-go-5431547241", bonsai.ClusterUpdateOpts{
 		Name: "bonsai-api-go-test-cluster-updated",
 		Plan: "standard-nano-comped",
 	})
@@ -504,7 +504,7 @@ func (s *ClientVCRTestSuite) TestClusterClient_Update() {
 func (s *ClientVCRTestSuite) TestClusterClient_Delete() {
 	ctx := context.Background()
 
-	plan, err := s.client.Cluster.Destroy(ctx, "bonsai-api-go-9994392953")
+	plan, err := s.client.Cluster.Destroy(ctx, "bonsai-api-go-5431547241")
 	s.NoError(err, "successfully get cluster")
 	assertGolden(s, plan)
 }
diff --git a/bonsai/fixtures/golden/TestClientVCRTestSuite-TestClusterClient-All b/bonsai/fixtures/golden/TestClientVCRTestSuite-TestClusterClient-All
@@ -1,4 +1,34 @@
 [
+  {
+   "slug": "bonsai-api-go-3216591042",
+   "name": "bonsai-api-go-test-cluster-updated",
+   "uri": "https://api.bonsai.io/clusters/bonsai-api-go-3216591042",
+   "plan": {
+    "slug": "standard-nano-comped",
+    "available_releases": [],
+    "available_spaces": [],
+    "uri": "https://api.bonsai.io/plans/standard-nano-comped"
+   },
+   "release": {
+    "slug": "opensearch-2.6.0-mt",
+    "service_type": "opensearch",
+    "version": "2.6.0",
+    "uri": "https://api.bonsai.io/releases/opensearch-2.6.0-mt",
+    "package_name": "2.6.0-mt"
+   },
+   "space": {
+    "path": "omc/bonsai/us-east-1/common",
+    "region": "aws-us-east-1",
+    "uri": "https://api.bonsai.io/spaces/omc/bonsai/us-east-1/common"
+   },
+   "stats": {},
+   "access": {
+    "host": "bonsai-api-go-3216591042.us-east-1.bonsaisearch.net",
+    "port": 443,
+    "scheme": "https"
+   },
+   "state": "PROVISIONED"
+  },
   {
    "slug": "dcek-group-llc-5240651189",
    "name": "DCEK Group, LLC search",
@@ -18,11 +48,6 @@
    },
    "space": {
     "path": "omc/bonsai/us-east-1/common",
-    "private_network": false,
-    "cloud": {
-     "provider": "",
-     "region": ""
-    },
     "region": "aws-us-east-1",
     "uri": "https://api.bonsai.io/spaces/omc/bonsai/us-east-1/common"
    },

diff --git a/bonsai/fixtures/golden/TestClientVCRTestSuite-TestClusterClient-Create b/bonsai/fixtures/golden/TestClientVCRTestSuite-TestClusterClient-Create
@@ -1,12 +1,12 @@
 {
   "message": "Your cluster is being provisioned.",
-  "monitor": "https://api.bonsai.io/clusters/bonsai-api-go-2471463249",
+  "monitor": "https://api.bonsai.io/clusters/bonsai-api-go-5431547241",
   "access": {
-   "host": "bonsai-api-go-2471463249",
+   "host": "bonsai-api-go-5431547241",
    "port": 443,
    "scheme": "https",
    "user": "REDACTED",
    "pass": "REDACTED",
-   "url": "://REDACTED:REDACTED"
+   "url": "://REDACTED:REDACTED@"
   }
  }
diff --git a/bonsai/fixtures/golden/TestClientVCRTestSuite-TestClusterClient-Delete b/bonsai/fixtures/golden/TestClientVCRTestSuite-TestClusterClient-Delete
@@ -1,4 +1,4 @@
 {
   "message": "Your cluster is being deprovisioned.",
-  "monitor": "https://api.bonsai.io/clusters/bonsai-api-go-9994392953"
+  "monitor": "https://api.bonsai.io/clusters/bonsai-api-go-5431547241"
  }
diff --git a/bonsai/fixtures/golden/TestClientVCRTestSuite-TestClusterClient-GetBySlug b/bonsai/fixtures/golden/TestClientVCRTestSuite-TestClusterClient-GetBySlug
@@ -17,11 +17,6 @@
   },
   "space": {
    "path": "omc/bonsai/us-east-1/common",
-   "private_network": false,
-   "cloud": {
-    "provider": "",
-    "region": ""
-   },
    "region": "aws-us-east-1",
    "uri": "https://api.bonsai.io/spaces/omc/bonsai/us-east-1/common"
   },

diff --git a/bonsai/fixtures/golden/TestClientVCRTestSuite-TestClusterClient-Update b/bonsai/fixtures/golden/TestClientVCRTestSuite-TestClusterClient-Update
@@ -1,4 +1,4 @@
 {
   "message": "Your cluster is being updated.",
-  "monitor": "https://api.bonsai.io/clusters/bonsai-api-go-2471463249"
+  "monitor": "https://api.bonsai.io/clusters/bonsai-api-go-5431547241"
  }