Add Cloud SQL configs for nomulus tool (#288)

We will use a different user for nomulus tool to connect to Cloud SQL. 
This PR added corresponding configurations for that.
This commit is contained in:
Shicong Huang 2019-09-27 15:58:18 -04:00 committed by GitHub
parent 34da498958
commit 36ab0cb45c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 81 additions and 4 deletions

View file

@ -55,6 +55,15 @@ public class KmsKeyringTest {
assertThat(cloudSqlPassword).isEqualTo("cloud-sql-password-stringmoo");
}
@Test
public void test_getToolsCloudSqlPassword() throws Exception {
saveCleartextSecret("tools-cloud-sql-password-string");
String toolsCloudSqlPassword = keyring.getToolsCloudSqlPassword();
assertThat(toolsCloudSqlPassword).isEqualTo("tools-cloud-sql-password-stringmoo");
}
@Test
public void test_getRdeSigningKey() throws Exception {
saveKeyPairSecret("rde-signing-public", "rde-signing-private");

View file

@ -99,6 +99,16 @@ public class KmsUpdaterTest {
"cloud-sql-password-string", "cloud-sql-password-string/foo", getCiphertext("value1"));
}
@Test
public void test_setToolsCloudSqlPassword() {
updater.setToolsCloudSqlPassword("value1").update();
verifySecretAndSecretRevisionWritten(
"tools-cloud-sql-password-string",
"tools-cloud-sql-password-string/foo",
getCiphertext("value1"));
}
@Test
public void test_setIcannReportingPassword() {
updater.setIcannReportingPassword("value1").update();

View file

@ -57,6 +57,7 @@ public final class FakeKeyringModule {
private static final String MARKSDB_SMDRL_LOGIN_AND_PASSWORD = "smdrl:yolo";
private static final String JSON_CREDENTIAL = "json123";
private static final String CLOUD_SQL_PASSWORD = "cloudsqlpw";
private static final String TOOLS_CLOUD_SQL_PASSWORD = "toolscloudsqlpw";
@Provides
public Keyring get() {
@ -86,6 +87,11 @@ public final class FakeKeyringModule {
return CLOUD_SQL_PASSWORD;
}
@Override
public String getToolsCloudSqlPassword() {
return TOOLS_CLOUD_SQL_PASSWORD;
}
@Override
public PGPPublicKey getRdeStagingEncryptionKey() {
return rdeStagingKey.getPublicKey();