1 files changed, 15 insertions, 6 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java
index 71291e5d766..ca9ebe132fd 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java
@@ -3,9 +3,11 @@ package com.yahoo.vespa.hosted.controller.maintenance;
 
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.vespa.hosted.controller.Controller;
+import com.yahoo.vespa.hosted.controller.api.integration.vcmr.ChangeRequest;
 import com.yahoo.vespa.hosted.controller.api.integration.vcmr.ChangeRequestClient;
 
 import java.time.Duration;
+import java.util.List;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -17,10 +19,12 @@ public class ChangeRequestMaintainer extends ControllerMaintainer {
 
     private final Logger logger = Logger.getLogger(ChangeRequestMaintainer.class.getName());
     private final ChangeRequestClient changeRequestClient;
+    private final SystemName system;
 
     public ChangeRequestMaintainer(Controller controller, Duration interval) {
         super(controller, interval, null, SystemName.allOf(Predicate.not(SystemName::isPublic)));
         this.changeRequestClient = controller.serviceRegistry().changeRequestClient();
+        this.system = controller.system();
     }
 
 
@@ -29,18 +33,23 @@ public class ChangeRequestMaintainer extends ControllerMaintainer {
         var changeRequests = changeRequestClient.getUpcomingChangeRequests();
 
         if (!changeRequests.isEmpty()) {
-            logger.fine(() -> "Found the following upcoming change requests:");
-            changeRequests.forEach(changeRequest -> logger.fine(changeRequest::toString));
+            logger.info(() -> "Found the following upcoming change requests:");
+            changeRequests.forEach(changeRequest -> logger.info(changeRequest::toString));
         }
 
+        if (system.equals(SystemName.main))
+            approveChanges(changeRequests);
+
+        // TODO: Store in curator?
+        return true;
+    }
+
+    private void approveChanges(List<ChangeRequest> changeRequests) {
         var unapprovedRequests = changeRequests
                 .stream()
-                .filter(changeRequest -> !changeRequest.isApproved())
+                .filter(changeRequest -> changeRequest.getApproval() == ChangeRequest.Approval.REQUESTED)
                 .collect(Collectors.toList());
 
         changeRequestClient.approveChangeRequests(unapprovedRequests);
-
-        // TODO: Store in curator?
-        return true;
     }
 }