Wire in isFirstDeployment to AccessControlValidator

Use a boolean that is set correctly no matter what versions are loaded
to decide when to use AccessControlValidator

4 files changed, 12 insertions, 3 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index 28dc0cc8414..914d6963ff0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -124,6 +124,7 @@ public class ModelContextImpl implements ModelContext {
         private final Zone zone;
         private final Set<Rotation> rotations;
         private final boolean isBootstrap;
+        private final boolean isFirstTimeDeployment;
 
         public Properties(ApplicationId applicationId,
                           boolean multitenant,
@@ -134,7 +135,8 @@ public class ModelContextImpl implements ModelContext {
                           boolean hostedVespa,
                           Zone zone,
                           Set<Rotation> rotations,
-                          boolean isBootstrap) {
+                          boolean isBootstrap,
+                          boolean isFirstTimeDeployment) {
             this.applicationId = applicationId;
             this.multitenant = multitenant;
             this.configServerSpecs = configServerSpecs;
@@ -145,6 +147,7 @@ public class ModelContextImpl implements ModelContext {
             this.zone = zone;
             this.rotations = rotations;
             this.isBootstrap = isBootstrap;
+            this.isFirstTimeDeployment = isFirstTimeDeployment;
         }
 
         @Override
@@ -181,6 +184,8 @@ public class ModelContextImpl implements ModelContext {
         @Override
         public boolean isBootstrap() { return isBootstrap; }
 
+        @Override
+        public boolean isFirstTimeDeployment() { return isFirstTimeDeployment; }
     }
 
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
index 314b6d78ae3..2955d948d69 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
@@ -116,7 +116,8 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
                                                configserverConfig.hostedVespa(),
                                                zone(),
                                                new Rotations(curator, TenantRepository.getTenantPath(tenant)).readRotationsFromZooKeeper(applicationId),
-                                               false); // We may be bootstrapping, but we only know and care during prepare
+                                               false, // We may be bootstrapping, but we only know and care during prepare
+                                               false); // Always false, assume no one uses it when activating
     }
 
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 0d9f8ce64b1..6a240806004 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -158,7 +158,8 @@ public class SessionPreparer {
                                                               configserverConfig.hostedVespa(),
                                                               zone,
                                                               rotationsSet,
-                                                              params.isBootstrap());
+                                                              params.isBootstrap(),
+                                                              ! currentActiveApplicationSet.isPresent());
             this.preparedModelsBuilder = new PreparedModelsBuilder(modelFactoryRegistry,
                                                                    permanentApplicationPackage,
                                                                    configDefinitionRepo,
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
index ce53dc3f2fb..28fc179770a 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
@@ -51,6 +51,7 @@ public class ModelContextImplTest {
                         false,
                         Zone.defaultZone(),
                         rotations,
+                        false,
                         false),
                 Optional.empty(),
                 new Version(6), 
@@ -67,5 +68,6 @@ public class ModelContextImplTest {
         assertTrue(context.properties().zone() instanceof Zone);
         assertFalse(context.properties().hostedVespa());
         assertThat(context.properties().rotations(), equalTo(rotations));
+        assertThat(context.properties().isFirstTimeDeployment(), equalTo(false));
     }
 }