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

Author: chenjian2664

docs/src/main/sphinx/object-storage/file-system-gcs.md

@@ -68,6 +68,9 @@ Cloud Storage:
 
 * - Property
   - Description
+* - `gcs.use-access-token`
+  - Flag to set usage of a client-provided OAuth 2.0 token to access Google
+    Cloud Storage. Defaults to `false`, deprecated to use `gcs.auth-type` instead.
 * - `gcs.auth-type`
   - Authentication type to use for Google Cloud Storage access. Default to `DEFAULT`.
   Supported values are:

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

@@ -16,7 +16,6 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.ConfigSecuritySensitive;
-import io.airlift.configuration.LegacyConfig;
 import io.airlift.configuration.validation.FileExists;
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
@@ -30,27 +29,15 @@
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
-import static java.util.Locale.ENGLISH;
 
 public class GcsFileSystemConfig
 {
     public enum AuthType
     {
         ACCESS_TOKEN,
         DEFAULT;
-
-        // Ensures backward compatibility with gcs.use-access-token config
-        // TRUE is mapped to ACCESS_TOKEN
-        // FALSE is mapped to DEFAULT
-        public static AuthType fromString(String value)
-        {
-            return switch (value.toUpperCase(ENGLISH)) {
-                case "TRUE" -> ACCESS_TOKEN;
-                case "FALSE" -> DEFAULT;
-                default -> valueOf(value.toUpperCase(ENGLISH));
-            };
-        }
     }
 
     private DataSize readBlockSize = DataSize.of(2, MEGABYTE);
@@ -61,7 +48,8 @@ public static AuthType fromString(String value)
     private String projectId;
     private Optional<String> endpoint = Optional.empty();
 
-    private AuthType authType = AuthType.DEFAULT;
+    private boolean useGcsAccessToken;
+    private AuthType authType;
     private String jsonKey;
     private String jsonKeyFilePath;
     private int maxRetries = 20;
@@ -157,17 +145,37 @@ public GcsFileSystemConfig setEndpoint(Optional<String> endpoint)
     @NotNull
     public AuthType getAuthType()
     {
-        return authType;
+        return Optional.ofNullable(authType).orElse(AuthType.DEFAULT);
     }
 
-    @LegacyConfig("gcs.use-access-token")
     @Config("gcs.auth-type")
     public GcsFileSystemConfig setAuthType(AuthType authType)
     {
         this.authType = authType;
         return this;
     }
 
+    @Deprecated
+    public boolean isUseGcsAccessToken()
+    {
+        return useGcsAccessToken;
+    }
+
+    @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;
+        if (useGcsAccessToken) {
+            this.authType = AuthType.ACCESS_TOKEN;
+        }
+        else {
+            this.authType = AuthType.DEFAULT;
+        }
+        return this;
+    }
+
     @Nullable
     public String getJsonKey()
     {

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

@@ -31,6 +31,7 @@
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestGcsFileSystemConfig
 {
@@ -44,7 +45,8 @@ void testDefaults()
                 .setBatchSize(100)
                 .setProjectId(null)
                 .setEndpoint(Optional.empty())
-                .setAuthType(AuthType.DEFAULT)
+                .setUseGcsAccessToken(false)
+                .setAuthType(null)
                 .setJsonKey(null)
                 .setJsonKeyFilePath(null)
                 .setMaxRetries(20)
@@ -88,7 +90,18 @@ void testExplicitPropertyMappings()
                 .setMinBackoffDelay(new Duration(20, MILLISECONDS))
                 .setMaxBackoffDelay(new Duration(20, MILLISECONDS))
                 .setApplicationId("application id");
-        assertFullMapping(properties, expected, Set.of("gcs.json-key", "gcs.json-key-file-path"));
+        assertFullMapping(properties, expected, Set.of("gcs.json-key", "gcs.json-key-file-path", "gcs.use-access-token"));
+    }
+
+    @Test
+    void testSetUseGcsAccessTokenWithAuthType()
+    {
+        assertThatThrownBy(() -> new GcsFileSystemConfig().setAuthType(AuthType.ACCESS_TOKEN).setUseGcsAccessToken(true))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Cannot set both gcs.use-access-token and gcs.auth-type");
+        assertThatThrownBy(() -> new GcsFileSystemConfig().setAuthType(AuthType.DEFAULT).setUseGcsAccessToken(false))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Cannot set both gcs.use-access-token and gcs.auth-type");
     }
 
     @Test