Addressed more PR comments

linode · Dec 27, 2024 · 525341b · 525341b
1 parent 9bca730
commit 525341b
Show file tree

Hide file tree

Showing 9 changed files with 1,125 additions and 1,123 deletions.
diff --git a/databases.go b/databases.go
@@ -74,17 +74,17 @@ type Database struct {
 	Version     string           `json:"version"`
 	ClusterSize int              `json:"cluster_size"`
 	Platform    DatabasePlatform `json:"platform"`
-	Fork        *DatabaseFork    `json:"fork,omitempty"`
+	Fork        *DatabaseFork    `json:"fork"`
 
 	// Members has dynamic keys so it is a map
 	Members map[string]DatabaseMemberType `json:"members"`
 
 	// Deprecated: ReplicationType is a deprecated property, as it is no longer supported in DBaaS V2.
-	ReplicationType string `json:"replication_type,omitempty"`
+	ReplicationType string `json:"replication_type"`
 	// Deprecated: SSLConnection is a deprecated property, as it is no longer supported in DBaaS V2.
-	SSLConnection bool `json:"ssl_connection,omitempty"`
+	SSLConnection bool `json:"ssl_connection"`
 	// Deprecated: Encrypted is a deprecated property, as it is no longer supported in DBaaS V2.
-	Encrypted bool `json:"encrypted,omitempty"`
+	Encrypted bool `json:"encrypted"`
 
 	AllowList         []string   `json:"allow_list"`
 	InstanceURI       string     `json:"instance_uri"`

diff --git a/go.work.sum b/go.work.sum
@@ -45,6 +45,7 @@ golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7
 golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
 golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
 golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=

diff --git a/mysql.go b/mysql.go
@@ -34,11 +34,11 @@ type MySQLDatabase struct {
 	Members map[string]DatabaseMemberType `json:"members"`
 
 	// Deprecated: ReplicationType is a deprecated property, as it is no longer supported in DBaaS V2.
-	ReplicationType string `json:"replication_type,omitempty"`
+	ReplicationType string `json:"replication_type"`
 	// Deprecated: SSLConnection is a deprecated property, as it is no longer supported in DBaaS V2.
-	SSLConnection bool `json:"ssl_connection,omitempty"`
+	SSLConnection bool `json:"ssl_connection"`
 	// Deprecated: Encrypted is a deprecated property, as it is no longer supported in DBaaS V2.
-	Encrypted bool `json:"encrypted,omitempty"`
+	Encrypted bool `json:"encrypted"`
 
 	AllowList         []string                  `json:"allow_list"`
 	InstanceURI       string                    `json:"instance_uri"`

diff --git a/postgres.go b/postgres.go
@@ -52,13 +52,13 @@ type PostgresDatabase struct {
 	Members map[string]DatabaseMemberType `json:"members"`
 
 	// Deprecated: ReplicationCommitType is a deprecated property, as it is no longer supported in DBaaS V2.
-	ReplicationCommitType PostgresCommitType `json:"replication_commit_type,omitempty"`
+	ReplicationCommitType PostgresCommitType `json:"replication_commit_type"`
 	// Deprecated: ReplicationType is a deprecated property, as it is no longer supported in DBaaS V2.
-	ReplicationType PostgresReplicationType `json:"replication_type,omitempty"`
+	ReplicationType PostgresReplicationType `json:"replication_type"`
 	// Deprecated: SSLConnection is a deprecated property, as it is no longer supported in DBaaS V2.
-	SSLConnection bool `json:"ssl_connection,omitempty"`
+	SSLConnection bool `json:"ssl_connection"`
 	// Deprecated: Encrypted is a deprecated property, as it is no longer supported in DBaaS V2.
-	Encrypted bool `json:"encrypted,omitempty"`
+	Encrypted bool `json:"encrypted"`
 
 	Hosts             DatabaseHost              `json:"hosts"`
 	Updates           DatabaseMaintenanceWindow `json:"updates"`

diff --git a/test/integration/fixtures/TestDatabase_Engine.yaml b/test/integration/fixtures/TestDatabase_Engine.yaml
@@ -44,7 +44,7 @@ interactions:
       Content-Type:
       - application/json
       Expires:
-      - Thu, 26 Dec 2024 18:51:53 GMT
+      - Fri, 27 Dec 2024 18:13:13 GMT
       Pragma:
       - no-cache
       Strict-Transport-Security:
@@ -106,7 +106,7 @@ interactions:
       Content-Type:
       - application/json
       Expires:
-      - Thu, 26 Dec 2024 18:51:54 GMT
+      - Fri, 27 Dec 2024 18:13:13 GMT
       Pragma:
       - no-cache
       Strict-Transport-Security:

diff --git a/test/integration/fixtures/TestDatabase_List.yaml b/test/integration/fixtures/TestDatabase_List.yaml
diff --git a/test/integration/fixtures/TestDatabase_MySQL_Suite.yaml b/test/integration/fixtures/TestDatabase_MySQL_Suite.yaml
diff --git a/test/integration/fixtures/TestDatabase_Postgres_Suite.yaml b/test/integration/fixtures/TestDatabase_Postgres_Suite.yaml
diff --git a/test/integration/fixtures/TestDatabase_Type.yaml b/test/integration/fixtures/TestDatabase_Type.yaml
@@ -143,7 +143,7 @@ interactions:
       Content-Type:
       - application/json
       Expires:
-      - Thu, 26 Dec 2024 18:51:55 GMT
+      - Fri, 27 Dec 2024 18:13:14 GMT
       Pragma:
       - no-cache
       Strict-Transport-Security:
@@ -211,7 +211,7 @@ interactions:
       Content-Type:
       - application/json
       Expires:
-      - Thu, 26 Dec 2024 18:51:55 GMT
+      - Fri, 27 Dec 2024 18:13:15 GMT
       Pragma:
       - no-cache
       Strict-Transport-Security: