Skip to content

Commit 0f74072

Browse files
committed
Apply suggestions
1 parent 28cc919 commit 0f74072

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/permission-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
uses: gradle/actions/setup-gradle@v4
107107

108108
- name: Execute Gradle 'integrationTestDynamoPermission' task
109-
run: ./gradlew integrationTestDynamoPermission -Dscalardb.dynamo.emulator=false -Dscalardb.dynamo.region=ap-northeast-1 -Dscalardb.dynamo.access_key_id=${{ env.DYNAMO_ACCESS_KEY_ID }} -Dscalardb.dynamo.secret_access_key=${{ env.DYNAMO_SECRET_ACCESS_KEY }}
109+
run: ./gradlew integrationTestDynamoPermission -Dscalardb.dynamo.emulator_used=false -Dscalardb.dynamo.region=ap-northeast-1 -Dscalardb.dynamo.access_key_id=${{ env.DYNAMO_ACCESS_KEY_ID }} -Dscalardb.dynamo.secret_access_key=${{ env.DYNAMO_SECRET_ACCESS_KEY }}
110110

111111
- name: Upload Gradle test reports
112112
if: always()

core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoEnv.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ public final class DynamoEnv {
1010
private static final String PROP_DYNAMO_REGION = "scalardb.dynamo.region";
1111
private static final String PROP_DYNAMO_ACCESS_KEY_ID = "scalardb.dynamo.access_key_id";
1212
private static final String PROP_DYNAMO_SECRET_ACCESS_KEY = "scalardb.dynamo.secret_access_key";
13-
private static final String PROP_DYNAMO_EMULATOR = "scalardb.dynamo.emulator";
13+
private static final String PROP_DYNAMO_EMULATOR_USED = "scalardb.dynamo.emulator_used";
1414
private static final String PROP_DYNAMO_CREATE_OPTIONS = "scalardb.dynamo.create_options";
1515

1616
private static final String DEFAULT_DYNAMO_ENDPOINT_OVERRIDE = "http://localhost:8000";
1717
private static final String DEFAULT_DYNAMO_REGION = "us-west-2";
1818
private static final String DEFAULT_DYNAMO_ACCESS_KEY_ID = "fakeMyKeyId";
1919
private static final String DEFAULT_DYNAMO_SECRET_ACCESS_KEY = "fakeSecretAccessKey";
20-
private static final String DEFAULT_DYNAMO_EMULATOR = "true";
20+
private static final String DEFAULT_DYNAMO_EMULATOR_USED = "true";
2121

2222
private static final ImmutableMap<String, String> DEFAULT_DYNAMO_CREATE_OPTIONS =
2323
ImmutableMap.of(DynamoAdmin.NO_SCALING, "true", DynamoAdmin.NO_BACKUP, "true");
@@ -32,10 +32,11 @@ public static Properties getProperties(String testName) {
3232
System.getProperty(PROP_DYNAMO_ACCESS_KEY_ID, DEFAULT_DYNAMO_ACCESS_KEY_ID);
3333
String secretAccessKey =
3434
System.getProperty(PROP_DYNAMO_SECRET_ACCESS_KEY, DEFAULT_DYNAMO_SECRET_ACCESS_KEY);
35-
String isEmulator = System.getProperty(PROP_DYNAMO_EMULATOR, DEFAULT_DYNAMO_EMULATOR);
35+
String isEmulatorUsed =
36+
System.getProperty(PROP_DYNAMO_EMULATOR_USED, DEFAULT_DYNAMO_EMULATOR_USED);
3637

3738
Properties properties = new Properties();
38-
if (Boolean.parseBoolean(isEmulator) && endpointOverride != null) {
39+
if (Boolean.parseBoolean(isEmulatorUsed) && endpointOverride != null) {
3940
properties.setProperty(DynamoConfig.ENDPOINT_OVERRIDE, endpointOverride);
4041
}
4142
properties.setProperty(DatabaseConfig.CONTACT_POINTS, region);

0 commit comments

Comments
 (0)