diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-06-05 20:41:30 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:29 +0200 |
| commit | 52a0ba9c3951004884bbdfad403546ed6d2278a5 (patch) | |
| tree | 33a318539be8b99eef84ed3ac52c82fc916a804e /config-model | |
| parent | 704e91756a1df13ca3f045f5953b0ca555ce9152 (diff) | |
Remove on Vespa 8
Diffstat (limited to 'config-model')
4 files changed, 6 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java index e29ca9399e5..cc0415a7630 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java @@ -38,7 +38,7 @@ public final class AccessLogComponent extends SimpleComponent implements AccessL this(logType, compressionType, clusterName.isEmpty() ? String.format("logs/vespa/access/%s.%s", capitalize(logType.name()), "%Y%m%d%H%M%S") : - // TODO: Clean up after Vespa 8 + // TODO: Vespa > 8: Clean up VespaVersion.major == 7 ? String.format("logs/vespa/qrs/%s.%s.%s", capitalize(logType.name()), clusterName.get(), "%Y%m%d%H%M%S") : String.format("logs/vespa/access/%s.%s.%s", capitalize(logType.name()), clusterName.get(), "%Y%m%d%H%M%S"), null, diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java index a8fb486b979..f27e0b24c82 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java @@ -104,7 +104,7 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http> return builder.build(); } - // TODO(tokle,bjorncs) After Vespa 8 fail if domain is not provided through deploy properties + // TODO(tokle,bjorncs) Vespa > 8: Fail if domain is not provided through deploy properties private static AthenzDomain getAccessControlDomain(DeployState deployState, Element accessControlElem) { AthenzDomain tenantDomain = deployState.getProperties().athenzDomain().orElse(null); AthenzDomain explicitDomain = XmlHelper.getOptionalAttribute(accessControlElem, "domain") diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 552ada756b6..fb62ffb6ad1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -402,7 +402,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { // Add connection log if access log is configured if (cluster.getAllComponents().stream().anyMatch(component -> component instanceof AccessLogComponent)) { - // TODO: clean up after Vespa 8 + // TODO: Vespa > 8: Clean up if (cluster.isHostedVespa() || deployState.getVespaVersion().getMajor() == 8) { cluster.addComponent(new ConnectionLogComponent(cluster, FileConnectionLog.class, "access")); } else { diff --git a/config-model/src/main/resources/schema/container.rnc b/config-model/src/main/resources/schema/container.rnc index 71ce5df62d9..2d145e170db 100644 --- a/config-model/src/main/resources/schema/container.rnc +++ b/config-model/src/main/resources/schema/container.rnc @@ -16,9 +16,9 @@ Server = element server { } AccessControl = element access-control { - attribute domain { xsd:NCName }? & # TODO(tokle,bjorncs) Remove after Vespa 8 - attribute read { string "true" | string "false" }? & # TODO(tokle,bjorncs) Remove after Vespa 8 - attribute write { string "true" | string "false" }? & # TODO(tokle,bjorncs) Remove after Vespa 8 + attribute domain { xsd:NCName }? & # TODO(tokle,bjorncs) Vespa > 8: Remove + attribute read { string "true" | string "false" }? & # TODO(tokle,bjorncs) Vespa > 8: Remove + attribute write { string "true" | string "false" }? & # TODO(tokle,bjorncs) Vespa > 8: Remove attribute tls-handshake-client-auth {string "want" | string "need"}? & element exclude { Binding+ |