diff options
Diffstat (limited to 'config-application-package/src/main/java/com')
3 files changed, 53 insertions, 10 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java index 6f76343d6ed..bb456d95326 100644 --- a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java +++ b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.application; +import com.yahoo.config.provision.CloudName; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.RegionName; @@ -41,18 +42,21 @@ class OverrideProcessor implements PreProcessor { private final InstanceName instance; private final Environment environment; private final RegionName region; + private final CloudName cloud; private final Tags tags; private static final String ID_ATTRIBUTE = "id"; private static final String INSTANCE_ATTRIBUTE = "instance"; private static final String ENVIRONMENT_ATTRIBUTE = "environment"; private static final String REGION_ATTRIBUTE = "region"; + private static final String CLOUD_ATTRIBUTE = "cloud"; private static final String TAGS_ATTRIBUTE = "tags"; - public OverrideProcessor(InstanceName instance, Environment environment, RegionName region, Tags tags) { + public OverrideProcessor(InstanceName instance, Environment environment, RegionName region, CloudName cloud, Tags tags) { this.instance = instance; this.environment = environment; this.region = region; + this.cloud = cloud; this.tags = tags; } @@ -83,6 +87,7 @@ class OverrideProcessor implements PreProcessor { child.removeAttributeNS(XmlPreProcessor.deployNamespaceUri, INSTANCE_ATTRIBUTE); child.removeAttributeNS(XmlPreProcessor.deployNamespaceUri, ENVIRONMENT_ATTRIBUTE); child.removeAttributeNS(XmlPreProcessor.deployNamespaceUri, REGION_ATTRIBUTE); + child.removeAttributeNS(XmlPreProcessor.deployNamespaceUri, CLOUD_ATTRIBUTE); child.removeAttributeNS(XmlPreProcessor.deployNamespaceUri, TAGS_ATTRIBUTE); } } @@ -91,6 +96,7 @@ class OverrideProcessor implements PreProcessor { Set<InstanceName> instances = context.instances; Set<Environment> environments = context.environments; Set<RegionName> regions = context.regions; + Set<CloudName> clouds = context.clouds; Tags tags = context.tags; if (instances.isEmpty()) instances = getInstances(parent); @@ -98,9 +104,11 @@ class OverrideProcessor implements PreProcessor { environments = getEnvironments(parent); if (regions.isEmpty()) regions = getRegions(parent); + if(clouds.isEmpty()) + clouds = getClouds(parent); if (tags.isEmpty()) tags = getTags(parent); - return Context.create(instances, environments, regions, tags); + return Context.create(instances, environments, regions, clouds, tags); } /** @@ -108,7 +116,7 @@ class OverrideProcessor implements PreProcessor { * * @param parent parent {@link Element} above children. * @param children children where one {@link Element} will remain as the overriding element - * @param context current context with instance, environment and region. + * @param context current context with instance, environment, region and cloud */ private void pruneOverrides(Element parent, List<Element> children, Context context) { checkConsistentInheritance(children, context); @@ -136,6 +144,12 @@ class OverrideProcessor implements PreProcessor { ") are not a subset of those of the parent (" + context.regions + ") at " + child); } + Set<CloudName> clouds = getClouds(child); + if ( ! clouds.isEmpty() && ! context.clouds.isEmpty() && ! context.clouds.containsAll(clouds)) { + throw new IllegalArgumentException("Clouds in child (" + regions + + ") are not a subset of those of the parent (" + context.clouds + ") at " + child); + } + Tags tags = getTags(child); if ( ! tags.isEmpty() && ! context.tags.isEmpty() && ! context.tags.containsAll(tags)) { throw new IllegalArgumentException("Tags in child (" + environments + @@ -149,7 +163,7 @@ class OverrideProcessor implements PreProcessor { Iterator<Element> elemIt = children.iterator(); while (elemIt.hasNext()) { Element child = elemIt.next(); - if ( ! matches(getInstances(child), getEnvironments(child), getRegions(child), getTags(child))) { + if ( ! matches(getInstances(child), getEnvironments(child), getRegions(child), getClouds(child), getTags(child))) { parent.removeChild(child); elemIt.remove(); } @@ -159,6 +173,7 @@ class OverrideProcessor implements PreProcessor { private boolean matches(Set<InstanceName> elementInstances, Set<Environment> elementEnvironments, Set<RegionName> elementRegions, + Set<CloudName> elementClouds, Tags elementTags) { if ( ! elementInstances.isEmpty()) { // match instance if ( ! elementInstances.contains(instance)) return false; @@ -172,6 +187,10 @@ class OverrideProcessor implements PreProcessor { if ( ! elementRegions.contains(region)) return false; } + if ( ! elementClouds.isEmpty()) { // match cloud + if ( ! elementClouds.contains(cloud)) return false; + } + if ( ! elementTags.isEmpty()) { // match tags if ( ! elementTags.intersects(tags)) return false; } @@ -215,6 +234,7 @@ class OverrideProcessor implements PreProcessor { Set<InstanceName> elementInstances = hasInstance(child) ? getInstances(child) : context.instances; Set<Environment> elementEnvironments = hasEnvironment(child) ? getEnvironments(child) : context.environments; Set<RegionName> elementRegions = hasRegion(child) ? getRegions(child) : context.regions; + Set<CloudName> elementClouds = hasCloud(child) ? getClouds(child) : context.clouds; Tags elementTags = hasTag(child) ? getTags(child) : context.tags; if ( ! elementInstances.isEmpty() && elementInstances.contains(instance)) currentMatch++; @@ -222,6 +242,8 @@ class OverrideProcessor implements PreProcessor { currentMatch++; if ( ! elementRegions.isEmpty() && elementRegions.contains(region)) currentMatch++; + if ( ! elementClouds.isEmpty() && elementClouds.contains(cloud)) + currentMatch++; if ( elementTags.intersects(tags)) currentMatch++; return currentMatch; @@ -253,7 +275,7 @@ class OverrideProcessor implements PreProcessor { List<Element> elements = it.next().getValue(); boolean hasOverrides = false; for (Element element : elements) { - if (hasInstance(element) || hasEnvironment(element) || hasRegion(element) || hasTag(element)) { + if (hasInstance(element) || hasEnvironment(element) || hasRegion(element) || hasCloud(element) || hasTag(element)) { hasOverrides = true; } } @@ -271,6 +293,10 @@ class OverrideProcessor implements PreProcessor { return element.hasAttributeNS(XmlPreProcessor.deployNamespaceUri, REGION_ATTRIBUTE); } + private boolean hasCloud(Element element) { + return element.hasAttributeNS(XmlPreProcessor.deployNamespaceUri, CLOUD_ATTRIBUTE); + } + private boolean hasEnvironment(Element element) { return element.hasAttributeNS(XmlPreProcessor.deployNamespaceUri, ENVIRONMENT_ATTRIBUTE); } @@ -297,6 +323,12 @@ class OverrideProcessor implements PreProcessor { return Arrays.stream(reg.split(" ")).map(RegionName::from).collect(Collectors.toSet()); } + private Set<CloudName> getClouds(Element element) { + String reg = element.getAttributeNS(XmlPreProcessor.deployNamespaceUri, CLOUD_ATTRIBUTE); + if (reg == null || reg.isEmpty()) return Set.of(); + return Arrays.stream(reg.split(" ")).map(CloudName::from).collect(Collectors.toSet()); + } + private Tags getTags(Element element) { String env = element.getAttributeNS(XmlPreProcessor.deployNamespaceUri, TAGS_ATTRIBUTE); if (env == null || env.isEmpty()) return Tags.empty(); @@ -357,27 +389,31 @@ class OverrideProcessor implements PreProcessor { final Set<InstanceName> instances; final Set<Environment> environments; final Set<RegionName> regions; + final Set<CloudName> clouds; final Tags tags; private Context(Set<InstanceName> instances, Set<Environment> environments, Set<RegionName> regions, + Set<CloudName> clouds, Tags tags) { this.instances = Set.copyOf(instances); this.environments = Set.copyOf(environments); this.regions = Set.copyOf(regions); + this.clouds = Set.copyOf(clouds); this.tags = tags; } static Context empty() { - return new Context(Set.of(), Set.of(), Set.of(), Tags.empty()); + return new Context(Set.of(), Set.of(), Set.of(), Set.of(), Tags.empty()); } public static Context create(Set<InstanceName> instances, Set<Environment> environments, Set<RegionName> regions, + Set<CloudName> clouds, Tags tags) { - return new Context(instances, environments, regions, tags); + return new Context(instances, environments, regions, clouds, tags); } } diff --git a/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java index b07ea0a7ee1..3b5f9c14b69 100644 --- a/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java +++ b/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java @@ -2,6 +2,7 @@ package com.yahoo.config.application; import com.yahoo.config.application.FileSystemWrapper.FileWrapper; +import com.yahoo.config.provision.CloudName; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.RegionName; @@ -20,7 +21,6 @@ import java.io.IOException; import java.io.Reader; import java.util.ArrayList; import java.util.List; -import java.util.Set; /** * A preprocessor for services.xml files that handles deploy:environment, deploy:region, preprocess:properties, preprocess:include @@ -40,6 +40,7 @@ public class XmlPreProcessor { private final InstanceName instance; private final Environment environment; private final RegionName region; + private final CloudName cloud; private final Tags tags; private final List<PreProcessor> chain; @@ -48,8 +49,9 @@ public class XmlPreProcessor { InstanceName instance, Environment environment, RegionName region, + CloudName cloud, Tags tags) throws IOException { - this(applicationDir, new FileReader(xmlInput), instance, environment, region, tags); + this(applicationDir, new FileReader(xmlInput), instance, environment, region, cloud, tags); } public XmlPreProcessor(File applicationDir, @@ -57,12 +59,14 @@ public class XmlPreProcessor { InstanceName instance, Environment environment, RegionName region, + CloudName cloud, Tags tags) { this(FileSystemWrapper.getDefault(applicationDir.toPath()).wrap(applicationDir.toPath()), xmlInput, instance, environment, region, + cloud, tags); } @@ -71,12 +75,14 @@ public class XmlPreProcessor { InstanceName instance, Environment environment, RegionName region, + CloudName cloud, Tags tags) { this.applicationDir = applicationDir; this.xmlInput = xmlInput; this.instance = instance; this.environment = environment; this.region = region; + this.cloud = cloud; this.tags = tags; this.chain = setupChain(); } @@ -97,7 +103,7 @@ public class XmlPreProcessor { private List<PreProcessor> setupChain() { List<PreProcessor> chain = new ArrayList<>(); chain.add(new IncludeProcessor(applicationDir)); - chain.add(new OverrideProcessor(instance, environment, region, tags)); + chain.add(new OverrideProcessor(instance, environment, region, cloud, tags)); chain.add(new PropertiesProcessor()); chain.add(new ValidationProcessor()); // must be last in chain return chain; diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java index ab5645eb50d..7d8f827bf31 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java @@ -598,6 +598,7 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { instance, zone.environment(), zone.region(), + zone.cloud().name(), getDeploymentSpec().instance(instance) .map(DeploymentInstanceSpec::tags) .orElse(Tags.empty())) |