chore: Compare sqlinstance-locationpreference mockgcp

GoogleCloudPlatform · Sep 9, 2024 · e8594ae · e8594ae
1 parent 6c804b7
commit e8594ae
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 39 deletions.
diff --git a/mockgcp/mocksql/sqlinstance.go b/mockgcp/mocksql/sqlinstance.go
@@ -95,13 +95,9 @@ func (s *sqlInstancesService) Insert(ctx context.Context, req *pb.SqlInstancesIn
 	fqn := name.String()
 	now := time.Now()
 
-	region := "us-central1"
-	zone := "us-central1-a"
-
 	obj := proto.Clone(req.GetBody()).(*pb.DatabaseInstance)
 	obj.Name = name.InstanceName
 	obj.Project = name.Project.ID
-	obj.Region = region
 
 	obj.SelfLink = fmt.Sprintf("https://sqladmin.googleapis.com/sql/v1beta4/projects/%s/instances/%s",
 		name.Project.ID, name.InstanceName)
@@ -112,8 +108,6 @@ func (s *sqlInstancesService) Insert(ctx context.Context, req *pb.SqlInstancesIn
 		return nil, err
 	}
 
-	obj.GceZone = zone
-
 	// By default, allocate a public IP for the instance.
 	shouldAllocatePublicIP := true
 	// By default, do not allocate a private IP for the instance.
@@ -172,7 +166,9 @@ func (s *sqlInstancesService) Insert(ctx context.Context, req *pb.SqlInstancesIn
 
 	obj.ServiceAccountEmailAddress = fmt.Sprintf("p%[email protected]", name.Project.Number)
 
-	populateDefaults(obj, zone)
+	populateDefaults(obj)
+
+	obj.GceZone = obj.Settings.LocationPreference.Zone
 
 	obj.Settings.SettingsVersion = wrapperspb.Int64(1)
 
@@ -510,7 +506,7 @@ func setDatabaseVersionDefaults(obj *pb.DatabaseInstance) error {
 	return nil
 }
 
-func populateDefaults(obj *pb.DatabaseInstance, zone string) {
+func populateDefaults(obj *pb.DatabaseInstance) {
 	if obj.InstanceType == pb.SqlInstanceType_SQL_INSTANCE_TYPE_UNSPECIFIED {
 		obj.InstanceType = pb.SqlInstanceType_CLOUD_SQL_INSTANCE
 	}
@@ -571,13 +567,12 @@ func populateDefaults(obj *pb.DatabaseInstance, zone string) {
 		ipConfiguration.SslMode = pb.IpConfiguration_ALLOW_UNENCRYPTED_AND_ENCRYPTED
 	}
 
-	locationPreference := settings.LocationPreference
-	if locationPreference == nil {
-		locationPreference = &pb.LocationPreference{}
-		settings.LocationPreference = locationPreference
+	if settings.LocationPreference == nil {
+		settings.LocationPreference = &pb.LocationPreference{
+			Kind: "sql#locationPreference",
+			Zone: obj.Region + "-a",
+		}
 	}
-	locationPreference.Kind = "sql#locationPreference"
-	locationPreference.Zone = zone
 
 	backupConfiguration := settings.BackupConfiguration
 	if backupConfiguration == nil {
@@ -735,7 +730,7 @@ func (s *sqlInstancesService) Update(ctx context.Context, req *pb.SqlInstancesUp
 	obj.State = existing.State
 	obj.UpgradableDatabaseVersions = existing.UpgradableDatabaseVersions
 
-	populateDefaults(obj, existing.GetSettings().GetLocationPreference().GetZone())
+	populateDefaults(obj)
 
 	obj.Settings.SettingsVersion = wrapperspb.Int64(existing.GetSettings().GetSettingsVersion().GetValue() + 1)
 

diff --git a/...cefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-authorizednetworks/_http.log b/...cefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-authorizednetworks/_http.log
@@ -52,6 +52,7 @@ User-Agent: kcc/controller-manager
       ]
     },
     "locationPreference": {
+      "kind": "sql#locationPreference",
       "zone": "us-central1-a"
     },
     "pricingPlan": "PER_USE",
@@ -407,6 +408,7 @@ User-Agent: kcc/controller-manager
       ]
     },
     "locationPreference": {
+      "kind": "sql#locationPreference",
       "zone": "us-central1-a"
     },
     "pricingPlan": "PER_USE",

diff --git a/...esourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-clone-minimal/_http.log b/...esourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-clone-minimal/_http.log
@@ -46,6 +46,7 @@ User-Agent: kcc/controller-manager
     "dataDiskType": "PD_SSD",
     "edition": "ENTERPRISE",
     "locationPreference": {
+      "kind": "sql#locationPreference",
       "zone": "us-central1-a"
     },
     "pricingPlan": "PER_USE",

diff --git a/...esourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-encryptionkey/_http.log b/...esourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-encryptionkey/_http.log
@@ -1006,6 +1006,7 @@ User-Agent: kcc/controller-manager
       "requireSsl": true
     },
     "locationPreference": {
+      "kind": "sql#locationPreference",
       "zone": "us-central1-b"
     },
     "maintenanceWindow": {
@@ -1182,7 +1183,7 @@ X-Xss-Protection: 0
     "kind": "sql#settings",
     "locationPreference": {
       "kind": "sql#locationPreference",
-      "zone": "us-central1-a"
+      "zone": "us-central1-b"
     },
     "maintenanceWindow": {
       "day": 6,
@@ -1346,7 +1347,7 @@ X-Xss-Protection: 0
     "kind": "sql#settings",
     "locationPreference": {
       "kind": "sql#locationPreference",
-      "zone": "us-central1-a"
+      "zone": "us-central1-b"
     },
     "maintenanceWindow": {
       "day": 6,
@@ -1429,6 +1430,7 @@ User-Agent: kcc/controller-manager
       "requireSsl": true
     },
     "locationPreference": {
+      "kind": "sql#locationPreference",
       "zone": "us-central1-b"
     },
     "maintenanceWindow": {
@@ -1607,7 +1609,7 @@ X-Xss-Protection: 0
     "kind": "sql#settings",
     "locationPreference": {
       "kind": "sql#locationPreference",
-      "zone": "us-central1-a"
+      "zone": "us-central1-b"
     },
     "maintenanceWindow": {
       "day": 6,

diff --git a/...cefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-locationpreference/_http.log b/...cefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-locationpreference/_http.log
@@ -103,7 +103,6 @@ X-Xss-Protection: 0
   "name": "${operationID}",
   "operationType": "CREATE",
   "selfLink": "https://sqladmin.googleapis.com/sql/v1beta4/projects/${projectId}/operations/${operationID}",
-  "startTime": "2024-04-01T12:34:56.123456Z",
   "status": "DONE",
   "targetId": "sqlinstance-locationpreference-${uniqueId}",
   "targetLink": "https://sqladmin.googleapis.com/sql/v1beta4/projects/${projectId}/instances/sqlinstance-locationpreference-${uniqueId}",
@@ -154,11 +153,10 @@ X-Xss-Protection: 0
     }
   ],
   "kind": "sql#instance",
-  "maintenanceVersion": "POSTGRES_16_3.R20240527.01_12",
+  "maintenanceVersion": "POSTGRES_16_3.R20240527.01_10",
   "name": "sqlinstance-locationpreference-${uniqueId}",
   "project": "${projectId}",
   "region": "us-central1",
-  "satisfiesPzi": true,
   "selfLink": "https://sqladmin.googleapis.com/sql/v1beta4/projects/${projectId}/instances/sqlinstance-locationpreference-${uniqueId}",
   "serverCaCert": {
     "cert": "-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n",
@@ -200,6 +198,7 @@ X-Xss-Protection: 0
     "kind": "sql#settings",
     "locationPreference": {
       "kind": "sql#locationPreference",
+      "secondaryZone": "us-central1-b",
       "zone": "us-central1-a"
     },
     "pricingPlan": "PER_USE",
@@ -290,11 +289,10 @@ X-Xss-Protection: 0
     }
   ],
   "kind": "sql#instance",
-  "maintenanceVersion": "POSTGRES_16_3.R20240527.01_12",
+  "maintenanceVersion": "POSTGRES_16_3.R20240527.01_10",
   "name": "sqlinstance-locationpreference-${uniqueId}",
   "project": "${projectId}",
   "region": "us-central1",
-  "satisfiesPzi": true,
   "selfLink": "https://sqladmin.googleapis.com/sql/v1beta4/projects/${projectId}/instances/sqlinstance-locationpreference-${uniqueId}",
   "serverCaCert": {
     "cert": "-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n",
@@ -336,6 +334,7 @@ X-Xss-Protection: 0
     "kind": "sql#settings",
     "locationPreference": {
       "kind": "sql#locationPreference",
+      "secondaryZone": "us-central1-b",
       "zone": "us-central1-a"
     },
     "pricingPlan": "PER_USE",
@@ -362,7 +361,7 @@ User-Agent: kcc/controller-manager
 {
   "databaseVersion": "POSTGRES_16",
   "instanceType": "CLOUD_SQL_INSTANCE",
-  "maintenanceVersion": "POSTGRES_16_3.R20240527.01_12",
+  "maintenanceVersion": "POSTGRES_16_3.R20240527.01_10",
   "name": "sqlinstance-locationpreference-${uniqueId}",
   "region": "us-central1",
   "settings": {
@@ -449,7 +448,6 @@ X-Xss-Protection: 0
   "name": "${operationID}",
   "operationType": "UPDATE",
   "selfLink": "https://sqladmin.googleapis.com/sql/v1beta4/projects/${projectId}/operations/${operationID}",
-  "startTime": "2024-04-01T12:34:56.123456Z",
   "status": "DONE",
   "targetId": "sqlinstance-locationpreference-${uniqueId}",
   "targetLink": "https://sqladmin.googleapis.com/sql/v1beta4/projects/${projectId}/instances/sqlinstance-locationpreference-${uniqueId}",
@@ -500,11 +498,10 @@ X-Xss-Protection: 0
     }
   ],
   "kind": "sql#instance",
-  "maintenanceVersion": "POSTGRES_16_3.R20240527.01_12",
+  "maintenanceVersion": "POSTGRES_16_3.R20240527.01_10",
   "name": "sqlinstance-locationpreference-${uniqueId}",
   "project": "${projectId}",
   "region": "us-central1",
-  "satisfiesPzi": true,
   "selfLink": "https://sqladmin.googleapis.com/sql/v1beta4/projects/${projectId}/instances/sqlinstance-locationpreference-${uniqueId}",
   "serverCaCert": {
     "cert": "-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n",
@@ -548,6 +545,7 @@ X-Xss-Protection: 0
     "kind": "sql#settings",
     "locationPreference": {
       "kind": "sql#locationPreference",
+      "secondaryZone": "us-central1-f",
       "zone": "us-central1-c"
     },
     "pricingPlan": "PER_USE",

diff --git a/...esourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-mysql-minimal/_http.log b/...esourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-mysql-minimal/_http.log
@@ -42,6 +42,7 @@ User-Agent: kcc/controller-manager
     "dataDiskType": "PD_SSD",
     "edition": "ENTERPRISE",
     "locationPreference": {
+      "kind": "sql#locationPreference",
       "zone": "us-central1-a"
     },
     "pricingPlan": "PER_USE",
@@ -797,6 +798,7 @@ User-Agent: kcc/controller-manager
     "dataDiskType": "PD_SSD",
     "edition": "ENTERPRISE",
     "locationPreference": {
+      "kind": "sql#locationPreference",
       "zone": "us-central1-a"
     },
     "pricingPlan": "PER_USE",

diff --git a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-mysql/_http.log b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-mysql/_http.log
@@ -573,10 +573,6 @@ User-Agent: kcc/controller-manager
     "dataDiskSizeGb": "20",
     "dataDiskType": "PD_SSD",
     "edition": "ENTERPRISE",
-    "locationPreference": {
-      "kind": "sql#locationPreference",
-      "zone": "us-central1-a"
-    },
     "pricingPlan": "PER_USE",
     "replicationType": "SYNCHRONOUS",
     "settingsVersion": "123",

diff --git a/...urcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-postgres-minimal/_http.log b/...urcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-postgres-minimal/_http.log
@@ -42,6 +42,7 @@ User-Agent: kcc/controller-manager
     "dataDiskType": "PD_SSD",
     "edition": "ENTERPRISE",
     "locationPreference": {
+      "kind": "sql#locationPreference",
       "zone": "us-central1-a"
     },
     "pricingPlan": "PER_USE",
@@ -564,6 +565,7 @@ User-Agent: kcc/controller-manager
     "dataDiskType": "PD_SSD",
     "edition": "ENTERPRISE",
     "locationPreference": {
+      "kind": "sql#locationPreference",
       "zone": "us-central1-a"
     },
     "pricingPlan": "PER_USE",

diff --git a/...est/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-postgres/_http.log b/...est/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-postgres/_http.log
@@ -954,10 +954,6 @@ User-Agent: kcc/controller-manager
       "requireSsl": false,
       "sslMode": "ENCRYPTED_ONLY"
     },
-    "locationPreference": {
-      "kind": "sql#locationPreference",
-      "zone": "us-central1-a"
-    },
     "pricingPlan": "PER_USE",
     "replicationType": "SYNCHRONOUS",
     "settingsVersion": "123",

diff --git a/...sourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-privatenetwork/_http.log b/...sourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-privatenetwork/_http.log
@@ -1312,6 +1312,7 @@ User-Agent: kcc/controller-manager
       "privateNetwork": "projects/${projectId}/global/networks/computenetwork-${uniqueId}"
     },
     "locationPreference": {
+      "kind": "sql#locationPreference",
       "zone": "us-central1-a"
     },
     "pricingPlan": "PER_USE",
@@ -1655,6 +1656,7 @@ User-Agent: kcc/controller-manager
       "privateNetwork": "projects/${projectId}/global/networks/computenetwork2-${uniqueId}"
     },
     "locationPreference": {
+      "kind": "sql#locationPreference",
       "zone": "us-central1-a"
     },
     "pricingPlan": "PER_USE",

diff --git a/...rcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-sqlserver-minimal/_http.log b/...rcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-sqlserver-minimal/_http.log
@@ -43,6 +43,7 @@ User-Agent: kcc/controller-manager
     "dataDiskType": "PD_SSD",
     "edition": "ENTERPRISE",
     "locationPreference": {
+      "kind": "sql#locationPreference",
       "zone": "us-central1-a"
     },
     "pricingPlan": "PER_USE",
@@ -637,6 +638,7 @@ User-Agent: kcc/controller-manager
     "dataDiskType": "PD_SSD",
     "edition": "ENTERPRISE",
     "locationPreference": {
+      "kind": "sql#locationPreference",
       "zone": "us-central1-a"
     },
     "pricingPlan": "PER_USE",

diff --git a/...st/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-sqlserver/_http.log b/...st/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-sqlserver/_http.log
@@ -539,10 +539,6 @@ User-Agent: kcc/controller-manager
     "dataDiskSizeGb": "20",
     "dataDiskType": "PD_SSD",
     "edition": "ENTERPRISE",
-    "locationPreference": {
-      "kind": "sql#locationPreference",
-      "zone": "us-central1-a"
-    },
     "pricingPlan": "PER_USE",
     "replicationType": "SYNCHRONOUS",
     "settingsVersion": "123",