Skip to content

Commit

Permalink
clean up unused consts in the aws common library (#2779)
Browse files Browse the repository at this point in the history 
Signed-off-by: Henry Avetisyan <[email protected]>
  • Loading branch information
@havetisyan
havetisyan authored Oct 25, 2024
1 parent b2840f7 commit 4cf147c
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 507 deletions.
50 changes: 34 additions & 16 deletions ...ws_common/src/main/java/io/athenz/server/aws/common/store/impl/AWSObjectStoreFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,24 @@ public class AWSObjectStoreFactory implements ObjectStoreFactory {

private static final Logger LOG = LoggerFactory.getLogger(AWSObjectStoreFactory.class);

public static final String ZMS_PROP_JDBC_VERIFY_SERVER_CERT = "athenz.zms.jdbc_verify_server_certificate";
public static final String ZMS_PROP_JDBC_USE_SSL = "athenz.zms.jdbc_use_ssl";
public static final String ZMS_PROP_JDBC_TLS_VERSIONS = "athenz.zms.jdbc_tls_versions";

public static final String ZMS_PROP_AWS_RDS_USER = "athenz.zms.aws_rds_user";
public static final String ZMS_PROP_AWS_RDS_ENGINE = "athenz.zms.aws_rds_engine";
public static final String ZMS_PROP_AWS_RDS_DATABASE = "athenz.zms.aws_rds_database";
public static final String ZMS_PROP_AWS_RDS_PRIMARY_INSTANCE = "athenz.zms.aws_rds_master_instance";
public static final String ZMS_PROP_AWS_RDS_PRIMARY_PORT = "athenz.zms.aws_rds_master_port";
public static final String ZMS_PROP_AWS_RDS_REPLICA_INSTANCE = "athenz.zms.aws_rds_replica_instance";
public static final String ZMS_PROP_AWS_RDS_CREDS_REFRESH_TIME = "athenz.zms.aws_rds_creds_refresh_time";

public static final String DB_PROP_USER = "user";
public static final String DB_PROP_PASSWORD = "password";
public static final String DB_PROP_USE_SSL = "useSSL";
public static final String DB_PROP_VERIFY_SERVER_CERT = "verifyServerCertificate";
public static final String DB_PROP_TLS_PROTOCOLS = "enabledTLSProtocols";

private static final String JDBC_TLS_VERSIONS = "TLSv1.2,TLSv1.3";

private static final Properties MYSQL_PRIMARY_CONNECTION_PROPERTIES = new Properties();
Expand All @@ -56,13 +74,13 @@ public class AWSObjectStoreFactory implements ObjectStoreFactory {
@Override
public ObjectStore create(PrivateKeyStore keyStore) {

rdsUser = System.getProperty(ZMSConsts.ZMS_PROP_AWS_RDS_USER);
rdsPrimary = System.getProperty(ZMSConsts.ZMS_PROP_AWS_RDS_PRIMARY_INSTANCE);
rdsReplica = System.getProperty(ZMSConsts.ZMS_PROP_AWS_RDS_REPLICA_INSTANCE);
rdsPort = Integer.parseInt(System.getProperty(ZMSConsts.ZMS_PROP_AWS_RDS_PRIMARY_PORT, "3306"));
rdsUser = System.getProperty(ZMS_PROP_AWS_RDS_USER);
rdsPrimary = System.getProperty(ZMS_PROP_AWS_RDS_PRIMARY_INSTANCE);
rdsReplica = System.getProperty(ZMS_PROP_AWS_RDS_REPLICA_INSTANCE);
rdsPort = Integer.parseInt(System.getProperty(ZMS_PROP_AWS_RDS_PRIMARY_PORT, "3306"));

final String rdsEngine = System.getProperty(ZMSConsts.ZMS_PROP_AWS_RDS_ENGINE, "mysql");
final String rdsDatabase = System.getProperty(ZMSConsts.ZMS_PROP_AWS_RDS_DATABASE, "zms_server");
final String rdsEngine = System.getProperty(ZMS_PROP_AWS_RDS_ENGINE, "mysql");
final String rdsDatabase = System.getProperty(ZMS_PROP_AWS_RDS_DATABASE, "zms_server");
final String jdbcPrimaryStore = String.format("jdbc:%s://%s:%d/%s", rdsEngine,
rdsPrimary, rdsPort, rdsDatabase);
final String rdsPrimaryToken = getAuthToken(rdsPrimary, rdsPort, rdsUser);
Expand Down Expand Up @@ -93,7 +111,7 @@ public ObjectStore create(PrivateKeyStore keyStore) {

// start our credentials refresh task

long credsRefreshTime = Integer.parseInt(System.getProperty(ZMSConsts.ZMS_PROP_AWS_RDS_CREDS_REFRESH_TIME, "300"));
long credsRefreshTime = Integer.parseInt(System.getProperty(ZMS_PROP_AWS_RDS_CREDS_REFRESH_TIME, "300"));

scheduledThreadPool = Executors.newScheduledThreadPool(1);
scheduledThreadPool.scheduleAtFixedRate(new CredentialsUpdater(), credsRefreshTime,
Expand All @@ -107,14 +125,14 @@ public void stop() {
}

void setConnectionProperties(Properties mysqlProperties, final String token) {
mysqlProperties.setProperty(ZMSConsts.DB_PROP_VERIFY_SERVER_CERT,
System.getProperty(ZMSConsts.ZMS_PROP_JDBC_VERIFY_SERVER_CERT, "true"));
mysqlProperties.setProperty(ZMSConsts.DB_PROP_USE_SSL,
System.getProperty(ZMSConsts.ZMS_PROP_JDBC_USE_SSL, "true"));
mysqlProperties.setProperty(ZMSConsts.DB_PROP_TLS_PROTOCOLS,
System.getProperty(ZMSConsts.ZMS_PROP_JDBC_TLS_VERSIONS, JDBC_TLS_VERSIONS));
mysqlProperties.setProperty(ZMSConsts.DB_PROP_USER, rdsUser);
mysqlProperties.setProperty(ZMSConsts.DB_PROP_PASSWORD, token);
mysqlProperties.setProperty(DB_PROP_VERIFY_SERVER_CERT,
System.getProperty(ZMS_PROP_JDBC_VERIFY_SERVER_CERT, "true"));
mysqlProperties.setProperty(DB_PROP_USE_SSL,
System.getProperty(ZMS_PROP_JDBC_USE_SSL, "true"));
mysqlProperties.setProperty(DB_PROP_TLS_PROTOCOLS,
System.getProperty(ZMS_PROP_JDBC_TLS_VERSIONS, JDBC_TLS_VERSIONS));
mysqlProperties.setProperty(DB_PROP_USER, rdsUser);
mysqlProperties.setProperty(DB_PROP_PASSWORD, token);
}

Region getRegion() {
Expand Down Expand Up @@ -157,7 +175,7 @@ void updateCredentials(String hostname, Properties mysqlProperties) {

final String rdsToken = getAuthToken(hostname, rdsPort, rdsUser);
if (!StringUtil.isEmpty(rdsToken)) {
mysqlProperties.setProperty(ZMSConsts.DB_PROP_PASSWORD, rdsToken);
mysqlProperties.setProperty(DB_PROP_PASSWORD, rdsToken);
}
}

Expand Down
8 changes: 6 additions & 2 deletions ...ommon/src/main/java/io/athenz/server/aws/common/store/impl/AuthHistoryDynamoDBRecord.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@

@DynamoDbBean
public class AuthHistoryDynamoDBRecord {

public static final String ZMS_DYNAMODB_URI_DOMAIN_INDEX_NAME = "uriDomain-index";
public static final String ZMS_DYNAMODB_PRINCIPAL_DOMAIN_INDEX_NAME = "principalDomain-index";

private String primaryKey;
private String uriDomain;
private String principalDomain;
Expand All @@ -42,7 +46,7 @@ public String getPrimaryKey() {
return primaryKey;
}

@DynamoDbSecondaryPartitionKey(indexNames = {ZMSConsts.ZMS_DYNAMODB_URI_DOMAIN_INDEX_NAME})
@DynamoDbSecondaryPartitionKey(indexNames = {ZMS_DYNAMODB_URI_DOMAIN_INDEX_NAME})
public String getUriDomain() {
return uriDomain;
}
Expand All @@ -51,7 +55,7 @@ public long getTtl() {
return ttl;
}

@DynamoDbSecondaryPartitionKey(indexNames = {ZMSConsts.ZMS_DYNAMODB_PRINCIPAL_DOMAIN_INDEX_NAME})
@DynamoDbSecondaryPartitionKey(indexNames = {ZMS_DYNAMODB_PRINCIPAL_DOMAIN_INDEX_NAME})
public String getPrincipalDomain() {
return principalDomain;
}
Expand Down
5 changes: 3 additions & 2 deletions .../main/java/io/athenz/server/aws/common/store/impl/DynamoDBAuthHistoryStoreConnection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,14 @@
* DynamoDBAuthHistoryStoreConnection expects that a DynamoDB table exists according to the properties in {@link AuthHistoryDynamoDBRecord}
*/
public class DynamoDBAuthHistoryStoreConnection implements AuthHistoryStoreConnection {

private static final Logger LOGGER = LoggerFactory.getLogger(DynamoDBAuthHistoryStoreConnection.class);
private final DynamoDbIndex<AuthHistoryDynamoDBRecord> principalDomainIndex;
private final DynamoDbIndex<AuthHistoryDynamoDBRecord> uriDomainIndex;

public DynamoDBAuthHistoryStoreConnection(final DynamoDbTable<AuthHistoryDynamoDBRecord> table) {
this.principalDomainIndex = table.index(ZMSConsts.ZMS_DYNAMODB_PRINCIPAL_DOMAIN_INDEX_NAME);
this.uriDomainIndex = table.index(ZMSConsts.ZMS_DYNAMODB_URI_DOMAIN_INDEX_NAME);
this.principalDomainIndex = table.index(AuthHistoryDynamoDBRecord.ZMS_DYNAMODB_PRINCIPAL_DOMAIN_INDEX_NAME);
this.uriDomainIndex = table.index(AuthHistoryDynamoDBRecord.ZMS_DYNAMODB_URI_DOMAIN_INDEX_NAME);
}

@Override
Expand Down
8 changes: 6 additions & 2 deletions ...src/main/java/io/athenz/server/aws/common/store/impl/DynamoDBAuthHistoryStoreFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,14 @@

public class DynamoDBAuthHistoryStoreFactory implements AuthHistoryStoreFactory {

public static final String ZMS_PROP_AUTH_HISTORY_DYNAMODB_TABLE = "athenz.zms.auth_history_dynamodb_table";
public static final String ZMS_DEFAULT_AUTH_HISTORY_DYNAMODB_TABLE = "Athenz-Auth-History";
public static final String ZMS_PROP_AUTH_HISTORY_DYNAMODB_REGION = "athenz.zms.auth_history_dynamodb_region";

@Override
public AuthHistoryStore create(PrivateKeyStore pkeyStore) {
final String tableName = System.getProperty(ZMSConsts.ZMS_PROP_AUTH_HISTORY_DYNAMODB_TABLE, ZMSConsts.ZMS_DEFAULT_AUTH_HISTORY_DYNAMODB_TABLE);
String region = System.getProperty(ZMSConsts.ZMS_PROP_AUTH_HISTORY_DYNAMODB_REGION);
final String tableName = System.getProperty(ZMS_PROP_AUTH_HISTORY_DYNAMODB_TABLE, ZMS_DEFAULT_AUTH_HISTORY_DYNAMODB_TABLE);
String region = System.getProperty(ZMS_PROP_AUTH_HISTORY_DYNAMODB_REGION);
if (StringUtil.isEmpty(region)) {
region = EC2MetadataUtils.getEC2InstanceRegion();
}
Expand Down
Loading

0 comments on commit 4cf147c

Please sign in to comment.