diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-07-13 13:34:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-13 13:34:19 +0200 |
commit | 67cfa620dec1972a70dd7f0053c87861e6a3251f (patch) | |
tree | 10da6318ffe269ee8c759321c23ffd936b7e832d /configserver/src | |
parent | 9a922b741599c325a902ffb7bd5bc8cd0f99da5f (diff) | |
parent | b6f8c1f30b7f1b6168385ce947176e44e18eec7a (diff) |
Merge pull request #23340 from vespa-engine/hmusum/remove-unused-meta-data-field
Remove 'user' field in application metadata and add deprecations for … [run-systemtest]
Diffstat (limited to 'configserver/src')
3 files changed, 3 insertions, 10 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java index 676c39329bb..2ee2cfe837a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java @@ -682,12 +682,8 @@ public class SessionRepository { boolean internalRedeploy, Optional<DeployLogger> deployLogger) { long deployTimestamp = System.currentTimeMillis(); - String user = System.getenv("USER"); - if (user == null) { - user = "unknown"; - } - DeployData deployData = new DeployData(user, userDir.getAbsolutePath(), applicationId, deployTimestamp, - internalRedeploy, sessionId, currentlyActiveSessionId.orElse(nonExistingActiveSessionId)); + DeployData deployData = new DeployData(userDir.getAbsolutePath(), applicationId, deployTimestamp, internalRedeploy, + sessionId, currentlyActiveSessionId.orElse(nonExistingActiveSessionId)); FilesApplicationPackage app = FilesApplicationPackage.fromFileWithDeployData(configApplicationDir, deployData); try { app.validateFileExtensions(); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java index fe188e08036..d1d8c165124 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java @@ -233,7 +233,6 @@ public class ApplicationRepositoryTest { assertEquals(originalApplicationMetaData.getApplicationId(), applicationMetaData.getApplicationId()); assertEquals(originalApplicationMetaData.getGeneration().longValue(), applicationMetaData.getPreviousActiveGeneration()); assertNotEquals(originalApplicationMetaData.getGeneration(), applicationMetaData.getGeneration()); - assertEquals(originalApplicationMetaData.getDeployedByUser(), applicationMetaData.getDeployedByUser()); } @Test diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java index 41ac081f68b..fd6440a9632 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java @@ -57,8 +57,7 @@ public class ZooKeeperClientTest { zk = new MockCurator(); ZooKeeperClient zkc = new ZooKeeperClient(zk, new BaseDeployLogger(), appPath); ApplicationPackage app = FilesApplicationPackage.fromFileWithDeployData(new File("src/test/apps/zkfeed"), - new DeployData("foo", - "/bar/baz", + new DeployData("/bar/baz", ApplicationId.from("default", "appName", "default"), 1345L, true, @@ -121,7 +120,6 @@ public class ZooKeeperClientTest { Utf8.toString(zk.getData(appPath.append(META_ZK_PATH)).get())); assertTrue(metaData.getChecksum().length() > 0); assertTrue(metaData.isInternalRedeploy()); - assertEquals("foo", metaData.getDeployedByUser()); assertEquals("/bar/baz", metaData.getDeployPath()); assertEquals(1345, metaData.getDeployTimestamp().longValue()); assertEquals(3, metaData.getGeneration().longValue()); |