work

Author: toptobes

…dk/pcu/PcuGroupDbAssociationsClient.java …cuGroupDatacenterAssociationsClient.javaastra-sdk-devops/src/main/java/com/dtsx/astra/sdk/pcu/PcuGroupDbAssociationsClient.java renamed to astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/pcu/PcuGroupDatacenterAssociationsClient.java astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/pcu/PcuGroupDbAssociationsClient.java renamed to astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/pcu/PcuGroupDatacenterAssociationsClient.java

@@ -17,25 +17,25 @@
 import java.util.stream.Stream;
 
 @Slf4j
-public class PcuGroupDbAssociationsClient extends AbstractApiClient {
+public class PcuGroupDatacenterAssociationsClient extends AbstractApiClient {
     private static final TypeReference<List<PcuGroupDbAssociation>> PCU_GROUP_DB_ASSOCIATIONS =
         new TypeReference<>() {};
 
     @Getter
     private final String pcuGroupId;
 
-    public PcuGroupDbAssociationsClient(String token, String pcuGroupId) {
+    public PcuGroupDatacenterAssociationsClient(String token, String pcuGroupId) {
         this(token, AstraEnvironment.PROD, pcuGroupId);
     }
 
-    public PcuGroupDbAssociationsClient(String token, AstraEnvironment env, String pcuGroupId) {
+    public PcuGroupDatacenterAssociationsClient(String token, AstraEnvironment env, String pcuGroupId) {
         super(token, env);
         this.pcuGroupId = pcuGroupId;
     }
 
     @Override
     public String getServiceName() {
-        return "pcu.group.associations.db";
+        return "pcu.group.associations.datacenter";
     }
 
     // ---------------------------------

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/pcu/PcuGroupOpsClient.java

@@ -3,9 +3,11 @@
 import com.dtsx.astra.sdk.AbstractApiClient;
 import com.dtsx.astra.sdk.pcu.domain.PcuGroup;
 import com.dtsx.astra.sdk.pcu.domain.PcuGroupStatusType;
+import com.dtsx.astra.sdk.pcu.domain.PcuGroupUpdateRequest;
 import com.dtsx.astra.sdk.pcu.exception.PcuGroupNotFoundException;
 import com.dtsx.astra.sdk.utils.ApiLocator;
 import com.dtsx.astra.sdk.utils.AstraEnvironment;
+import com.dtsx.astra.sdk.utils.JsonUtils;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
@@ -31,6 +33,10 @@ public String getServiceName() {
         return "pcu.group";
     }
 
+    // ---------------------------------
+    // ----       READ              ----
+    // ---------------------------------
+
     public Optional<PcuGroup> find() {
         try {
             return Optional.of(get());
@@ -55,6 +61,15 @@ public boolean isCreatedOrActive() {
         return PcuGroupStatusType.CREATED == get().getStatus() || isActive();
     }
 
+    // ---------------------------------
+    // ----       UPDATE            ----
+    // ---------------------------------
+
+    public void update(PcuGroupUpdateRequest req) {
+        val base = get();
+        PATCH(getEndpointPcus() + "/" + pcuGroupId, JsonUtils.marshall(req.withDefaultsAndValidations(base)), getOperationName("update"));
+    }
+
     // ---------------------------------
     // ----       MAINTENANCE       ----
     // ---------------------------------
@@ -80,8 +95,8 @@ public void delete() {
     // ----       Utilities         ----
     // ---------------------------------
 
-    public PcuGroupDbAssociationsClient dbAssociations() {
-        return new PcuGroupDbAssociationsClient(token, environment, pcuGroupId);
+    public PcuGroupDatacenterAssociationsClient datacenterAssociations() {
+        return new PcuGroupDatacenterAssociationsClient(token, environment, pcuGroupId);
     }
 
     public String getEndpointPcus() {

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/pcu/PcuGroupsClient.java

@@ -2,6 +2,7 @@
 
 import com.dtsx.astra.sdk.AbstractApiClient;
 import com.dtsx.astra.sdk.pcu.domain.PcuGroup;
+import com.dtsx.astra.sdk.pcu.domain.PcuGroupCreateUpdateRequest;
 import com.dtsx.astra.sdk.pcu.domain.PcuGroupCreationRequest;
 import com.dtsx.astra.sdk.pcu.exception.PcuGroupNotFoundException;
 import com.dtsx.astra.sdk.pcu.exception.PcuGroupsNotFoundException;
@@ -37,7 +38,7 @@ public String getServiceName() {
     // ---------------------------------
 
     public PcuGroup create(PcuGroupCreationRequest req) {
-        val res = POST(getEndpointPcus(), JsonUtils.marshall(req), getOperationName("create"));
+        val res = POST(getEndpointPcus(), JsonUtils.marshall(req.withDefaultsAndValidations()), getOperationName("create"));
 
         if (HttpURLConnection.HTTP_CREATED != res.getCode()) {
             throw new IllegalStateException("Expected code 201 to create db but got " + res.getCode() + "body=" + res.getBody());

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/pcu/domain/PcuGroupCreateUpdateRequest.java

@@ -0,0 +1,49 @@
+package com.dtsx.astra.sdk.pcu.domain;
+
+import com.dtsx.astra.sdk.db.domain.CloudProviderType;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+@Getter
+@Setter
+@ToString
+@SuperBuilder
+public sealed abstract class PcuGroupCreateUpdateRequest permits PcuGroupCreationRequest, PcuGroupUpdateRequest {
+    protected String title;
+    protected String description;
+
+    protected CloudProviderType cloudProvider;
+    protected String region;
+
+    protected Integer min; // Integers so they're nullable
+    protected Integer max;
+    protected Integer reserved;
+
+    protected void validate() {
+        if (title == null || title.isBlank()) {
+            throw new IllegalArgumentException("PCU group title is required");
+        }
+
+        if (cloudProvider == null) {
+            throw new IllegalArgumentException("PCU group cloud provider is required");
+        }
+
+        if (region == null || region.isBlank()) {
+            throw new IllegalArgumentException("PCU group region is required");
+        }
+
+        if (min == null || min < 1) {
+            throw new IllegalArgumentException("PCU group min must be >= 1");
+        }
+
+        if (max == null || max < min) {
+            throw new IllegalArgumentException("PCU group max must be >= min");
+        }
+
+        if (reserved != null && (reserved < 0 || reserved > min)) {
+            throw new IllegalArgumentException("PCU group reserved must be non-negative and <= min");
+        }
+    }
+}

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/pcu/domain/PcuGroupCreationBuilder.java

@@ -1,36 +1,26 @@
 package com.dtsx.astra.sdk.pcu.domain;
 
-import com.dtsx.astra.sdk.db.domain.CloudProviderType;
-import lombok.Value;
+import lombok.experimental.SuperBuilder;
 
-@Value
-public class PcuGroupCreationRequest {
-    String title;
-    String description;
+@SuperBuilder
+public final class PcuGroupCreationRequest extends PcuGroupCreateUpdateRequest {
+    private String instanceType;
+    private PcuProvisionType provisionType;
 
-    CloudProviderType cloudProvider;
-    String region;
+    public PcuGroupCreationRequest withDefaultsAndValidations() {
+        if (this.provisionType == null) {
+            this.provisionType = PcuProvisionType.SHARED;
+        }
 
-    String instanceType;
-    PcuProvisionType provisionType;
+        // TODO do we really want a default for this? (since pcu instance types are changing)
+        if (this.instanceType == null || this.instanceType.isBlank()) {
+            this.instanceType = "standard";
+        }
 
-    int min;
-    int max;
-    int reserved;
+        if (this.reserved == null) {
+            this.reserved = 0;
+        }
 
-    public PcuGroupCreationRequest(PcuGroupCreationBuilder builder) {
-        this.title = builder.title;
-        this.description = builder.description;
-        this.cloudProvider = builder.cloudProvider;
-        this.region = builder.cloudRegion;
-        this.instanceType = builder.instanceType;
-        this.provisionType = builder.provisionType;
-        this.min = builder.minCapacity;
-        this.max = builder.maxCapacity;
-        this.reserved = builder.reservedCapacity;
-    }
-
-    public static PcuGroupCreationBuilder builder() {
-        return new PcuGroupCreationBuilder();
+        return this;
     }
 }

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/pcu/domain/PcuGroupCreationRequest.java

@@ -0,0 +1,44 @@
+package com.dtsx.astra.sdk.pcu.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Setter;
+import lombok.With;
+import lombok.experimental.Accessors;
+import lombok.experimental.SuperBuilder;
+import lombok.val;
+
+@SuperBuilder
+public non-sealed class PcuGroupUpdateRequest extends PcuGroupCreateUpdateRequest {
+    // TODO once the bug that causes fields to potentially be lost during partial updates is fixed, we can remove the base parameter here
+    public PcuGroupCreateUpdateRequest withDefaultsAndValidations(PcuGroup base) {
+        val internalRep = new InternalRep(
+            builder()
+                .title(this.title == null ? base.getTitle() : this.title)
+                .description(this.description == null ? base.getDescription() : this.description)
+                .cloudProvider(this.cloudProvider == null ? base.getCloudProvider() : this.cloudProvider)
+                .region(this.region == null ? base.getRegion() : this.region)
+                .min(this.min == null ? base.getMin() : this.min)
+                .max(this.max == null ? base.getMax() : this.max)
+                .reserved(this.reserved == null ? base.getReserved() : this.reserved)
+        );
+
+        internalRep.validate();
+
+        return internalRep
+            .setPcuGroupUUID(base.getUuid())
+            .setInstanceType(base.getInstanceType())
+            .setProvisionType(base.getProvisionType());
+    }
+
+    @Setter
+    @Accessors(chain = true)
+    public static class InternalRep extends PcuGroupUpdateRequest {
+        private String pcuGroupUUID;
+        private String instanceType;
+        private PcuProvisionType provisionType;
+
+        protected InternalRep(PcuGroupUpdateRequestBuilder<?, ?> b) {
+            super(b);
+        }
+    }
+}