fixup! Replace gcs.use-access-token with gcs.auth-type configuration

Author: chenjian2664

lib/trino-filesystem-gcs/src/main/java/io/trino/filesystem/gcs/GcsFileSystemConfig.java

@@ -48,7 +48,7 @@ public enum AuthType
     private String projectId;
     private Optional<String> endpoint = Optional.empty();
 
-    private boolean useGcsAccessToken;
+    private Optional<Boolean> useGcsAccessToken = Optional.empty();
     private AuthType authType;
     private String jsonKey;
     private String jsonKeyFilePath;
@@ -151,22 +151,23 @@ public AuthType getAuthType()
     @Config("gcs.auth-type")
     public GcsFileSystemConfig setAuthType(AuthType authType)
     {
+        checkArgument(useGcsAccessToken.isEmpty(), "Cannot set both gcs.use-access-token and gcs.auth-type");
         this.authType = authType;
         return this;
     }
 
     @Deprecated
     public boolean isUseGcsAccessToken()
     {
-        return useGcsAccessToken;
+        return useGcsAccessToken.orElse(false);
     }
 
     @Deprecated
     @Config("gcs.use-access-token")
     public GcsFileSystemConfig setUseGcsAccessToken(boolean useGcsAccessToken)
     {
         checkArgument(authType == null, "Cannot set both gcs.use-access-token and gcs.auth-type");
-        this.useGcsAccessToken = useGcsAccessToken;
+        this.useGcsAccessToken = Optional.of(useGcsAccessToken);
         if (useGcsAccessToken) {
             this.authType = AuthType.ACCESS_TOKEN;
         }

lib/trino-filesystem-gcs/src/test/java/io/trino/filesystem/gcs/TestGcsFileSystemConfig.java

@@ -38,23 +38,26 @@ public class TestGcsFileSystemConfig
     @Test
     void testDefaults()
     {
-        assertRecordedDefaults(recordDefaults(GcsFileSystemConfig.class)
-                .setReadBlockSize(DataSize.of(2, MEGABYTE))
-                .setWriteBlockSize(DataSize.of(16, MEGABYTE))
-                .setPageSize(100)
-                .setBatchSize(100)
-                .setProjectId(null)
-                .setEndpoint(Optional.empty())
-                .setUseGcsAccessToken(false)
-                .setAuthType(null)
-                .setJsonKey(null)
-                .setJsonKeyFilePath(null)
-                .setMaxRetries(20)
-                .setBackoffScaleFactor(3.0)
-                .setMaxRetryTime(new Duration(25, SECONDS))
-                .setMinBackoffDelay(new Duration(10, MILLISECONDS))
-                .setMaxBackoffDelay(new Duration(2000, MILLISECONDS))
-                .setApplicationId("Trino"));
+        assertThatThrownBy(
+                () -> assertRecordedDefaults(recordDefaults(GcsFileSystemConfig.class)
+                                .setReadBlockSize(DataSize.of(2, MEGABYTE))
+                                .setWriteBlockSize(DataSize.of(16, MEGABYTE))
+                                .setPageSize(100)
+                                .setBatchSize(100)
+                                .setProjectId(null)
+                                .setEndpoint(Optional.empty())
+                                .setAuthType(null)
+                                .setJsonKey(null)
+                                .setJsonKeyFilePath(null)
+                                .setMaxRetries(20)
+                                .setBackoffScaleFactor(3.0)
+                                .setMaxRetryTime(new Duration(25, SECONDS))
+                                .setMinBackoffDelay(new Duration(10, MILLISECONDS))
+                                .setMaxBackoffDelay(new Duration(2000, MILLISECONDS))
+                                .setApplicationId("Trino")))
+                .isInstanceOf(AssertionError.class)
+                // use-access-token is not deprecated and isn't allowed to be set with auth-type
+                .hasMessage("Untested attributes: [UseGcsAccessToken]");
     }
 
     @Test
@@ -102,6 +105,12 @@ void testSetUseGcsAccessTokenWithAuthType()
         assertThatThrownBy(() -> new GcsFileSystemConfig().setAuthType(AuthType.DEFAULT).setUseGcsAccessToken(false))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("Cannot set both gcs.use-access-token and gcs.auth-type");
+        assertThatThrownBy(() -> new GcsFileSystemConfig().setUseGcsAccessToken(true).setAuthType(AuthType.ACCESS_TOKEN))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Cannot set both gcs.use-access-token and gcs.auth-type");
+        assertThatThrownBy(() -> new GcsFileSystemConfig().setUseGcsAccessToken(true).setAuthType(AuthType.DEFAULT))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Cannot set both gcs.use-access-token and gcs.auth-type");
     }
 
     @Test