Rename configs to reflect previous refactoring

trinodb · Jul 23, 2024 · c3245af · c3245af
1 parent 96ac030
commit c3245af
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/trino-aws-proxy/src/main/java/io/trino/aws/proxy/server/TrinoAwsProxyConfig.java b/trino-aws-proxy/src/main/java/io/trino/aws/proxy/server/TrinoAwsProxyConfig.java
@@ -25,7 +25,7 @@ public class TrinoAwsProxyConfig
     private String s3Path = "/api/v1/s3Proxy/s3";
     private String stsPath = "/api/v1/s3Proxy/sts";
 
-    @Config("s3proxy.s3.hostname")
+    @Config("aws.proxy.s3.hostname")
     @ConfigDescription("Hostname to use for S3 REST operations, virtual-host style addressing is only supported if this is set")
     public TrinoAwsProxyConfig setS3HostName(String s3HostName)
     {
@@ -39,7 +39,7 @@ public Optional<String> getS3HostName()
         return s3HostName;
     }
 
-    @Config("s3proxy.s3.path")
+    @Config("aws.proxy.s3.path")
     @ConfigDescription("URL Path for S3 operations, optional")
     public TrinoAwsProxyConfig setS3Path(String s3Path)
     {
@@ -53,7 +53,7 @@ public String getS3Path()
         return s3Path;
     }
 
-    @Config("s3proxy.sts.path")
+    @Config("aws.proxy.sts.path")
     @ConfigDescription("URL Path for STS operations, optional")
     public TrinoAwsProxyConfig setStsPath(String stsPath)
     {

diff --git a/trino-aws-proxy/src/test/java/io/trino/aws/proxy/server/TestProxiedRequests.java b/trino-aws-proxy/src/test/java/io/trino/aws/proxy/server/TestProxiedRequests.java
@@ -33,7 +33,7 @@ public static class Filter
         @Override
         public TestingTrinoAwsProxyServer.Builder filter(TestingTrinoAwsProxyServer.Builder builder)
         {
-            return builder.withProperty("s3proxy.s3.path", "/api/some/s3/path");
+            return builder.withProperty("aws.proxy.s3.path", "/api/some/s3/path");
         }
     }
 

diff --git a/...o-aws-proxy/src/test/java/io/trino/aws/proxy/server/TestProxiedRequestsWithEmptyPath.java b/...o-aws-proxy/src/test/java/io/trino/aws/proxy/server/TestProxiedRequestsWithEmptyPath.java
@@ -33,7 +33,7 @@ public static class Filter
         @Override
         public TestingTrinoAwsProxyServer.Builder filter(TestingTrinoAwsProxyServer.Builder builder)
         {
-            return builder.withProperty("s3proxy.s3.path", "");
+            return builder.withProperty("aws.proxy.s3.path", "");
         }
     }
 

diff --git a/trino-aws-proxy/src/test/java/io/trino/aws/proxy/server/TestStsRequestsWithEmptyPath.java b/trino-aws-proxy/src/test/java/io/trino/aws/proxy/server/TestStsRequestsWithEmptyPath.java
@@ -32,7 +32,7 @@ public static class Filter
         @Override
         public TestingTrinoAwsProxyServer.Builder filter(TestingTrinoAwsProxyServer.Builder builder)
         {
-            return builder.withProperty("s3proxy.sts.path", "");
+            return builder.withProperty("aws.proxy.sts.path", "");
         }
     }
 

diff --git a/trino-aws-proxy/src/test/java/io/trino/aws/proxy/server/TestStsRequestsWithPath.java b/trino-aws-proxy/src/test/java/io/trino/aws/proxy/server/TestStsRequestsWithPath.java
@@ -32,7 +32,7 @@ public static class Filter
         @Override
         public TestingTrinoAwsProxyServer.Builder filter(TestingTrinoAwsProxyServer.Builder builder)
         {
-            return builder.withProperty("s3proxy.sts.path", "/api/some/sts/path");
+            return builder.withProperty("aws.proxy.sts.path", "/api/some/sts/path");
         }
     }
 

diff --git a/...aws-proxy/src/test/java/io/trino/aws/proxy/server/testing/TestingTrinoAwsProxyServer.java b/...aws-proxy/src/test/java/io/trino/aws/proxy/server/testing/TestingTrinoAwsProxyServer.java
@@ -164,7 +164,7 @@ public Builder withPySparkContainer()
 
         public Builder withServerHostName(String serverHostName)
         {
-            properties.put("s3proxy.hostname", serverHostName);
+            properties.put("aws.proxy.hostname", serverHostName);
             return this;
         }
 

diff --git a/...c/test/java/io/trino/aws/proxy/server/testing/harness/TrinoAwsProxyTestCommonModules.java b/...c/test/java/io/trino/aws/proxy/server/testing/harness/TrinoAwsProxyTestCommonModules.java
@@ -65,7 +65,7 @@ public static class WithVirtualHostEnabledProxy
         @Override
         public TestingTrinoAwsProxyServer.Builder filter(TestingTrinoAwsProxyServer.Builder builder)
         {
-            return builder.withProperty("s3proxy.s3.hostname", LOCALHOST_DOMAIN);
+            return builder.withProperty("aws.proxy.s3.hostname", LOCALHOST_DOMAIN);
         }
     }