Add owner to application info (#7724)

4 files changed, 18 insertions, 6 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmerTest.java
index 62653f29518..75c287e700f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmerTest.java
@@ -58,14 +58,12 @@ public class ApplicationOwnershipConfirmerTest {
         Optional<IssueId> issueId = Optional.of(IssueId.from("1"));
         issues.response = issueId;
         confirmer.maintain();
-        confirmer.maintain();
 
         assertFalse("No issue is stored for an application newer than 3 months.", propertyApp.get().ownershipIssueId().isPresent());
         assertFalse("No issue is stored for an application newer than 3 months.", userApp.get().ownershipIssueId().isPresent());
 
         tester.clock().advance(Duration.ofDays(91));
         confirmer.maintain();
-        confirmer.maintain();
 
         assertEquals("Confirmation issue has been filed for property owned application.", issueId, propertyApp.get().ownershipIssueId());
         assertEquals("Confirmation issue has been filed for user owned application.", issueId, userApp.get().ownershipIssueId());
@@ -75,7 +73,6 @@ public class ApplicationOwnershipConfirmerTest {
         // No new issue is created, so return empty now.
         issues.response = Optional.empty();
         confirmer.maintain();
-        confirmer.maintain();
 
         assertEquals("Confirmation issue reference is not updated when no issue id is returned.", issueId, propertyApp.get().ownershipIssueId());
         assertEquals("Confirmation issue reference is not updated when no issue id is returned.", issueId, userApp.get().ownershipIssueId());
@@ -86,16 +83,20 @@ public class ApplicationOwnershipConfirmerTest {
         tester.controller().applications().deactivate(userApp.get().id(), userApp.get().productionDeployments().keySet().stream().findAny().get());
         assertTrue("No production deployments are listed for user.", userApp.get().productionDeployments().isEmpty());
         confirmer.maintain();
-        confirmer.maintain();
 
         // Time has passed, and a new confirmation issue is in order for the property which is still in production.
         Optional<IssueId> issueId2 = Optional.of(IssueId.from("2"));
         issues.response = issueId2;
         confirmer.maintain();
-        confirmer.maintain();
 
         assertEquals("A new confirmation issue id is stored when something is returned to the maintainer.", issueId2, propertyApp.get().ownershipIssueId());
         assertEquals("Confirmation issue for application without production deployments has not been filed.", issueId, userApp.get().ownershipIssueId());
+
+        assertFalse("No owner is stored for application", propertyApp.get().owner().isPresent());
+        issues.owner = Optional.of(User.from("username"));
+        confirmer.maintain();
+        assertEquals("Owner has been added to application", propertyApp.get().owner().get().username(), "username");
+
     }
 
     private class MockOwnershipIssues implements OwnershipIssues {
@@ -103,6 +104,7 @@ public class ApplicationOwnershipConfirmerTest {
         private Optional<IssueId> response;
         private boolean escalatedToContact = false;
         private boolean escalatedToTerminator = false;
+        private Optional<User> owner = Optional.empty();
 
         @Override
         public Optional<IssueId> confirmOwnership(Optional<IssueId> issueId, ApplicationId applicationId, User asignee, Contact contact) {
@@ -115,6 +117,10 @@ public class ApplicationOwnershipConfirmerTest {
             else escalatedToTerminator = true;
         }
 
+        @Override
+        public Optional<User> getConfirmedOwner(IssueId issueId) {
+            return owner;
+        }
     }
 
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
index a6a6635032d..42ce696af89 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
@@ -12,6 +12,7 @@ import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.api.integration.MetricsService;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.IssueId;
+import com.yahoo.vespa.hosted.controller.api.integration.organization.User;
 import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.ApplicationVersion;
 import com.yahoo.vespa.hosted.controller.application.Change;
@@ -106,6 +107,7 @@ public class ApplicationSerializerTest {
                                                Change.of(Version.fromString("6.7")),
                                                Change.of(ApplicationVersion.from(new SourceRevision("repo", "master", "deadcafe"), 42)),
                                                Optional.of(IssueId.from("1234")),
+                                               Optional.of(User.from("by-username")),
                                                new MetricsService.ApplicationMetrics(0.5, 0.9),
                                                Optional.of(new RotationId("my-rotation")),
                                                rotationStatus);
@@ -138,6 +140,7 @@ public class ApplicationSerializerTest {
         assertEquals(original.outstandingChange(), serialized.outstandingChange());
 
         assertEquals(original.ownershipIssueId(), serialized.ownershipIssueId());
+        assertEquals(original.owner(), serialized.owner());
 
         assertEquals(original.change(), serialized.change());
         assertEquals(original.rotation().get(), serialized.rotation().get());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 2856bbe214d..33ac089439c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -27,6 +27,7 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.PropertyId;
 import com.yahoo.vespa.hosted.controller.api.identifiers.ScrewdriverId;
 import com.yahoo.vespa.hosted.controller.api.identifiers.UserId;
 import com.yahoo.vespa.hosted.controller.api.integration.MetricsService.ApplicationMetrics;
+import com.yahoo.vespa.hosted.controller.api.integration.organization.User;
 import com.yahoo.vespa.hosted.controller.athenz.ApplicationAction;
 import com.yahoo.vespa.hosted.controller.athenz.HostedAthenzIdentities;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerException;
@@ -505,7 +506,8 @@ public class ApplicationApiTest extends ControllerContainerTest {
     private void addIssues(ContainerControllerTester tester, ApplicationId id) {
         tester.controller().applications().lockOrThrow(id, application ->
                 tester.controller().applications().store(application.withDeploymentIssueId(IssueId.from("123"))
-                                                                    .withOwnershipIssueId(IssueId.from("321"))));
+                                                                    .withOwnershipIssueId(IssueId.from("321"))
+                                                                    .withOwner(User.from("owner-username"))));
     }
 
     @Test
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json
index 70da148ef86..da6bf455857 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json
@@ -231,5 +231,6 @@
     "lastWritesPerSecond": 2.0
   },
   "ownershipIssueId": "321",
+  "owner": "owner-username",
   "deploymentIssueId": "123"
 }