Light, fluffy, and always free - The AWS Local Emulator alternative
fix(opensearch): apply only supplied fields on partial UpdateDomainConfig (#6028)
Allen Sanbornec6f8a9d81ad
diff --git a/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchController.java b/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchController.javaindex 19e7fb0f31..6b73b06c05 100644--- a/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchController.java+++ b/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchController.java@@ -662,19 +662,14 @@ public class OpenSearchController {if (node == null || node.isMissingNode() || node.isNull()) {return null;}+ // Omitted fields stay null so the service only applies what the request supplied.ClusterConfig cc = new ClusterConfig();- if (node.has("InstanceType")) {- cc.setInstanceType(node.get("InstanceType").asText());- }- if (node.has("InstanceCount")) {- cc.setInstanceCount(node.get("InstanceCount").asInt());- }- if (node.has("DedicatedMasterEnabled")) {- cc.setDedicatedMasterEnabled(node.get("DedicatedMasterEnabled").asBoolean());- }- if (node.has("ZoneAwarenessEnabled")) {- cc.setZoneAwarenessEnabled(node.get("ZoneAwarenessEnabled").asBoolean());- }+ cc.setInstanceType(node.has("InstanceType") ? node.get("InstanceType").asText() : null);+ cc.setInstanceCount(node.has("InstanceCount") ? node.get("InstanceCount").asInt() : null);+ cc.setDedicatedMasterEnabled(node.has("DedicatedMasterEnabled")+ ? node.get("DedicatedMasterEnabled").asBoolean() : null);+ cc.setZoneAwarenessEnabled(node.has("ZoneAwarenessEnabled")+ ? node.get("ZoneAwarenessEnabled").asBoolean() : null);return cc;}@@ -682,16 +677,11 @@ public class OpenSearchController {if (node == null || node.isMissingNode() || node.isNull()) {return null;}+ // Omitted fields stay null so the service only applies what the request supplied.EbsOptions ebs = new EbsOptions();- if (node.has("EBSEnabled")) {- ebs.setEbsEnabled(node.get("EBSEnabled").asBoolean());- }- if (node.has("VolumeType")) {- ebs.setVolumeType(node.get("VolumeType").asText());- }- if (node.has("VolumeSize")) {- ebs.setVolumeSize(node.get("VolumeSize").asInt());- }+ ebs.setEbsEnabled(node.has("EBSEnabled") ? node.get("EBSEnabled").asBoolean() : null);+ ebs.setVolumeType(node.has("VolumeType") ? node.get("VolumeType").asText() : null);+ ebs.setVolumeSize(node.has("VolumeSize") ? node.get("VolumeSize").asInt() : null);return ebs;}diff --git a/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchService.java b/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchService.javaindex 4e1cd6aaa1..d9b8599368 100644--- a/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchService.java+++ b/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchService.java@@ -142,12 +142,8 @@ public class OpenSearchService implements ResourceProvider {// A configured data volume overwrites both when startDomain mounts operator storage.domain.setVolumeOwnership(VolumeOwnership.FLOCI_MANAGED);- if (clusterConfig != null) {- domain.setClusterConfig(clusterConfig);- }- if (ebsOptions != null) {- domain.setEbsOptions(ebsOptions);- }+ applyClusterConfig(domain.getClusterConfig(), clusterConfig);+ applyEbsOptions(domain.getEbsOptions(), ebsOptions);if (tags != null) {domain.setTags(tags);}@@ -228,33 +224,49 @@ public class OpenSearchService implements ResourceProvider {if (accessPolicies != null) {domain.setAccessPolicies(accessPolicies);}- if (clusterConfig != null) {- ClusterConfig existing = domain.getClusterConfig();- if (clusterConfig.getInstanceType() != null) {- existing.setInstanceType(clusterConfig.getInstanceType());- }- if (clusterConfig.getInstanceCount() > 0) {- existing.setInstanceCount(clusterConfig.getInstanceCount());- }- existing.setDedicatedMasterEnabled(clusterConfig.isDedicatedMasterEnabled());- existing.setZoneAwarenessEnabled(clusterConfig.isZoneAwarenessEnabled());- }- if (ebsOptions != null) {- EbsOptions existing = domain.getEbsOptions();- existing.setEbsEnabled(ebsOptions.isEbsEnabled());- if (ebsOptions.getVolumeType() != null) {- existing.setVolumeType(ebsOptions.getVolumeType());- }- if (ebsOptions.getVolumeSize() > 0) {- existing.setVolumeSize(ebsOptions.getVolumeSize());- }- }+ applyClusterConfig(domain.getClusterConfig(), clusterConfig);+ applyEbsOptions(domain.getEbsOptions(), ebsOptions);applyDomainOptions(domain, options);domainStore.put(domainName, domain);return domain;}+ /** Copies only the fields the request supplied (non-null) onto {@code existing}. */+ private static void applyClusterConfig(ClusterConfig existing, ClusterConfig supplied) {+ if (supplied == null) {+ return;+ }+ if (supplied.getInstanceType() != null) {+ existing.setInstanceType(supplied.getInstanceType());+ }+ if (supplied.getInstanceCount() != null && supplied.getInstanceCount() > 0) {+ existing.setInstanceCount(supplied.getInstanceCount());+ }+ if (supplied.isDedicatedMasterEnabled() != null) {+ existing.setDedicatedMasterEnabled(supplied.isDedicatedMasterEnabled());+ }+ if (supplied.isZoneAwarenessEnabled() != null) {+ existing.setZoneAwarenessEnabled(supplied.isZoneAwarenessEnabled());+ }+ }++ /** Copies only the fields the request supplied (non-null) onto {@code existing}. */+ private static void applyEbsOptions(EbsOptions existing, EbsOptions supplied) {+ if (supplied == null) {+ return;+ }+ if (supplied.isEbsEnabled() != null) {+ existing.setEbsEnabled(supplied.isEbsEnabled());+ }+ if (supplied.getVolumeType() != null) {+ existing.setVolumeType(supplied.getVolumeType());+ }+ if (supplied.getVolumeSize() != null && supplied.getVolumeSize() > 0) {+ existing.setVolumeSize(supplied.getVolumeSize());+ }+ }+public Domain deleteDomain(String domainName) {Domain domain = describeDomain(domainName);domain.setDeleted(true);diff --git a/src/main/java/io/github/hectorvent/floci/services/opensearch/model/ClusterConfig.java b/src/main/java/io/github/hectorvent/floci/services/opensearch/model/ClusterConfig.javaindex 9ba6fb71c1..45a7211850 100644--- a/src/main/java/io/github/hectorvent/floci/services/opensearch/model/ClusterConfig.java+++ b/src/main/java/io/github/hectorvent/floci/services/opensearch/model/ClusterConfig.java@@ -12,13 +12,13 @@ public class ClusterConfig {private String instanceType = "m5.large.search";@JsonProperty("InstanceCount")- private int instanceCount = 1;+ private Integer instanceCount = 1;@JsonProperty("DedicatedMasterEnabled")- private boolean dedicatedMasterEnabled = false;+ private Boolean dedicatedMasterEnabled = false;@JsonProperty("ZoneAwarenessEnabled")- private boolean zoneAwarenessEnabled = false;+ private Boolean zoneAwarenessEnabled = false;public ClusterConfig() {}@@ -30,27 +30,27 @@ public class ClusterConfig {this.instanceType = instanceType;}- public int getInstanceCount() {+ public Integer getInstanceCount() {return instanceCount;}- public void setInstanceCount(int instanceCount) {+ public void setInstanceCount(Integer instanceCount) {this.instanceCount = instanceCount;}- public boolean isDedicatedMasterEnabled() {+ public Boolean isDedicatedMasterEnabled() {return dedicatedMasterEnabled;}- public void setDedicatedMasterEnabled(boolean dedicatedMasterEnabled) {+ public void setDedicatedMasterEnabled(Boolean dedicatedMasterEnabled) {this.dedicatedMasterEnabled = dedicatedMasterEnabled;}- public boolean isZoneAwarenessEnabled() {+ public Boolean isZoneAwarenessEnabled() {return zoneAwarenessEnabled;}- public void setZoneAwarenessEnabled(boolean zoneAwarenessEnabled) {+ public void setZoneAwarenessEnabled(Boolean zoneAwarenessEnabled) {this.zoneAwarenessEnabled = zoneAwarenessEnabled;}}diff --git a/src/main/java/io/github/hectorvent/floci/services/opensearch/model/EbsOptions.java b/src/main/java/io/github/hectorvent/floci/services/opensearch/model/EbsOptions.javaindex 0725b09b08..9650f70941 100644--- a/src/main/java/io/github/hectorvent/floci/services/opensearch/model/EbsOptions.java+++ b/src/main/java/io/github/hectorvent/floci/services/opensearch/model/EbsOptions.java@@ -9,21 +9,21 @@ import io.quarkus.runtime.annotations.RegisterForReflection;public class EbsOptions {@JsonProperty("EBSEnabled")- private boolean ebsEnabled = true;+ private Boolean ebsEnabled = true;@JsonProperty("VolumeType")private String volumeType = "gp2";@JsonProperty("VolumeSize")- private int volumeSize = 10;+ private Integer volumeSize = 10;public EbsOptions() {}- public boolean isEbsEnabled() {+ public Boolean isEbsEnabled() {return ebsEnabled;}- public void setEbsEnabled(boolean ebsEnabled) {+ public void setEbsEnabled(Boolean ebsEnabled) {this.ebsEnabled = ebsEnabled;}@@ -35,11 +35,11 @@ public class EbsOptions {this.volumeType = volumeType;}- public int getVolumeSize() {+ public Integer getVolumeSize() {return volumeSize;}- public void setVolumeSize(int volumeSize) {+ public void setVolumeSize(Integer volumeSize) {this.volumeSize = volumeSize;}}diff --git a/src/test/java/io/github/hectorvent/floci/services/opensearch/OpenSearchDomainOptionsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/opensearch/OpenSearchDomainOptionsIntegrationTest.javaindex c444a6ee8c..7407931110 100644--- a/src/test/java/io/github/hectorvent/floci/services/opensearch/OpenSearchDomainOptionsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/opensearch/OpenSearchDomainOptionsIntegrationTest.java@@ -30,7 +30,8 @@ class OpenSearchDomainOptionsIntegrationTest {@AfterEachvoid cleanup() {// Delete every domain we touch so test order is irrelevant.- for (String name : new String[]{"opts-vpc", "opts-adv", "opts-enc", "opts-endpoint", "opts-update", "opts-access"}) {+ for (String name : new String[]{"opts-vpc", "opts-adv", "opts-enc", "opts-endpoint", "opts-update", "opts-access",+ "opts-partial"}) {given().header("Authorization", AUTH_HEADER).when().delete("/2021-01-01/opensearch/domain/" + name);}@@ -258,4 +259,114 @@ class OpenSearchDomainOptionsIntegrationTest {.then().statusCode(200).body("DomainStatus.AccessPolicies", equalTo(""));}++ // ── Partial UpdateDomainConfig ──────────────────────────────────────+ // AWS applies only the fields an update supplies; an omitted field keeps its value.++ private static final String PARTIAL_CREATE = "{\"DomainName\":\"opts-partial\","+ + "\"EngineVersion\":\"OpenSearch_2.19\","+ + "\"ClusterConfig\":{\"InstanceType\":\"r6g.large.search\",\"InstanceCount\":3,"+ + "\"DedicatedMasterEnabled\":true,\"ZoneAwarenessEnabled\":true},"+ + "\"EBSOptions\":{\"EBSEnabled\":true,\"VolumeType\":\"gp3\",\"VolumeSize\":50}}";++ private void createPartialDomain() {+ given().contentType("application/json").header("Authorization", AUTH_HEADER).body(PARTIAL_CREATE)+ .when().post("/2021-01-01/opensearch/domain")+ .then().statusCode(200);+ }++ @Test+ void partialClusterConfigUpdateKeepsOmittedFields() {+ createPartialDomain();++ // Only InstanceCount, and no EBSOptions block at all.+ given().contentType("application/json").header("Authorization", AUTH_HEADER)+ .body("{\"ClusterConfig\":{\"InstanceCount\":5}}")+ .when().post("/2021-01-01/opensearch/domain/opts-partial/config")+ .then().statusCode(200);++ given().header("Authorization", AUTH_HEADER)+ .when().get("/2021-01-01/opensearch/domain/opts-partial")+ .then().statusCode(200)+ .body("DomainStatus.ClusterConfig.DedicatedMasterEnabled", equalTo(true))+ .body("DomainStatus.ClusterConfig.ZoneAwarenessEnabled", equalTo(true))+ .body("DomainStatus.ClusterConfig.InstanceCount", equalTo(5))+ .body("DomainStatus.ClusterConfig.InstanceType", equalTo("r6g.large.search"))+ .body("DomainStatus.EBSOptions.EBSEnabled", equalTo(true))+ .body("DomainStatus.EBSOptions.VolumeType", equalTo("gp3"))+ .body("DomainStatus.EBSOptions.VolumeSize", equalTo(50));+ }++ @Test+ void emptyClusterConfigUpdateChangesNothing() {+ createPartialDomain();++ given().contentType("application/json").header("Authorization", AUTH_HEADER)+ .body("{\"ClusterConfig\":{}}")+ .when().post("/2021-01-01/opensearch/domain/opts-partial/config")+ .then().statusCode(200);++ given().header("Authorization", AUTH_HEADER)+ .when().get("/2021-01-01/opensearch/domain/opts-partial")+ .then().statusCode(200)+ .body("DomainStatus.ClusterConfig.DedicatedMasterEnabled", equalTo(true))+ .body("DomainStatus.ClusterConfig.ZoneAwarenessEnabled", equalTo(true))+ .body("DomainStatus.ClusterConfig.InstanceCount", equalTo(3))+ .body("DomainStatus.ClusterConfig.InstanceType", equalTo("r6g.large.search"));+ }++ @Test+ void partialEbsOptionsUpdateKeepsOmittedFields() {+ createPartialDomain();++ given().contentType("application/json").header("Authorization", AUTH_HEADER)+ .body("{\"EBSOptions\":{\"VolumeSize\":100}}")+ .when().post("/2021-01-01/opensearch/domain/opts-partial/config")+ .then().statusCode(200);++ given().header("Authorization", AUTH_HEADER)+ .when().get("/2021-01-01/opensearch/domain/opts-partial")+ .then().statusCode(200)+ .body("DomainStatus.EBSOptions.VolumeSize", equalTo(100))+ .body("DomainStatus.EBSOptions.VolumeType", equalTo("gp3"))+ .body("DomainStatus.EBSOptions.EBSEnabled", equalTo(true));+ }++ @Test+ void explicitFalseStillTurnsSettingsOff() {+ createPartialDomain();++ given().contentType("application/json").header("Authorization", AUTH_HEADER)+ .body("{\"ClusterConfig\":{\"DedicatedMasterEnabled\":false,\"ZoneAwarenessEnabled\":false},"+ + "\"EBSOptions\":{\"EBSEnabled\":false}}")+ .when().post("/2021-01-01/opensearch/domain/opts-partial/config")+ .then().statusCode(200);++ given().header("Authorization", AUTH_HEADER)+ .when().get("/2021-01-01/opensearch/domain/opts-partial")+ .then().statusCode(200)+ .body("DomainStatus.ClusterConfig.DedicatedMasterEnabled", equalTo(false))+ .body("DomainStatus.ClusterConfig.ZoneAwarenessEnabled", equalTo(false))+ .body("DomainStatus.ClusterConfig.InstanceCount", equalTo(3))+ .body("DomainStatus.EBSOptions.EBSEnabled", equalTo(false))+ .body("DomainStatus.EBSOptions.VolumeType", equalTo("gp3"));+ }++ @Test+ void legacyEsPartialClusterConfigUpdateKeepsOmittedFields() {+ createPartialDomain();++ given().contentType("application/json").header("Authorization", AUTH_HEADER)+ .body("{\"ElasticsearchClusterConfig\":{\"InstanceCount\":4}}")+ .when().post("/2015-01-01/es/domain/opts-partial/config")+ .then().statusCode(200);++ given().header("Authorization", AUTH_HEADER)+ .when().get("/2021-01-01/opensearch/domain/opts-partial")+ .then().statusCode(200)+ .body("DomainStatus.ClusterConfig.DedicatedMasterEnabled", equalTo(true))+ .body("DomainStatus.ClusterConfig.ZoneAwarenessEnabled", equalTo(true))+ .body("DomainStatus.ClusterConfig.InstanceCount", equalTo(4))+ .body("DomainStatus.ClusterConfig.InstanceType", equalTo("r6g.large.search"));+ }}