diff options
2 files changed, 8 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 2ece93ba23f..de8f1ec7ddc 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -484,7 +484,9 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { return ErrorResponse.badRequest("Can only set access privel for cloud tenants"); controller.serviceRegistry().accessControlService().setPreapprovedAccess(tenant, preapprovedAccess); - return new MessageResponse("OK"); + var slime = new Slime(); + slime.setObject().setBool("preapprovedAccess", preapprovedAccess); + return new SlimeJsonResponse(slime); } private HttpResponse tenantInfo(String tenantName, HttpRequest request) { diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/RoleEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/RoleEntity.java index ffc06b9a2e3..32efb1d1a39 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/RoleEntity.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/RoleEntity.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.List; +import java.util.Optional; /** * @author mortent @@ -27,10 +28,10 @@ public class RoleEntity { @JsonProperty("reviewEnabled") Boolean reviewEnabled, @JsonProperty("auditLog") List<AuditLogEntry> auditLog) { this.roleName = roleName; - this.roleMembers = roleMembers; - this.selfServe = selfServe; - this.reviewEnabled = reviewEnabled; - this.auditLog = auditLog == null ? new ArrayList<>() : auditLog; + this.roleMembers = Optional.ofNullable(roleMembers).orElse(new ArrayList<>()); + this.selfServe = Optional.ofNullable(selfServe).orElse(false); + this.reviewEnabled = Optional.ofNullable(reviewEnabled).orElse(false); + this.auditLog = Optional.ofNullable(auditLog).orElse(new ArrayList<>());; } public String roleName() { |