Handle updates correctly

perfectsense · Sep 25, 2024 · f2b3218 · f2b3218
1 parent 4f15508
commit f2b3218
Show file tree

Hide file tree

Showing 8 changed files with 263 additions and 193 deletions.
diff --git a/src/main/java/gyro/google/cloudsql/DatabaseInstanceResource.java b/src/main/java/gyro/google/cloudsql/DatabaseInstanceResource.java
diff --git a/src/main/java/gyro/google/cloudsql/DbBackupConfiguration.java b/src/main/java/gyro/google/cloudsql/DbBackupConfiguration.java
@@ -20,7 +20,6 @@
 import gyro.core.resource.Diffable;
 import gyro.core.resource.Output;
 import gyro.core.resource.Updatable;
-import gyro.core.validation.Range;
 import gyro.core.validation.Regex;
 import gyro.core.validation.Required;
 import gyro.google.Copyable;
@@ -116,7 +115,6 @@ public void setStartTime(String startTime) {
      * The number of days of transaction logs we retain for point in time restore, from 1-7.
      */
     @Updatable
-    @Range(min = 1, max = 7)
     public Integer getTransactionLogRetentionDays() {
         return transactionLogRetentionDays;
     }
@@ -149,7 +147,7 @@ public void copyFrom(BackupConfiguration model) throws Exception {
 
         setBackupRetentionSettings(null);
         if (model.getBackupRetentionSettings() != null) {
-            DbBackupRetentionSettings settings = new DbBackupRetentionSettings();
+            DbBackupRetentionSettings settings = newSubresource(DbBackupRetentionSettings.class);
             settings.copyFrom(model.getBackupRetentionSettings());
             setBackupRetentionSettings(settings);
         }

diff --git a/src/main/java/gyro/google/cloudsql/DbDiskEncryptionConfiguration.java b/src/main/java/gyro/google/cloudsql/DbDiskEncryptionConfiguration.java
@@ -45,7 +45,10 @@ public String primaryKey() {
 
     @Override
     public void copyFrom(DiskEncryptionConfiguration model) throws Exception {
-        setKey(findById(CryptoKeyResource.class, model.getKmsKeyName()));
+        setKey(null);
+        if (model.getKmsKeyName() != null) {
+            setKey(findById(CryptoKeyResource.class, model.getKmsKeyName()));
+        }
     }
 
     public DiskEncryptionConfiguration toDiskEncryptionConfiguration() {

diff --git a/src/main/java/gyro/google/cloudsql/DbDiskEncryptionStatus.java b/src/main/java/gyro/google/cloudsql/DbDiskEncryptionStatus.java
@@ -45,7 +45,10 @@ public String primaryKey() {
 
     @Override
     public void copyFrom(DiskEncryptionStatus model) throws Exception {
-        setKeyVersion(findById(CryptoKeyVersionResource.class, model.getKmsKeyVersionName()));
+        setKeyVersion(null);
+        if (model.getKmsKeyVersionName() != null) {
+            setKeyVersion(findById(CryptoKeyVersionResource.class, model.getKmsKeyVersionName()));
+        }
     }
 
     public DiskEncryptionStatus toDiskEncryptionStatus() {

diff --git a/src/main/java/gyro/google/cloudsql/DbIpConfiguration.java b/src/main/java/gyro/google/cloudsql/DbIpConfiguration.java
@@ -146,20 +146,27 @@ public void copyFrom(IpConfiguration model) throws Exception {
         setIpv4Enabled(model.getIpv4Enabled());
         setServerCaMode(model.getServerCaMode());
         setSslMode(model.getSslMode());
-        setPrivateNetwork(findById(NetworkResource.class, model.getPrivateNetwork()));
+
+        setPrivateNetwork(null);
+        String network = model.getPrivateNetwork();
+        String selfLinkPrefix = "https://www.googleapis.com/compute/v1/";
+        if (network != null) {
+            network = network.startsWith(selfLinkPrefix) ? network : selfLinkPrefix + network;
+            setPrivateNetwork(findById(NetworkResource.class, network));
+        }
 
         getAuthorizedNetworks().clear();
         if (model.getAuthorizedNetworks() != null) {
             getAuthorizedNetworks().addAll(model.getAuthorizedNetworks().stream().map(n -> {
-                DbAclEntry entry = new DbAclEntry();
+                DbAclEntry entry = newSubresource(DbAclEntry.class);
                 entry.copyFrom(n);
                 return entry;
             }).collect(Collectors.toList()));
         }
 
         setPscConfig(null);
         if (model.getPscConfig() != null) {
-            DbPscConfig config = new DbPscConfig();
+            DbPscConfig config = newSubresource(DbPscConfig.class);
             config.copyFrom(model.getPscConfig());
             setPscConfig(config);
         }

diff --git a/src/main/java/gyro/google/cloudsql/DbReplicaConfiguration.java b/src/main/java/gyro/google/cloudsql/DbReplicaConfiguration.java
@@ -72,7 +72,7 @@ public void copyFrom(ReplicaConfiguration model) throws Exception {
 
         setMysqlReplicaConfiguration(null);
         if (model.getMysqlReplicaConfiguration() != null) {
-            DbMySqlReplicaConfiguration config = new DbMySqlReplicaConfiguration();
+            DbMySqlReplicaConfiguration config = newSubresource(DbMySqlReplicaConfiguration.class);
             config.copyFrom(model.getMysqlReplicaConfiguration());
             setMysqlReplicaConfiguration(config);
         }

diff --git a/src/main/java/gyro/google/cloudsql/DbSettings.java b/src/main/java/gyro/google/cloudsql/DbSettings.java
@@ -28,6 +28,7 @@
 import gyro.core.resource.Output;
 import gyro.core.resource.Updatable;
 import gyro.core.validation.Range;
+import gyro.core.validation.Required;
 import gyro.core.validation.ValidStrings;
 import gyro.google.Copyable;
 
@@ -410,23 +411,7 @@ public void setStorageAutoResizeLimit(Long storageAutoResizeLimit) {
      * The tier (or machine type) for this instance.
      */
     @Updatable
-    @ValidStrings({
-        "db-custom-1-3840",
-        "db-custom-2-7680",
-        "db-custom-4-15360",
-        "db-custom-8-30720",
-        "db-custom-16-61440",
-        "db-custom-32-122880",
-        "db-custom-64-245760",
-        "db-custom-96-368640",
-        "db-custom-2-13312",
-        "db-custom-4-26624",
-        "db-custom-8-53248",
-        "db-custom-16-106496",
-        "db-custom-32-212992",
-        "db-custom-64-425984",
-        "db-custom-96-638976"
-    })
+    @Required
     public String getTier() {
         return tier;
     }
@@ -643,6 +628,7 @@ public Settings toSettings() {
             for (DbDatabaseFlag flag : getDatabaseFlags()) {
                 flags.add(flag.toDatabaseFlags());
             }
+
             settings.setDatabaseFlags(flags);
         }
 
@@ -659,6 +645,7 @@ public Settings toSettings() {
             for (DbDenyMaintenancePeriod period : getDenyMaintenancePeriods()) {
                 periods.add(period.toDenyMaintenancePeriod());
             }
+
             settings.setDenyMaintenancePeriods(periods);
         }
 

diff --git a/src/main/java/gyro/google/cloudsql/DbSqlServerAuditConfig.java b/src/main/java/gyro/google/cloudsql/DbSqlServerAuditConfig.java
@@ -68,7 +68,10 @@ public void setUploadInterval(String uploadInterval) {
 
     @Override
     public void copyFrom(SqlServerAuditConfig model) throws Exception {
-        setBucket(findById(BucketResource.class, model.getBucket()));
+        setBucket(null);
+        if (model.getBucket() != null) {
+            setBucket(findById(BucketResource.class, model.getBucket()));
+        }
         setRetentionInterval(model.getRetentionInterval());
         setUploadInterval(model.getUploadInterval());
     }