Merge pull request #15399 from vespa-engine/jonmv/throw-during-prepare-with-disallowed-config-change-actions

Jonmv/throw during prepare with disallowed config change actions

3 files changed, 0 insertions, 9 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/RefeedAction.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/RefeedAction.java
index faa2c39ee65..799bc814abe 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/RefeedAction.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/RefeedAction.java
@@ -14,7 +14,6 @@ import java.util.List;
 public class RefeedAction {
 
     public final String name;
-    public final boolean allowed;
     public final String documentType;
     public final String clusterName;
     public final List<ServiceInfo> services;
@@ -22,13 +21,11 @@ public class RefeedAction {
 
     @JsonCreator
     public RefeedAction(@JsonProperty("name") String name,
-                        @JsonProperty("allowed") boolean allowed,
                         @JsonProperty("documentType") String documentType,
                         @JsonProperty("clusterName") String clusterName,
                         @JsonProperty("services") List<ServiceInfo> services,
                         @JsonProperty("messages") List<String> messages) {
         this.name = name;
-        this.allowed = allowed;
         this.documentType = documentType;
         this.clusterName = clusterName;
         this.services = services;
@@ -39,7 +36,6 @@ public class RefeedAction {
     public String toString() {
         return "RefeedAction{" +
                 "name='" + name + '\'' +
-                ", allowed=" + allowed +
                 ", documentType='" + documentType + '\'' +
                 ", clusterName='" + clusterName + '\'' +
                 ", services=" + services +
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/ReindexAction.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/ReindexAction.java
index c5735fbd4a6..c2b28a94c66 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/ReindexAction.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/ReindexAction.java
@@ -14,7 +14,6 @@ import java.util.List;
 public class ReindexAction {
 
     public final String name;
-    public final boolean allowed;
     public final String documentType;
     public final String clusterName;
     public final List<ServiceInfo> services;
@@ -22,13 +21,11 @@ public class ReindexAction {
 
     @JsonCreator
     public ReindexAction(@JsonProperty("name") String name,
-                         @JsonProperty("allowed") boolean allowed,
                          @JsonProperty("documentType") String documentType,
                          @JsonProperty("clusterName") String clusterName,
                          @JsonProperty("services") List<ServiceInfo> services,
                          @JsonProperty("messages") List<String> messages) {
         this.name = name;
-        this.allowed = allowed;
         this.documentType = documentType;
         this.clusterName = clusterName;
         this.services = services;
@@ -39,7 +36,6 @@ public class ReindexAction {
     public String toString() {
         return "ReindexAction{" +
                 "name='" + name + '\'' +
-                ", allowed=" + allowed +
                 ", documentType='" + documentType + '\'' +
                 ", clusterName='" + clusterName + '\'' +
                 ", services=" + services +
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/PrepareResponse.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/PrepareResponse.java
index 6054e05149b..5c946538625 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/PrepareResponse.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/PrepareResponse.java
@@ -15,7 +15,6 @@ import java.util.List;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class PrepareResponse {
     public TenantId tenant;
-    @JsonProperty("activate") public URI activationUri;
     public String message;
     public List<Log> log;
     public ConfigChangeActions configChangeActions;