From 5c5c01e15365e1673aa53ee879d800b8f0f1e1ab Mon Sep 17 00:00:00 2001 From: Andreas Eriksen Date: Tue, 28 Jun 2022 15:08:59 +0200 Subject: Revert "Revert "Revert "log certificate version on deploy""" --- .../com/yahoo/vespa/hosted/controller/ApplicationController.java | 4 +--- .../vespa/hosted/controller/deployment/InternalStepRunner.java | 2 +- .../application/responses/dev-us-east-1-log-first-part.json | 7 +------ .../application/responses/dev-us-east-1-log-second-part.json | 7 +------ .../controller/restapi/application/responses/staging-test-log.json | 7 +------ .../restapi/application/responses/system-test-details.json | 7 +------ .../controller/restapi/application/responses/system-test-log.json | 7 +------ .../restapi/application/responses/us-east-3-log-without-first.json | 7 +------ 8 files changed, 8 insertions(+), 40 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 cd90d14f9ff..e48ad7596ea 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 @@ -446,7 +446,7 @@ public class ApplicationController { } /** Deploys an application package for an existing application instance. */ - public ActivateResult deploy(JobId job, boolean deploySourceVersions, Consumer deployLogger) { + public ActivateResult deploy(JobId job, boolean deploySourceVersions) { if (job.application().instance().isTester()) throw new IllegalArgumentException("'" + job.application() + "' is a tester application!"); @@ -479,8 +479,6 @@ public class ApplicationController { applicationPackage = applicationPackage.withTrustedCertificate(run.testerCertificate().get()); endpointCertificateMetadata = endpointCertificates.getMetadata(instance, zone, applicationPackage.deploymentSpec()); - endpointCertificateMetadata.ifPresent(e -> deployLogger.accept("Deploying with CA signed certificate version %s".formatted(e.version()))); - containerEndpoints = controller.routing().of(deployment).prepare(application); } // Release application lock while doing the deployment, which is a lengthy task. diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index 50e6951f8be..813e3454e80 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -174,7 +174,7 @@ public class InternalStepRunner implements StepRunner { private Optional deployReal(RunId id, boolean setTheStage, DualLogger logger) { Optional testerCertificate = controller.jobController().run(id).testerCertificate(); - return deploy(() -> controller.applications().deploy(id.job(), setTheStage, logger::log), + return deploy(() -> controller.applications().deploy(id.job(), setTheStage), controller.jobController().run(id) .stepInfo(setTheStage ? deployInitialReal : deployReal).get() .startTime().get(), diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json index 85813f7fcfa..63869ecfba8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json @@ -8,11 +8,6 @@ "type": "info", "message": "Deploying platform version 6.1 and application dev build 1 for dev-us-east-1 of default ..." }, - { - "at": 0, - "type": "info", - "message": "Deploying with CA signed certificate version 0" - }, { "at": 0, "type": "info", @@ -54,7 +49,7 @@ } ] }, - "lastId": 8, + "lastId": 7, "steps": { "deployReal": { "status": "succeeded", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json index 4ffac2bf738..175c45eb2cd 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json @@ -3,11 +3,6 @@ "status": "success", "log": { "installReal": [ - { - "at": 0, - "type": "info", - "message": "Found endpoints:" - }, { "at": 0, "type": "info", @@ -25,7 +20,7 @@ } ] }, - "lastId": 12, + "lastId": 11, "steps": { "deployReal": { "status": "succeeded", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json index d275deef85b..ba65b962a73 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json @@ -82,11 +82,6 @@ "type": "info", "message": "Deploying platform version 6.1 and application build 1 ..." }, - { - "at": 14503000, - "type": "info", - "message": "Deploying with CA signed certificate version 0" - }, { "at": 14503000, "type": "info", @@ -165,7 +160,7 @@ } ] }, - "lastId": 30, + "lastId": 29, "steps": { "deployTester": { "status": "succeeded", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json index 10cbb3706e0..3b505bc11fd 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json @@ -102,11 +102,6 @@ "type": "info", "message": "Deploying platform version 6.1 and application build 1 ..." }, - { - "at": 1600000000000, - "type": "info", - "message": "Deploying with CA signed certificate version 1" - }, { "at": 1600000000000, "type": "info", @@ -359,7 +354,7 @@ } ] }, - "lastId": 67, + "lastId": 66, "steps": { "deployTester": { "status": "succeeded", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json index 9fc3ea6f426..5bf6822baff 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json @@ -97,11 +97,6 @@ "type": "info", "message": "Deploying platform version 6.1 and application build 1 ..." }, - { - "at": 0, - "type": "info", - "message": "Deploying with CA signed certificate version 0" - }, { "at": 0, "type": "info", @@ -354,7 +349,7 @@ } ] }, - "lastId": 67, + "lastId": 66, "steps": { "deployTester": { "status": "succeeded", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json index b9be0d26408..588f8839ab7 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json @@ -3,11 +3,6 @@ "status": "deploymentFailed", "log": { "deployReal": [ - { - "at": 1000, - "type": "info", - "message": "Deploying with CA signed certificate version 0" - }, { "at": 1000, "type": "warning", @@ -15,7 +10,7 @@ } ] }, - "lastId": 2, + "lastId": 1, "steps": { "deployReal": { "status": "failed", -- cgit v1.2.3