diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-07-26 16:02:45 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2023-07-27 13:13:21 +0200 |
commit | abc51d778d3f370e04cf79d649db59cc3e596449 (patch) | |
tree | 250e669ec0a9dcc23ca2a5ce49b63b58d61e60ef /config-model | |
parent | 34b04e11e2e75d929acf248693fb74a5e6350622 (diff) |
Remove global-service-id
Diffstat (limited to 'config-model')
10 files changed, 29 insertions, 78 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/DeploymentSpecValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/DeploymentSpecValidator.java index 0193eacba3a..d919a35c7ef 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/DeploymentSpecValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/DeploymentSpecValidator.java @@ -29,9 +29,6 @@ public class DeploymentSpecValidator extends Validator { DeploymentSpec deploymentSpec = DeploymentSpec.fromXml(deploymentReader); List<ContainerModel> containers = model.getRoot().configModelRepo().getModels(ContainerModel.class); for (DeploymentInstanceSpec instance : deploymentSpec.instances()) { - instance.globalServiceId().ifPresent(globalServiceId -> { - requireClusterId(containers, instance.name(), "Attribute 'globalServiceId'", globalServiceId); - }); instance.endpoints().forEach(endpoint -> { requireClusterId(containers, instance.name(), "Endpoint '" + endpoint.endpointId() + "'", endpoint.containerId()); diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc index d47ce81eaac..87783c1ee20 100644 --- a/config-model/src/main/resources/schema/deployment.rnc +++ b/config-model/src/main/resources/schema/deployment.rnc @@ -122,7 +122,6 @@ Perf = element perf { } Prod = element prod { - attribute global-service-id { text }? & attribute athenz-service { xsd:string }? & attribute tester-flavor { xsd:string }? & attribute cloud-account { xsd:string }? & diff --git a/config-model/src/test/cfg/application/app1/deployment.xml b/config-model/src/test/cfg/application/app1/deployment.xml index a8771123ecc..25954df1c7d 100644 --- a/config-model/src/test/cfg/application/app1/deployment.xml +++ b/config-model/src/test/cfg/application/app1/deployment.xml @@ -2,8 +2,8 @@ <deployment version="1.0"> <test/> <staging/> - <prod global-service-id="query"> - <region active="true">us-east-3</region> - <region active="false">us-west-1</region> + <prod> + <region>us-east-3</region> + <region>us-west-1</region> </prod> </deployment> diff --git a/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml b/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml index 738a3397aad..43f7d74ca69 100644 --- a/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml +++ b/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml @@ -2,7 +2,7 @@ <deployment version="1.0"> <test/> <staging/> - <prod global-service-id="query"> + <prod> <region>us-east-3</region> <region invalid="invalid">us-west-1</region> </prod> diff --git a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml index 4eaf7926078..24e1ec69507 100644 --- a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml +++ b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml @@ -2,7 +2,7 @@ <deployment version="1.0"> <test/> <staging/> - <prod global-service-id="query"> + <prod> <parallel> <instance id="hello" /> </parallel> diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java index c00b2846021..e975421002e 100644 --- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.model; -import com.google.common.io.Files; import com.yahoo.config.application.api.ApplicationMetaData; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.UnparsedConfigDefinition; @@ -35,7 +34,12 @@ import java.util.Map; import java.util.Set; import java.util.jar.JarEntry; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class ApplicationDeployTest { @@ -194,7 +198,7 @@ public class ApplicationDeployTest { void testThatAppWithInvalidParallelDeploymentFails() throws IOException { String expectedMessage = """ 4: <staging/> - 5: <prod global-service-id="query"> + 5: <prod> 6: <parallel> 7: <instance id="hello" /> 8: </parallel> diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/DeploymentSpecValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/DeploymentSpecValidatorTest.java index dba8205c0e7..92efac74530 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/DeploymentSpecValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/DeploymentSpecValidatorTest.java @@ -19,19 +19,6 @@ import static org.junit.jupiter.api.Assertions.fail; public class DeploymentSpecValidatorTest { @Test - void testDeploymentWithNonExistentGlobalId() { - var deploymentXml = "<?xml version='1.0' encoding='UTF-8'?>" + - "<deployment version='1.0'>" + - " <test />" + - " <prod global-service-id='non-existing'>" + - " <region active='true'>us-east</region>" + - " </prod>" + - "</deployment>"; - assertValidationError("Attribute 'globalServiceId' in instance default: 'non-existing' specified in " + - "deployment.xml does not match any container cluster ID", deploymentXml); - } - - @Test void testEndpointNonExistentContainerId() { var deploymentXml = "<?xml version='1.0' encoding='UTF-8'?>" + "<deployment version='1.0'>" + diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index f0c39ecc920..94d98f526a0 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -790,42 +790,6 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { } } - @Test - void logs_deployment_spec_deprecations() throws Exception { - String containerService = joinLines("<container id='foo' version='1.0'>", - " <nodes>", - " <node hostalias='host1' />", - " </nodes>", - "</container>"); - String deploymentXml = joinLines("<deployment version='1.0'>", - " <prod global-service-id='foo'>", - " <region active='true'>us-east-1</region>", - " </prod>", - "</deployment>"); - - ApplicationPackage applicationPackage = new MockApplicationPackage.Builder() - .withServices(containerService) - .withDeploymentSpec(deploymentXml) - .build(); - - TestLogger logger = new TestLogger(); - DeployState deployState = new DeployState.Builder() - .applicationPackage(applicationPackage) - .zone(new Zone(Environment.prod, RegionName.from("us-east-1"))) - .properties(new TestProperties().setHostedVespa(true)) - .deployLogger(logger) - .build(); - - createModel(root, deployState, null, DomBuilderTest.parse(containerService)); - assertFalse(logger.msgs.isEmpty()); - assertEquals(Level.WARNING, logger.msgs.get(0).getFirst()); - assertEquals(Level.WARNING, logger.msgs.get(1).getFirst()); - assertEquals("Element 'prod' contains attribute 'global-service-id' deprecated since major version 7. See https://cloud.vespa.ai/en/reference/routing#deprecated-syntax", - logger.msgs.get(0).getSecond()); - assertEquals("Element 'region' contains attribute 'active' deprecated since major version 7. See https://cloud.vespa.ai/en/reference/routing#deprecated-syntax", - logger.msgs.get(1).getSecond()); - } - private void assertComponentConfigured(ApplicationContainer container, String id) { assertTrue(container.getComponents().getComponents().stream().anyMatch(component -> id.equals(component.getComponentId().getName()))); } diff --git a/config-model/src/test/schema-test-files/deployment-with-instances.xml b/config-model/src/test/schema-test-files/deployment-with-instances.xml index 3b872f4c1cf..c9f3af49ac2 100644 --- a/config-model/src/test/schema-test-files/deployment-with-instances.xml +++ b/config-model/src/test/schema-test-files/deployment-with-instances.xml @@ -9,19 +9,19 @@ <instance id="one,two"> <block-change days="mon,tue" hours="14,15" time-zone="CET"/> - <prod global-service-id='qrs' athenz-service='other-service'> - <region active='true'>us-west-1</region> + <prod athenz-service='other-service'> + <region>us-west-1</region> <delay hours='3'/> - <region active='true'>us-central-1</region> + <region>us-central-1</region> <delay hours='3' minutes='7' seconds='13'/> - <region active='true'>us-east-3</region> + <region>us-east-3</region> <parallel> - <region active='true'>us-north-1</region> - <region active='true'>us-south-1</region> + <region>us-north-1</region> + <region>us-south-1</region> </parallel> <parallel> - <region active='true'>us-north-2</region> - <region active='true'>us-south-2</region> + <region>us-north-2</region> + <region>us-south-2</region> </parallel> </prod> <endpoints> @@ -55,7 +55,7 @@ <upgrade policy='conservative'/> <block-change days="mon,tue,wed" hours="14,15"/> <prod> - <region active='true'>us-central-1</region> + <region>us-central-1</region> </prod> <endpoints> <endpoint container-id="barz" /> diff --git a/config-model/src/test/schema-test-files/deployment.xml b/config-model/src/test/schema-test-files/deployment.xml index bc0f070d88c..8317bf4b80c 100644 --- a/config-model/src/test/schema-test-files/deployment.xml +++ b/config-model/src/test/schema-test-files/deployment.xml @@ -5,19 +5,19 @@ <staging/> <block-change revision='true' version='false' days="mon,tue" hours="14,15"/> <block-change days="mon,tue" hours="14,15" time-zone="CET"/> - <prod global-service-id='qrs' athenz-service='other-service'> - <region active='true'>us-west-1</region> + <prod athenz-service='other-service'> + <region>us-west-1</region> <delay hours='3'/> - <region active='true'>us-central-1</region> + <region>us-central-1</region> <delay hours='3' minutes='7' seconds='13'/> - <region active='true'>us-east-3</region> + <region>us-east-3</region> <parallel> - <region active='true'>us-north-1</region> - <region active='true'>us-south-1</region> + <region>us-north-1</region> + <region>us-south-1</region> </parallel> <parallel> - <region active='true'>us-north-2</region> - <region active='true'>us-south-2</region> + <region>us-north-2</region> + <region>us-south-2</region> </parallel> </prod> <endpoints> |