Skip to content

Commit e40cbf4

Browse files
committed
Revert "Merge branch 's3-cmtbl-url-ignore-ssl-verification' into handle-custom-sts-endpoint"
This reverts commit a169a79, reversing changes made to f358fff.
1 parent 2f06810 commit e40cbf4

File tree

16 files changed

+12
-917
lines changed

16 files changed

+12
-917
lines changed

api/management-model/src/test/java/org/apache/polaris/core/admin/model/CatalogSerializationTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ public void testJsonFormat() throws JsonProcessingException {
7171
+ "\"storageConfigInfo\":{"
7272
+ "\"roleArn\":\"arn:aws:iam::123456789012:role/test-role\","
7373
+ "\"pathStyleAccess\":false,"
74-
+ "\"ignoreSSLVerification\":false,"
7574
+ "\"storageType\":\"S3\","
7675
+ "\"allowedLocations\":[]"
7776
+ "}}");

getting-started/minio-https/README.md

Lines changed: 0 additions & 94 deletions
This file was deleted.

getting-started/minio-https/docker-compose.yml

Lines changed: 0 additions & 150 deletions
This file was deleted.

polaris-core/src/main/java/org/apache/polaris/core/entity/CatalogEntity.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ private StorageConfigInfo getStorageInfo(Map<String, String> internalProperties)
166166
.setRegion(awsConfig.getRegion())
167167
.setEndpoint(awsConfig.getEndpoint())
168168
.setStsEndpoint(awsConfig.getStsEndpoint())
169-
.setIgnoreSSLVerification(awsConfig.getIgnoreSSLVerification())
170169
.setPathStyleAccess(awsConfig.getPathStyleAccess())
171170
.setStsUnavailable(awsConfig.getStsUnavailable())
172171
.setEndpointInternal(awsConfig.getEndpointInternal())
@@ -316,7 +315,6 @@ public Builder setStorageConfigurationInfo(
316315
.pathStyleAccess(awsConfigModel.getPathStyleAccess())
317316
.stsUnavailable(awsConfigModel.getStsUnavailable())
318317
.endpointInternal(awsConfigModel.getEndpointInternal())
319-
.ignoreSSLVerification(awsConfigModel.getIgnoreSSLVerification())
320318
.build();
321319
config = awsConfig;
322320
break;

polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsCredentialsStorageIntegration.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,7 @@ public AccessConfig getSubscopedCreds(
102102
@SuppressWarnings("resource")
103103
// Note: stsClientProvider returns "thin" clients that do not need closing
104104
StsClient stsClient =
105-
stsClientProvider.stsClient(
106-
StsDestination.of(
107-
storageConfig.getStsEndpointUri(),
108-
region,
109-
storageConfig.getIgnoreSSLVerification()));
105+
stsClientProvider.stsClient(StsDestination.of(storageConfig.getStsEndpointUri(), region));
110106

111107
AssumeRoleResponse response = stsClient.assumeRole(request.build());
112108
accessConfig.put(StorageAccessProperty.AWS_KEY_ID, response.credentials().accessKeyId());
@@ -143,12 +139,6 @@ public AccessConfig getSubscopedCreds(
143139
StorageAccessProperty.AWS_ENDPOINT.getPropertyName(), internalEndpointUri.toString());
144140
}
145141

146-
// Propagate ignore SSL verification flag so callers (e.g., FileIOFactory) can honor it when
147-
// constructing S3 clients for metadata ops.
148-
if (Boolean.TRUE.equals(storageConfig.getIgnoreSSLVerification())) {
149-
accessConfig.putInternalProperty("polaris.ignore-ssl-verification", "true");
150-
}
151-
152142
if (Boolean.TRUE.equals(storageConfig.getPathStyleAccess())) {
153143
accessConfig.put(StorageAccessProperty.AWS_PATH_STYLE_ACCESS, Boolean.TRUE.toString());
154144
}

polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsStorageConfigurationInfo.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ public URI getInternalEndpointUri() {
112112
@Nullable
113113
public abstract String getStsEndpoint();
114114

115-
/** Flag indicating whether SSL certificate verification should be disabled */
116-
public abstract @Nullable Boolean getIgnoreSSLVerification();
117-
118115
/** Returns the STS endpoint if set, defaulting to {@link #getEndpointUri()} otherwise. */
119116
@JsonIgnore
120117
@Nullable

polaris-core/src/main/java/org/apache/polaris/core/storage/aws/StsClientProvider.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,8 @@ interface StsDestination {
5252
@Value.Parameter(order = 2)
5353
Optional<String> region();
5454

55-
/** Whether to ignore SSL certificate verification */
56-
@Value.Parameter(order = 3)
57-
Optional<Boolean> ignoreSSLVerification();
58-
59-
static StsDestination of(
60-
@Nullable URI endpoint, @Nullable String region, @Nullable Boolean ignoreSSLVerification) {
61-
return ImmutableStsDestination.of(
62-
Optional.ofNullable(endpoint),
63-
Optional.ofNullable(region),
64-
Optional.ofNullable(ignoreSSLVerification));
55+
static StsDestination of(@Nullable URI endpoint, @Nullable String region) {
56+
return ImmutableStsDestination.of(Optional.ofNullable(endpoint), Optional.ofNullable(region));
6557
}
6658
}
6759
}

0 commit comments

Comments
 (0)