Skip to content

Commit f9834f3

Browse files
author
Bryan Donlan
committed
Don't attempt to automatically set the default region
This failed in cases where the default region isn't configured anywhere (e.g. in our travis builds...)
1 parent 3db992c commit f9834f3

File tree

2 files changed

+1
-42
lines changed

2 files changed

+1
-42
lines changed

src/main/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public interface RegionalClientSupplier {
7171
}
7272

7373
public static class Builder implements Cloneable {
74-
private String defaultRegion_ = new DefaultAwsRegionProviderChain().getRegion();
74+
private String defaultRegion_ = null;
7575
private RegionalClientSupplier regionalClientSupplier_ = null;
7676
private AWSKMSClientBuilder templateBuilder_ = null;
7777
private List<String> keyIds_ = new ArrayList<>();

src/test/java/com/amazonaws/services/kms/KMSProviderBuilderIntegrationTests.java

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -154,45 +154,4 @@ public void whenBogusEndpointIsSet_constructionFails() throws Exception {
154154
public void whenDefaultRegionSet_itIsUsedForBareKeyIds() throws Exception {
155155
// TODO: Need to set up a role to assume as bare key IDs are relative to the caller account
156156
}
157-
158-
@Test
159-
public void whenDefaultRegionIsNotSet_providerChainDefaultIsUsed() throws Exception {
160-
assertDefaultRegionConsistency();
161-
162-
String oldRegion = System.getProperty("aws.region");
163-
Assume.assumeFalse("Can't change env variables from within Java", System.getenv("AWS_REGION") != null);
164-
165-
try {
166-
System.setProperty("aws.region", "eu-central-1");
167-
assertEquals("eu-central-1", getInitialDefaultRegion());
168-
169-
System.setProperty("aws.region", "us-west-2");
170-
assertEquals("us-west-2", getInitialDefaultRegion());
171-
172-
} finally {
173-
if (oldRegion != null) {
174-
System.setProperty("aws.region", oldRegion);
175-
} else {
176-
System.clearProperty("aws.region");
177-
}
178-
}
179-
}
180-
181-
private void assertDefaultRegionConsistency() throws Exception {
182-
String initialDefault = getInitialDefaultRegion();
183-
184-
assertEquals(
185-
new DefaultAwsRegionProviderChain().getRegion(),
186-
initialDefault
187-
);
188-
}
189-
190-
private String getInitialDefaultRegion() throws NoSuchFieldException, IllegalAccessException {
191-
KmsMasterKeyProvider.Builder builder = KmsMasterKeyProvider.builder();
192-
193-
Field f = KmsMasterKeyProvider.Builder.class.getDeclaredField("defaultRegion_");
194-
f.setAccessible(true);
195-
196-
return (String) f.get(builder);
197-
}
198157
}

0 commit comments

Comments
 (0)