diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-04-17 07:32:31 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-04-17 07:32:31 +0200 |
commit | faee89ef73bb9ee25fc927053f39ee53a0c99f3c (patch) | |
tree | e3f266354b9472b98d7494d117ce8b7efbd78366 /vespa-maven-plugin | |
parent | dc94ab3081ba413ed7ae4791b2bb2dd908e06788 (diff) |
Stop using deprecated constructor
Diffstat (limited to 'vespa-maven-plugin')
-rw-r--r-- | vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/EffectiveServicesMojo.java | 12 | ||||
-rw-r--r-- | vespa-maven-plugin/src/test/java/ai/vespa/hosted/plugin/EffectiveServicesMojoTest.java | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/EffectiveServicesMojo.java b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/EffectiveServicesMojo.java index 91c7809dc76..ea536ffa6b3 100644 --- a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/EffectiveServicesMojo.java +++ b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/EffectiveServicesMojo.java @@ -2,6 +2,7 @@ package ai.vespa.hosted.plugin; import com.yahoo.config.application.XmlPreProcessor; +import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.zone.ZoneId; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; @@ -43,12 +44,17 @@ public class EffectiveServicesMojo extends AbstractVespaDeploymentMojo { ZoneId zone = zoneOf(environment, region); Path output = Paths.get(outputDirectory).resolve("services-" + zone.environment().value() + "-" + zone.region().value() + ".xml"); - Files.write(output, effectiveServices(services, zone).getBytes(StandardCharsets.UTF_8)); + Files.write(output, effectiveServices(services, zone, InstanceName.from(instance)).getBytes(StandardCharsets.UTF_8)); getLog().info("Effective services for " + zone + " written to " + output); } - static String effectiveServices(File servicesFile, ZoneId zone) throws Exception { - Document processedServicesXml = new XmlPreProcessor(servicesFile.getParentFile(), servicesFile, zone.environment(), zone.region()).run(); + static String effectiveServices(File servicesFile, ZoneId zone, InstanceName instance) throws Exception { + Document processedServicesXml = new XmlPreProcessor(servicesFile.getParentFile(), + servicesFile, + instance, + zone.environment(), + zone.region()) + .run(); Transformer transformer = TransformerFactory.newInstance().newTransformer(); transformer.setOutputProperty(OutputKeys.INDENT, "yes"); Writer writer = new StringWriter(); diff --git a/vespa-maven-plugin/src/test/java/ai/vespa/hosted/plugin/EffectiveServicesMojoTest.java b/vespa-maven-plugin/src/test/java/ai/vespa/hosted/plugin/EffectiveServicesMojoTest.java index 35f3425706d..5b472574efd 100644 --- a/vespa-maven-plugin/src/test/java/ai/vespa/hosted/plugin/EffectiveServicesMojoTest.java +++ b/vespa-maven-plugin/src/test/java/ai/vespa/hosted/plugin/EffectiveServicesMojoTest.java @@ -1,6 +1,7 @@ // Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.hosted.plugin; +import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.zone.ZoneId; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -9,6 +10,7 @@ import java.io.File; import java.nio.file.Files; import java.nio.file.Paths; +import static ai.vespa.hosted.plugin.EffectiveServicesMojo.effectiveServices; import static org.junit.jupiter.api.Assertions.assertEquals; /** @@ -24,21 +26,21 @@ class EffectiveServicesMojoTest { @DisplayName("when zone matches environment-only directive") void devServices() throws Exception { assertEquals(Files.readString(Paths.get("src/test/resources/effective-services/dev.xml")), - EffectiveServicesMojo.effectiveServices(servicesFile, ZoneId.from("dev", "us-east-3"))); + effectiveServices(servicesFile, ZoneId.from("dev", "us-east-3"), InstanceName.defaultName())); } @Test @DisplayName("when zone matches region-and-environment directive") void prodUsEast3() throws Exception { assertEquals(Files.readString(Paths.get("src/test/resources/effective-services/prod_us-east-3.xml")), - EffectiveServicesMojo.effectiveServices(servicesFile, ZoneId.from("prod", "us-east-3"))); + effectiveServices(servicesFile, ZoneId.from("prod", "us-east-3"), InstanceName.defaultName())); } @Test @DisplayName("when zone doesn't match any directives") void prodUsWest1Services() throws Exception { assertEquals(Files.readString(Paths.get("src/test/resources/effective-services/prod_us-west-1.xml")), - EffectiveServicesMojo.effectiveServices(servicesFile, ZoneId.from("prod", "us-west-1"))); + effectiveServices(servicesFile, ZoneId.from("prod", "us-west-1"), InstanceName.defaultName())); } } |