Add instance tags

3 files changed, 12 insertions, 6 deletions

diff --git a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java
index aaf67f6b8ea..ce85b7d6f32 100644
--- a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java
+++ b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java
@@ -43,6 +43,9 @@ public abstract class AbstractVespaMojo extends AbstractMojo {
     @Parameter(property = "instance")
     protected String instance;
 
+    @Parameter(property = "tags")
+    protected String tags;
+
     @Parameter(property = "apiKey")
     protected String apiKey;
 
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 556af8b6f85..377975b3d01 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
@@ -3,6 +3,7 @@ package ai.vespa.hosted.plugin;
 
 import com.yahoo.config.application.XmlPreProcessor;
 import com.yahoo.config.provision.InstanceName;
+import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.zone.ZoneId;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -44,16 +45,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, InstanceName.from(instance)).getBytes(StandardCharsets.UTF_8));
+        Files.write(output, effectiveServices(services, zone, InstanceName.from(instance), Tags.fromString(tags)).getBytes(StandardCharsets.UTF_8));
         getLog().info("Effective services for " + zone + " written to " + output);
     }
 
-    static String effectiveServices(File servicesFile, ZoneId zone, InstanceName instance) throws Exception {
+    static String effectiveServices(File servicesFile, ZoneId zone, InstanceName instance, Tags tags) throws Exception {
         Document processedServicesXml = new XmlPreProcessor(servicesFile.getParentFile(),
                                                             servicesFile,
                                                             instance,
                                                             zone.environment(),
-                                                            zone.region())
+                                                            zone.region(),
+                                                            tags)
                 .run();
         Transformer transformer = TransformerFactory.newInstance().newTransformer();
         transformer.setOutputProperty(OutputKeys.INDENT, "yes");
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 3cb08f5f2b6..fb7376b13cb 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
@@ -2,6 +2,7 @@
 package ai.vespa.hosted.plugin;
 
 import com.yahoo.config.provision.InstanceName;
+import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.zone.ZoneId;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -26,21 +27,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")),
-                     effectiveServices(servicesFile, ZoneId.from("dev", "us-east-3"), InstanceName.defaultName()));
+                     effectiveServices(servicesFile, ZoneId.from("dev", "us-east-3"), InstanceName.defaultName(), Tags.empty()));
     }
 
     @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")),
-                     effectiveServices(servicesFile, ZoneId.from("prod", "us-east-3"), InstanceName.defaultName()));
+                     effectiveServices(servicesFile, ZoneId.from("prod", "us-east-3"), InstanceName.defaultName(), Tags.empty()));
     }
 
     @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")),
-                     effectiveServices(servicesFile, ZoneId.from("prod", "us-west-1"), InstanceName.defaultName()));
+                     effectiveServices(servicesFile, ZoneId.from("prod", "us-west-1"), InstanceName.defaultName(), Tags.empty()));
     }
 
 }