[knox] branch master updated: KNOX-2948 - HXR parser can handle the new 'provisionEncryptQueryStringCredential' boolean field in SimpleDescriptor (#793)

[smolnar]

This is an automated email from the ASF dual-hosted git repository.

smolnar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git


The following commit(s) were added to refs/heads/master by this push:
     new 550bcc401 KNOX-2948 - HXR parser can handle the new 
'provisionEncryptQueryStringCredential' boolean field in SimpleDescriptor (#793)
550bcc401 is described below

commit 550bcc401a6cfe84a88778ab13f1a22504c83abc
Author: Sandor Molnar <smol...@apache.org>
AuthorDate: Mon Sep 11 11:07:23 2023 +0200

    KNOX-2948 - HXR parser can handle the new 
'provisionEncryptQueryStringCredential' boolean field in SimpleDescriptor (#793)
---
 .../knox/gateway/topology/hadoop/xml/HadoopXmlResourceParser.java     | 4 ++++
 .../knox/gateway/topology/hadoop/xml/HadoopXmlResourceParserTest.java | 3 +++
 gateway-topology-hadoop-xml/src/test/resources/testDescriptor.xml     | 1 +
 3 files changed, 8 insertions(+)

diff --git 
a/gateway-topology-hadoop-xml/src/main/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceParser.java
 
b/gateway-topology-hadoop-xml/src/main/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceParser.java
index 4e1dfce60..a66c36361 100644
--- 
a/gateway-topology-hadoop-xml/src/main/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceParser.java
+++ 
b/gateway-topology-hadoop-xml/src/main/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceParser.java
@@ -67,6 +67,7 @@ public class HadoopXmlResourceParser implements 
AdvancedServiceDiscoveryConfigCh
   private static final String CONFIG_NAME_DISCOVERY_PASSWORD_ALIAS = 
"discoveryPasswordAlias";
   private static final String CONFIG_NAME_DISCOVERY_CLUSTER = "cluster";
   private static final String CONFIG_NAME_PROVIDER_CONFIG_REFERENCE = 
"providerConfigRef";
+  private static final String 
CONFIG_NAME_PROVISION_ENCRYPT_QUERY_STRING_CREDENTIAL = 
"provisionEncryptQueryStringCredential";
   private static final String CONFIG_NAME_APPLICATION_PREFIX = "app";
   private static final String CONFIG_NAME_SERVICE_URL = "url";
   private static final String CONFIG_NAME_SERVICE_VERSION = "version";
@@ -266,6 +267,9 @@ public class HadoopXmlResourceParser implements 
AdvancedServiceDiscoveryConfigCh
         case CONFIG_NAME_PROVIDER_CONFIG_REFERENCE:
           descriptor.setProviderConfig(parameterPairParts[1].trim());
           break;
+        case CONFIG_NAME_PROVISION_ENCRYPT_QUERY_STRING_CREDENTIAL:
+          
descriptor.setProvisionEncryptQueryStringCredential(Boolean.valueOf(parameterPairParts[1].trim()));
+          break;
         default:
           if (parameterName.startsWith(CONFIG_NAME_APPLICATION_PREFIX)) {
             parseApplication(descriptor, configurationPair.trim());
diff --git 
a/gateway-topology-hadoop-xml/src/test/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceParserTest.java
 
b/gateway-topology-hadoop-xml/src/test/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceParserTest.java
index f8329f3e7..a0e78f619 100644
--- 
a/gateway-topology-hadoop-xml/src/test/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceParserTest.java
+++ 
b/gateway-topology-hadoop-xml/src/test/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceParserTest.java
@@ -17,6 +17,7 @@
 package org.apache.knox.gateway.topology.hadoop.xml;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -264,6 +265,7 @@ public class HadoopXmlResourceParserTest {
     assertEquals("alias", descriptor.getDiscoveryPasswordAlias());
     assertEquals("Cluster 1", descriptor.getCluster());
     assertEquals("topology1-provider", descriptor.getProviderConfig());
+    assertTrue(descriptor.isProvisionEncryptQueryStringCredential());
     assertEquals(2, descriptor.getApplications().size());
 
     assertApplication(descriptor, "knoxauth", 
Collections.singletonMap("param1.name", "param1.value"));
@@ -289,6 +291,7 @@ public class HadoopXmlResourceParserTest {
     assertEquals("http://host:456";, descriptor.getDiscoveryAddress());
     assertEquals("Cluster 2", descriptor.getCluster());
     assertEquals("topology2-provider", descriptor.getProviderConfig());
+    assertFalse(descriptor.isProvisionEncryptQueryStringCredential());
     assertTrue(descriptor.getApplications().isEmpty());
 
     final Map<String, String> expectedServiceParameters = Stream.of(new 
String[][] { { "httpclient.connectionTimeout", "5m" }, { 
"httpclient.socketTimeout", "100m" }, })
diff --git a/gateway-topology-hadoop-xml/src/test/resources/testDescriptor.xml 
b/gateway-topology-hadoop-xml/src/test/resources/testDescriptor.xml
index 64308a6ad..42a23fe11 100644
--- a/gateway-topology-hadoop-xml/src/test/resources/testDescriptor.xml
+++ b/gateway-topology-hadoop-xml/src/test/resources/testDescriptor.xml
@@ -39,6 +39,7 @@ limitations under the License.
         discoveryAddress=http://host:456#
         cluster=Cluster 2#
         providerConfigRef=topology2-provider#
+        provisionEncryptQueryStringCredential=false#
         ATLAS-API:url=http://localhost:456#
         ATLAS-API:httpclient.connectionTimeout=5m#
         ATLAS-API:httpclient.socketTimeout=100m#