diff options
| author | Morten Tokle <mortent@verizonmedia.com> | 2020-03-17 15:07:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 15:07:25 +0100 |
| commit | b2d5ec8958eaed2d5ab0bd6b52fd8450abc0d24a (patch) | |
| tree | 8d3a32e0aad84692a73eba8d392182a1bba571ad /config-model-api | |
| parent | 2d1582792110f24f2599ccd35641485285fc81bd (diff) | |
| parent | d7b11233343e4b966b3f904b48fa6d5fee8e0356 (diff) | |
Merge pull request #12591 from vespa-engine/mortent/deploy-with-athenzdomain
deploy with athenzdomain
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/abi-spec.json | 3 | ||||
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index dc67b6537e5..ada3119f5bb 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -883,7 +883,8 @@ "public abstract boolean useBucketSpaceMetric()", "public boolean useNewAthenzFilter()", "public boolean usePhraseSegmenting()", - "public java.lang.String proxyProtocol()" + "public java.lang.String proxyProtocol()", + "public java.util.Optional athenzDomain()" ], "fields": [] }, diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 39d1f8096b6..7fcde1b5e6b 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -6,6 +6,7 @@ import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.application.api.FileRegistry; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.AthenzDomain; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.Zone; @@ -65,6 +66,7 @@ public interface ModelContext { default boolean useNewAthenzFilter() { return false; } default boolean usePhraseSegmenting() { return false; } default String proxyProtocol() { return "https-only"; } + default Optional<AthenzDomain> athenzDomain() { return Optional.empty(); } } } |