aboutsummaryrefslogtreecommitdiffstats
path: root/jdisc-security-filters
diff options
context:
space:
mode:
authorMorten Tokle <mortent@yahooinc.com>2022-11-22 13:33:23 +0100
committerBjørn Christian Seime <bjorncs@yahooinc.com>2022-11-22 13:43:04 +0100
commitdd070e60aa612e806c83ce7115fce08d777ff910 (patch)
tree41697913a56ddd25dba950429205ec1a08047135 /jdisc-security-filters
parent31b630d66ac9ecaac56dbaafabc5765bda7a4041 (diff)
Move config to configdefinitions
Diffstat (limited to 'jdisc-security-filters')
-rw-r--r--jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilter.java1
-rw-r--r--jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.misc.cloud-data-plane-filter.def7
-rw-r--r--jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilterTest.java1
3 files changed, 2 insertions, 7 deletions
diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilter.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilter.java
index 146b2c0cd23..04446ddd4de 100644
--- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilter.java
+++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilter.java
@@ -8,6 +8,7 @@ import com.yahoo.container.jdisc.RequestView;
import com.yahoo.jdisc.Response;
import com.yahoo.jdisc.http.filter.DiscFilterRequest;
import com.yahoo.jdisc.http.filter.security.base.JsonSecurityRequestFilterBase;
+import com.yahoo.jdisc.http.filter.security.cloud.config.CloudDataPlaneFilterConfig;
import com.yahoo.security.X509CertificateUtils;
import java.security.Principal;
diff --git a/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.misc.cloud-data-plane-filter.def b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.misc.cloud-data-plane-filter.def
deleted file mode 100644
index 570ab98aadf..00000000000
--- a/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.misc.cloud-data-plane-filter.def
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-namespace=jdisc.http.filter.security.cloud
-
-legacyMode bool default=false
-clients[].id string
-clients[].permissions[] string
-clients[].certificates[] string
diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilterTest.java
index 1ffdf3e5a77..d8b6312e90e 100644
--- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilterTest.java
+++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cloud/CloudDataPlaneFilterTest.java
@@ -7,6 +7,7 @@ import com.yahoo.container.jdisc.RequestHandlerSpec;
import com.yahoo.container.jdisc.RequestHandlerTestDriver.MockResponseHandler;
import com.yahoo.jdisc.http.HttpRequest.Method;
import com.yahoo.jdisc.http.filter.security.cloud.CloudDataPlaneFilter.ClientPrincipal;
+import com.yahoo.jdisc.http.filter.security.cloud.config.CloudDataPlaneFilterConfig;
import com.yahoo.jdisc.http.filter.util.FilterTestUtils;
import com.yahoo.security.KeyUtils;
import com.yahoo.security.X509CertificateBuilder;