Add ChangeRequestMaintainer

4 files changed, 60 insertions, 0 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
new file mode 100644
index 00000000000..71291e5d766
--- /dev/null
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java
@@ -0,0 +1,46 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+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.ChangeRequestClient;
+
+import java.time.Duration;
+import java.util.function.Predicate;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+/**
+ * @author olaa
+ */
+public class ChangeRequestMaintainer extends ControllerMaintainer {
+
+    private final Logger logger = Logger.getLogger(ChangeRequestMaintainer.class.getName());
+    private final ChangeRequestClient changeRequestClient;
+
+    public ChangeRequestMaintainer(Controller controller, Duration interval) {
+        super(controller, interval, null, SystemName.allOf(Predicate.not(SystemName::isPublic)));
+        this.changeRequestClient = controller.serviceRegistry().changeRequestClient();
+    }
+
+
+    @Override
+    protected boolean maintain() {
+        var changeRequests = changeRequestClient.getUpcomingChangeRequests();
+
+        if (!changeRequests.isEmpty()) {
+            logger.fine(() -> "Found the following upcoming change requests:");
+            changeRequests.forEach(changeRequest -> logger.fine(changeRequest::toString));
+        }
+
+        var unapprovedRequests = changeRequests
+                .stream()
+                .filter(changeRequest -> !changeRequest.isApproved())
+                .collect(Collectors.toList());
+
+        changeRequestClient.approveChangeRequests(unapprovedRequests);
+
+        // TODO: Store in curator?
+        return true;
+    }
+}
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
index d9a233eb475..18960de16af 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
@@ -67,6 +67,7 @@ public class ControllerMaintenance extends AbstractComponent {
         maintainers.add(new TrafficShareUpdater(controller, intervals.trafficFractionUpdater));
         maintainers.add(new ArchiveUriUpdater(controller, intervals.archiveUriUpdater));
         maintainers.add(new TenantRoleMaintainer(controller, intervals.tenantRoleMaintainer));
+        maintainers.add(new ChangeRequestMaintainer(controller, intervals.changeRequestMaintainer));
     }
 
     public Upgrader upgrader() { return upgrader; }
@@ -119,6 +120,7 @@ public class ControllerMaintenance extends AbstractComponent {
         private final Duration trafficFractionUpdater;
         private final Duration archiveUriUpdater;
         private final Duration tenantRoleMaintainer;
+        private final Duration changeRequestMaintainer;
 
         public Intervals(SystemName system) {
             this.system = Objects.requireNonNull(system);
@@ -148,6 +150,7 @@ public class ControllerMaintenance extends AbstractComponent {
             this.trafficFractionUpdater = duration(5, MINUTES);
             this.archiveUriUpdater = duration(5, MINUTES);
             this.tenantRoleMaintainer = duration(5, MINUTES);
+            this.changeRequestMaintainer = duration(12, HOURS);
         }
 
         private Duration duration(long amount, TemporalUnit unit) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java
index 6ffac36fd6a..e96eed2b6d9 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java
@@ -35,6 +35,8 @@ import com.yahoo.vespa.hosted.controller.api.integration.stubs.MockMailer;
 import com.yahoo.vespa.hosted.controller.api.integration.stubs.MockMeteringClient;
 import com.yahoo.vespa.hosted.controller.api.integration.stubs.MockRunDataStore;
 import com.yahoo.vespa.hosted.controller.api.integration.stubs.MockTesterCloud;
+import com.yahoo.vespa.hosted.controller.api.integration.vcmr.ChangeRequestClient;
+import com.yahoo.vespa.hosted.controller.api.integration.vcmr.NoopChangeRequestClient;
 
 /**
  * A mock implementation of a {@link ServiceRegistry} for testing purposes.
@@ -70,6 +72,7 @@ public class ServiceRegistryMock extends AbstractComponent implements ServiceReg
     private final ContainerRegistryMock containerRegistry = new ContainerRegistryMock();
     private final NoopTenantSecretService tenantSecretService = new NoopTenantSecretService();
     private final ArchiveService archiveService = new MockArchiveService();
+    private final ChangeRequestClient changeRequestClient = new NoopChangeRequestClient();
 
     public ServiceRegistryMock(SystemName system) {
         this.zoneRegistryMock = new ZoneRegistryMock(system);
@@ -221,6 +224,11 @@ public class ServiceRegistryMock extends AbstractComponent implements ServiceReg
         return archiveService;
     }
 
+    @Override
+    public ChangeRequestClient changeRequestClient() {
+        return changeRequestClient;
+    }
+
     public ConfigServerMock configServerMock() {
         return configServerMock;
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json
index e1e44bd0943..08741e7f38a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json
@@ -10,6 +10,9 @@
       "name": "ArchiveUriUpdater"
     },
     {
+      "name": "ChangeRequestMaintainer"
+    },
+    {
       "name": "CloudEventReporter"
     },
     {