Expose whether an application is deployed internally

11 files changed, 16 insertions, 11 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 79bc72f950d..136786a3e4b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -323,7 +323,7 @@ public class ApplicationController {
                         ? triggered.sourceApplication().orElse(triggered.application())
                         : triggered.application();
 
-                if (application.get().deploymentJobs().builtInternally()) {
+                if (application.get().deploymentJobs().deployedInternally()) {
                     applicationPackage = new ApplicationPackage(applicationStore.getApplicationPackage(application.get().id(), applicationVersion.id()));
                 } else {
                     applicationPackage = new ApplicationPackage(artifactRepository.getApplicationPackage(application.get().id(), applicationVersion.id()));
@@ -332,7 +332,7 @@ public class ApplicationController {
             }
 
             // Update application with information from application package
-            if ( ! preferOldestVersion && ! application.get().deploymentJobs().builtInternally())
+            if ( ! preferOldestVersion && ! application.get().deploymentJobs().deployedInternally())
                 application = storeWithUpdatedConfig(application, applicationPackage);
 
             // Assign global rotation
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java
index 65ba7e68d31..23826a47931 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java
@@ -114,7 +114,7 @@ public class DeploymentJobs {
 
     public Optional<IssueId> issueId() { return issueId; }
 
-    public boolean builtInternally() { return builtInternally; }
+    public boolean deployedInternally() { return builtInternally; }
 
     private static OptionalLong requireId(OptionalLong id, String message) {
         Objects.requireNonNull(id, message);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 759c666e042..a062f703494 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -174,7 +174,7 @@ public class DeploymentTrigger {
         log.log(LogLevel.INFO, String.format("Triggering %s: %s", job, job.triggering));
         try {
             applications().lockOrThrow(job.applicationId(), application -> {
-                if (application.get().deploymentJobs().builtInternally())
+                if (application.get().deploymentJobs().deployedInternally())
                     jobs.start(job.applicationId(), job.jobType, new Versions(job.triggering.platform(),
                                                                               job.triggering.application(),
                                                                               job.triggering.sourcePlatform(),
@@ -199,7 +199,7 @@ public class DeploymentTrigger {
     public List<JobType> forceTrigger(ApplicationId applicationId, JobType jobType, String user) {
         Application application = applications().require(applicationId);
         if (jobType == component) {
-            if (application.deploymentJobs().builtInternally())
+            if (application.deploymentJobs().deployedInternally())
                 throw new IllegalArgumentException(applicationId + " has no component job we can trigger.");
 
             buildService.trigger(BuildJob.of(applicationId, application.deploymentJobs().projectId().getAsLong(), jobType.jobName()));
@@ -395,7 +395,7 @@ public class DeploymentTrigger {
     }
 
     private JobState jobStateOf(Application application, JobType jobType) {
-        if (application.deploymentJobs().builtInternally()) {
+        if (application.deploymentJobs().deployedInternally()) {
             Optional<Run> run = controller.jobController().last(application.id(), jobType);
             return run.isPresent() && ! run.get().hasEnded() ? JobState.running : JobState.idle;
         }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index ebbdfcc6c84..1b45041abce 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -133,7 +133,7 @@ public class JobController {
     /** Returns a list of all application which have registered. */
     public List<ApplicationId> applications() {
         return copyOf(controller.applications().asList().stream()
-                                .filter(application -> application.deploymentJobs().builtInternally())
+                                .filter(application -> application.deploymentJobs().deployedInternally())
                                 .map(Application::id)
                                 .iterator());
     }
@@ -216,7 +216,7 @@ public class JobController {
                                      byte[] packageBytes, byte[] testPackageBytes) {
         AtomicReference<ApplicationVersion> version = new AtomicReference<>();
         controller.applications().lockOrThrow(id, application -> {
-            if ( ! application.get().deploymentJobs().builtInternally()) {
+            if ( ! application.get().deploymentJobs().deployedInternally()) {
                 // Copy all current packages to the new application store
                 application.get().deployments().values().stream()
                            .map(Deployment::applicationVersion)
@@ -247,7 +247,7 @@ public class JobController {
     /** Orders a run of the given type, or throws an IllegalStateException if that job type is already running. */
     public void start(ApplicationId id, JobType type, Versions versions) {
         controller.applications().lockIfPresent(id, application -> {
-            if ( ! application.get().deploymentJobs().builtInternally())
+            if ( ! application.get().deploymentJobs().deployedInternally())
                 throw new IllegalArgumentException(id + " is not built here!");
 
             locked(id, type, __ -> {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
index 1452e3aa61d..7b615249a65 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
@@ -235,7 +235,7 @@ public class ApplicationSerializer {
         deploymentJobs.projectId().ifPresent(projectId -> cursor.setLong(projectIdField, projectId));
         jobStatusToSlime(deploymentJobs.jobStatus().values(), cursor.setArray(jobStatusField));
         deploymentJobs.issueId().ifPresent(jiraIssueId -> cursor.setString(issueIdField, jiraIssueId.value()));
-        cursor.setBool(builtInternallyField, deploymentJobs.builtInternally());
+        cursor.setBool(builtInternallyField, deploymentJobs.deployedInternally());
     }
 
     private void jobStatusToSlime(Collection<JobStatus> jobStatuses, Cursor jobStatusArray) {
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 d3cdb1d6b7c..5b063114bbe 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
@@ -395,6 +395,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
                 .steps(application.deploymentSpec())
                 .sortedJobs(application.deploymentJobs().jobStatus().values());
 
+        object.setBool("deployedInternally", application.deploymentJobs().deployedInternally());
         Cursor deploymentsArray = object.setArray("deploymentJobs");
         for (JobStatus job : jobStatus) {
             Cursor jobObject = deploymentsArray.addObject();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
index cf320ba437f..ad89c79cb51 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
@@ -230,7 +230,7 @@ public class InternalDeploymentTester {
      * Creates and submits a new application, and then starts the job of the given type.
      */
     public RunId newRun(JobType type) {
-        assertFalse(app().deploymentJobs().builtInternally()); // Use this only once per test.
+        assertFalse(app().deploymentJobs().deployedInternally()); // Use this only once per test.
         newSubmission();
         tester.readyJobTrigger().maintain();
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json
index 07a3dbb7f95..7bb78aba459 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json
@@ -2,6 +2,7 @@
   "application": "application1",
   "instance": "default",
   "deployments": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/default/job/",
+  "deployedInternally": false,
   "deploymentJobs": [
     {
       "type": "component",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json
index 0d7607f1df6..2f25e9471aa 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json
@@ -12,6 +12,7 @@
       }
     }
   },
+  "deployedInternally": false,
   "deploymentJobs": [
     {
       "type": "component",
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 4e4a870662a..70da148ef86 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
@@ -12,6 +12,7 @@
       }
     }
   },
+  "deployedInternally": false,
   "deploymentJobs": [
     {
       "type": "component",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
index 837c46aaec1..56abc8f9d82 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
@@ -15,6 +15,7 @@
       }
     }
   },
+  "deployedInternally": false,
   "deploymentJobs": [
     {
       "type": "component",