Search in sources :

Example 1 with ScrewdriverBuildJob

use of com.yahoo.vespa.hosted.controller.api.application.v4.model.ScrewdriverBuildJob in project vespa by vespa-engine.

the class ApplicationApiHandler method deploy.

private HttpResponse deploy(String tenantName, String applicationName, String instanceName, String environment, String region, HttpRequest request) {
    ApplicationId applicationId = ApplicationId.from(tenantName, applicationName, instanceName);
    ZoneId zone = ZoneId.from(environment, region);
    Map<String, byte[]> dataParts = new MultipartParser().parse(request);
    if (!dataParts.containsKey("deployOptions"))
        return ErrorResponse.badRequest("Missing required form part 'deployOptions'");
    Inspector deployOptions = SlimeUtils.jsonToSlime(dataParts.get("deployOptions")).get();
    Optional<ApplicationPackage> applicationPackage = Optional.ofNullable(dataParts.get("applicationZip")).map(ApplicationPackage::new);
    verifyApplicationIdentityConfiguration(tenantName, applicationPackage);
    // TODO: get rid of the json object
    DeployOptions deployOptionsJsonClass = new DeployOptions(screwdriverBuildJobFromSlime(deployOptions.field("screwdriverBuildJob")), optional("vespaVersion", deployOptions).map(Version::new), deployOptions.field("ignoreValidationErrors").asBool(), deployOptions.field("deployCurrentVersion").asBool());
    ActivateResult result = controller.applications().deployApplication(applicationId, zone, applicationPackage, deployOptionsJsonClass);
    return new SlimeJsonResponse(toSlime(result));
}
Also used : DeployOptions(com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions) ActivateResult(com.yahoo.vespa.hosted.controller.api.ActivateResult) SlimeJsonResponse(com.yahoo.vespa.hosted.controller.restapi.SlimeJsonResponse) ZoneId(com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId) Inspector(com.yahoo.slime.Inspector) ApplicationId(com.yahoo.config.provision.ApplicationId) ApplicationPackage(com.yahoo.vespa.hosted.controller.application.ApplicationPackage)

Example 2 with ScrewdriverBuildJob

use of com.yahoo.vespa.hosted.controller.api.application.v4.model.ScrewdriverBuildJob in project vespa by vespa-engine.

the class DeployOptionsTest method it_serializes_version.

@Test
public void it_serializes_version() throws IOException {
    DeployOptions options = new DeployOptions(Optional.empty(), Optional.of(new Version("6.98.227")), false, false);
    final ObjectMapper objectMapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).registerModule(new Jdk8Module());
    String string = objectMapper.writeValueAsString(options);
    assertEquals("{\"screwdriverBuildJob\":null,\"vespaVersion\":\"6.98.227\",\"ignoreValidationErrors\":false,\"deployCurrentVersion\":false}", string);
}
Also used : DeployOptions(com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions) Jdk8Module(com.fasterxml.jackson.datatype.jdk8.Jdk8Module) Version(com.yahoo.component.Version) ObjectMapper(com.fasterxml.jackson.databind.ObjectMapper) Test(org.junit.Test)

Example 3 with ScrewdriverBuildJob

use of com.yahoo.vespa.hosted.controller.api.application.v4.model.ScrewdriverBuildJob in project vespa by vespa-engine.

the class ControllerTest method testDeploymentOfNewInstanceWithIllegalApplicationName.

@Test
public void testDeploymentOfNewInstanceWithIllegalApplicationName() {
    ControllerTester tester = new ControllerTester();
    String application = "this_application_name_is_far_too_long_and_has_underscores";
    ZoneId zone = ZoneId.from("test", "us-east-1");
    DeployOptions options = new DeployOptions(Optional.of(new ScrewdriverBuildJob(new ScrewdriverId("123"), null)), Optional.empty(), false, false);
    tester.createTenant("tenant", "domain", null);
    // Deploy an application which doesn't yet exist, and which has an illegal application name.
    try {
        tester.controller().applications().deployApplication(ApplicationId.from("tenant", application, "123"), zone, Optional.empty(), options);
        fail("Illegal application name should cause validation exception.");
    } catch (IllegalArgumentException e) {
        assertTrue(e.getMessage().contains("Invalid id"));
    }
    // Sneak an illegal application in the back door.
    tester.createApplication(new ApplicationSerializer().toSlime(new Application(ApplicationId.from("tenant", application, "default"))));
    // Deploy a PR instance for the application, with no NToken.
    tester.controller().applications().deployApplication(ApplicationId.from("tenant", application, "456"), zone, Optional.empty(), options);
    assertTrue(tester.controller().applications().get(ApplicationId.from("tenant", application, "456")).isPresent());
}
Also used : DeployOptions(com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions) ScrewdriverId(com.yahoo.vespa.hosted.controller.api.identifiers.ScrewdriverId) ZoneId(com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId) ScrewdriverBuildJob(com.yahoo.vespa.hosted.controller.api.application.v4.model.ScrewdriverBuildJob) ApplicationSerializer(com.yahoo.vespa.hosted.controller.persistence.ApplicationSerializer) JobType.stagingTest(com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.stagingTest) JobType.systemTest(com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.systemTest) Test(org.junit.Test)

Example 4 with ScrewdriverBuildJob

use of com.yahoo.vespa.hosted.controller.api.application.v4.model.ScrewdriverBuildJob in project vespa by vespa-engine.

the class ControllerTester method deploy.

public void deploy(Application application, ZoneId zone, Optional<ApplicationPackage> applicationPackage, boolean deployCurrentVersion) {
    ScrewdriverId app1ScrewdriverId = new ScrewdriverId(String.valueOf(application.deploymentJobs().projectId().get()));
    GitRevision app1RevisionId = new GitRevision(new GitRepository("repo"), new GitBranch("master"), new GitCommit("commit1"));
    controller().applications().deployApplication(application.id(), zone, applicationPackage, new DeployOptions(Optional.of(new ScrewdriverBuildJob(app1ScrewdriverId, app1RevisionId)), Optional.empty(), false, deployCurrentVersion));
}
Also used : DeployOptions(com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions) ScrewdriverId(com.yahoo.vespa.hosted.controller.api.identifiers.ScrewdriverId) GitRepository(com.yahoo.vespa.hosted.controller.api.identifiers.GitRepository) GitRevision(com.yahoo.vespa.hosted.controller.api.application.v4.model.GitRevision) GitCommit(com.yahoo.vespa.hosted.controller.api.identifiers.GitCommit) GitBranch(com.yahoo.vespa.hosted.controller.api.identifiers.GitBranch) ScrewdriverBuildJob(com.yahoo.vespa.hosted.controller.api.application.v4.model.ScrewdriverBuildJob)

Example 5 with ScrewdriverBuildJob

use of com.yahoo.vespa.hosted.controller.api.application.v4.model.ScrewdriverBuildJob in project vespa by vespa-engine.

the class ContainerControllerTester method deploy.

public Application deploy(Application application, ApplicationPackage applicationPackage, ZoneId zone, long projectId) {
    ScrewdriverId app1ScrewdriverId = new ScrewdriverId(String.valueOf(projectId));
    GitRevision app1RevisionId = new GitRevision(new GitRepository("repo"), new GitBranch("master"), new GitCommit("commit1"));
    controller().applications().deployApplication(application.id(), zone, Optional.of(applicationPackage), new DeployOptions(Optional.of(new ScrewdriverBuildJob(app1ScrewdriverId, app1RevisionId)), Optional.empty(), false, false));
    return application;
}
Also used : DeployOptions(com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions) ScrewdriverId(com.yahoo.vespa.hosted.controller.api.identifiers.ScrewdriverId) GitRepository(com.yahoo.vespa.hosted.controller.api.identifiers.GitRepository) GitRevision(com.yahoo.vespa.hosted.controller.api.application.v4.model.GitRevision) GitCommit(com.yahoo.vespa.hosted.controller.api.identifiers.GitCommit) GitBranch(com.yahoo.vespa.hosted.controller.api.identifiers.GitBranch) ScrewdriverBuildJob(com.yahoo.vespa.hosted.controller.api.application.v4.model.ScrewdriverBuildJob)

Aggregations

DeployOptions (com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions)5 ScrewdriverBuildJob (com.yahoo.vespa.hosted.controller.api.application.v4.model.ScrewdriverBuildJob)3 ScrewdriverId (com.yahoo.vespa.hosted.controller.api.identifiers.ScrewdriverId)3 GitRevision (com.yahoo.vespa.hosted.controller.api.application.v4.model.GitRevision)2 GitBranch (com.yahoo.vespa.hosted.controller.api.identifiers.GitBranch)2 GitCommit (com.yahoo.vespa.hosted.controller.api.identifiers.GitCommit)2 GitRepository (com.yahoo.vespa.hosted.controller.api.identifiers.GitRepository)2 ZoneId (com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId)2 Test (org.junit.Test)2 ObjectMapper (com.fasterxml.jackson.databind.ObjectMapper)1 Jdk8Module (com.fasterxml.jackson.datatype.jdk8.Jdk8Module)1 Version (com.yahoo.component.Version)1 ApplicationId (com.yahoo.config.provision.ApplicationId)1 Inspector (com.yahoo.slime.Inspector)1 ActivateResult (com.yahoo.vespa.hosted.controller.api.ActivateResult)1 ApplicationPackage (com.yahoo.vespa.hosted.controller.application.ApplicationPackage)1 JobType.stagingTest (com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.stagingTest)1 JobType.systemTest (com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.systemTest)1 ApplicationSerializer (com.yahoo.vespa.hosted.controller.persistence.ApplicationSerializer)1 SlimeJsonResponse (com.yahoo.vespa.hosted.controller.restapi.SlimeJsonResponse)1