Skip to content

Add @FileExists validation #15940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebyhr merged 2 commits into from
Feb 3, 2023
Merged

Add @FileExists validation #15940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad29843
Add `@FileExists` validation
findinpath Feb 2, 2023
50ba440
empty
findinpath Feb 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...nge-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ExchangeS3Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import io.airlift.configuration.Config;
import io.airlift.configuration.ConfigDescription;
import io.airlift.configuration.ConfigSecuritySensitive;
import io.airlift.configuration.validation.FileExists;
import io.airlift.units.DataSize;
import io.airlift.units.Duration;
import io.airlift.units.MaxDataSize;
Expand Down Expand Up @@ -244,7 +245,7 @@ public ExchangeS3Config setS3PathStyleAccess(boolean s3PathStyleAccess)
return this;
}

public Optional<String> getGcsJsonKeyFilePath()
public Optional<@FileExists String> getGcsJsonKeyFilePath()
{
return gcsJsonKeyFilePath;
}
Expand Down
10 changes: 8 additions & 2 deletions ...filesystem/src/test/java/io/trino/plugin/exchange/filesystem/s3/TestExchangeS3Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
import software.amazon.awssdk.core.retry.RetryMode;
import software.amazon.awssdk.services.s3.model.StorageClass;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Map;

import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
Expand Down Expand Up @@ -54,7 +57,10 @@ public void testDefaults()

@Test
public void testExplicitPropertyMappings()
throws IOException
{
Path jsonKeyFile = Files.createTempFile(null, null);

Map<String, String> properties = ImmutableMap.<String, String>builder()
.put("exchange.s3.aws-access-key", "access")
.put("exchange.s3.aws-secret-key", "secret")
Expand All @@ -70,7 +76,7 @@ public void testExplicitPropertyMappings()
.put("exchange.s3.async-client-max-pending-connection-acquires", "999")
.put("exchange.s3.async-client-connection-acquisition-timeout", "5m")
.put("exchange.s3.path-style-access", "true")
.put("exchange.gcs.json-key-file-path", "/path/to/gcs_keyfile.json")
.put("exchange.gcs.json-key-file-path", jsonKeyFile.toString())
.put("exchange.gcs.json-key", "{}")
.buildOrThrow();

Expand All @@ -89,7 +95,7 @@ public void testExplicitPropertyMappings()
.setAsyncClientMaxPendingConnectionAcquires(999)
.setConnectionAcquisitionTimeout(new Duration(5, MINUTES))
.setS3PathStyleAccess(true)
.setGcsJsonKeyFilePath("/path/to/gcs_keyfile.json")
.setGcsJsonKeyFilePath(jsonKeyFile.toString())
.setGcsJsonKey("{}");

assertFullMapping(properties, expected);
Expand Down