Skip to content

Commit d44f988

Browse files
madsidmadsid
authored
Merge pull request #32 from w2oanalytics/ex-char-parameter
Enable setting exlude characters via environment variable
2 parents 6ec39bb + e387947 commit d44f988

File tree

15 files changed

+45
-15
lines changed

15 files changed

+45
-15
lines changed

‎SecretsManagerMongoDBRotationMultiUser/lambda_function.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,10 @@ def create_secret(service_client, arn, token):
119119
# Get the alternate username swapping between the original user and the user with _clone appended to it
120120
current_dict['username'] = get_alt_username(current_dict['username'])
121121

122+
# Get exclude characters from environment variable
123+
exclude_characters = os.environ['EXCLUDE_CHARACTERS'] if 'EXCLUDE_CHARACTERS' in os.environ else '/@"\'\\'
122124
# Generate a random password
123-
passwd = service_client.get_random_password(ExcludeCharacters='/@"\'\\')
125+
passwd = service_client.get_random_password(ExcludeCharacters=exclude_characters)
124126
current_dict['password'] = passwd['RandomPassword']
125127

126128
# Put the secret

‎SecretsManagerMongoDBRotationSingleUser/lambda_function.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,10 @@ def create_secret(service_client, arn, token):
113113
get_secret_dict(service_client, arn, "AWSPENDING", token)
114114
logger.info("createSecret: Successfully retrieved secret for %s." % arn)
115115
except service_client.exceptions.ResourceNotFoundException:
116+
# Get exclude characters from environment variable
117+
exclude_characters = os.environ['EXCLUDE_CHARACTERS'] if 'EXCLUDE_CHARACTERS' in os.environ else '/@"\'\\'
116118
# Generate a random password
117-
passwd = service_client.get_random_password(ExcludeCharacters='/@"\'\\')
119+
passwd = service_client.get_random_password(ExcludeCharacters=exclude_characters)
118120
current_dict['password'] = passwd['RandomPassword']
119121

120122
# Put the secret

‎SecretsManagerRDSMariaDBRotationMultiUser/lambda_function.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,10 @@ def create_secret(service_client, arn, token):
118118
# Get the alternate username swapping between the original user and the user with _clone appended to it
119119
current_dict['username'] = get_alt_username(current_dict['username'])
120120

121+
# Get exclude characters from environment variable
122+
exclude_characters = os.environ['EXCLUDE_CHARACTERS'] if 'EXCLUDE_CHARACTERS' in os.environ else '/@"\'\\'
121123
# Generate a random password
122-
passwd = service_client.get_random_password(ExcludeCharacters='/@"\'\\')
124+
passwd = service_client.get_random_password(ExcludeCharacters=exclude_characters)
123125
current_dict['password'] = passwd['RandomPassword']
124126

125127
# Put the secret

‎SecretsManagerRDSMariaDBRotationSingleUser/lambda_function.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,10 @@ def create_secret(service_client, arn, token):
112112
get_secret_dict(service_client, arn, "AWSPENDING", token)
113113
logger.info("createSecret: Successfully retrieved secret for %s." % arn)
114114
except service_client.exceptions.ResourceNotFoundException:
115+
# Get exclude characters from environment variable
116+
exclude_characters = os.environ['EXCLUDE_CHARACTERS'] if 'EXCLUDE_CHARACTERS' in os.environ else '/@"\'\\'
115117
# Generate a random password
116-
passwd = service_client.get_random_password(ExcludeCharacters='/@"\'\\')
118+
passwd = service_client.get_random_password(ExcludeCharacters=exclude_characters)
117119
current_dict['password'] = passwd['RandomPassword']
118120

119121
# Put the secret

‎SecretsManagerRDSMySQLRotationMultiUser/lambda_function.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,10 @@ def create_secret(service_client, arn, token):
118118
# Get the alternate username swapping between the original user and the user with _clone appended to it
119119
current_dict['username'] = get_alt_username(current_dict['username'])
120120

121+
# Get exclude characters from environment variable
122+
exclude_characters = os.environ['EXCLUDE_CHARACTERS'] if 'EXCLUDE_CHARACTERS' in os.environ else '`/@"\'\\'
121123
# Generate a random password
122-
passwd = service_client.get_random_password(ExcludeCharacters='`/@"\'\\')
124+
passwd = service_client.get_random_password(ExcludeCharacters=exclude_characters)
123125
current_dict['password'] = passwd['RandomPassword']
124126

125127
# Put the secret

‎SecretsManagerRDSMySQLRotationSingleUser/lambda_function.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,10 @@ def create_secret(service_client, arn, token):
112112
get_secret_dict(service_client, arn, "AWSPENDING", token)
113113
logger.info("createSecret: Successfully retrieved secret for %s." % arn)
114114
except service_client.exceptions.ResourceNotFoundException:
115+
# Get exclude characters from environment variable
116+
exclude_characters = os.environ['EXCLUDE_CHARACTERS'] if 'EXCLUDE_CHARACTERS' in os.environ else '/@"\'\\'
115117
# Generate a random password
116-
passwd = service_client.get_random_password(ExcludeCharacters='/@"\'\\')
118+
passwd = service_client.get_random_password(ExcludeCharacters=exclude_characters)
117119
current_dict['password'] = passwd['RandomPassword']
118120

119121
# Put the secret

‎SecretsManagerRDSOracleRotationMultiUser/lambda_function.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,10 @@ def create_secret(service_client, arn, token):
118118
# Get the alternate username swapping between the original user and the user with _CLONE appended to it
119119
current_dict['username'] = get_alt_username(current_dict['username'])
120120

121+
# Get exclude characters from environment variable
122+
exclude_characters = os.environ['EXCLUDE_CHARACTERS'] if 'EXCLUDE_CHARACTERS' in os.environ else '/@"\'\\'
121123
# Generate a random password
122-
passwd = service_client.get_random_password(ExcludeCharacters='/@"\'\\', PasswordLength=30)
124+
passwd = service_client.get_random_password(ExcludeCharacters=exclude_characters, PasswordLength=30)
123125
current_dict['password'] = passwd['RandomPassword']
124126

125127
# Put the secret

‎SecretsManagerRDSOracleRotationSingleUser/lambda_function.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,10 @@ def create_secret(service_client, arn, token):
112112
get_secret_dict(service_client, arn, "AWSPENDING", token)
113113
logger.info("createSecret: Successfully retrieved secret for %s." % arn)
114114
except service_client.exceptions.ResourceNotFoundException:
115+
# Get exclude characters from environment variable
116+
exclude_characters = os.environ['EXCLUDE_CHARACTERS'] if 'EXCLUDE_CHARACTERS' in os.environ else '/@"\'\\'
115117
# Generate a random password
116-
passwd = service_client.get_random_password(ExcludeCharacters='/@"\'\\', PasswordLength=30)
118+
passwd = service_client.get_random_password(ExcludeCharacters=exclude_characters, PasswordLength=30)
117119
current_dict['password'] = passwd['RandomPassword']
118120

119121
# Put the secret

‎SecretsManagerRDSPostgreSQLRotationMultiUser/lambda_function.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,10 @@ def create_secret(service_client, arn, token):
119119
# Get the alternate username swapping between the original user and the user with _clone appended to it
120120
current_dict['username'] = get_alt_username(current_dict['username'])
121121

122+
# Get exclude characters from environment variable
123+
exclude_characters = os.environ['EXCLUDE_CHARACTERS'] if 'EXCLUDE_CHARACTERS' in os.environ else ':/@"\'\\'
122124
# Generate a random password
123-
passwd = service_client.get_random_password(ExcludeCharacters=':/@"\'\\')
125+
passwd = service_client.get_random_password(ExcludeCharacters=exclude_characters)
124126
current_dict['password'] = passwd['RandomPassword']
125127

126128
# Put the secret

‎SecretsManagerRDSPostgreSQLRotationSingleUser/lambda_function.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,10 @@ def create_secret(service_client, arn, token):
113113
get_secret_dict(service_client, arn, "AWSPENDING", token)
114114
logger.info("createSecret: Successfully retrieved secret for %s." % arn)
115115
except service_client.exceptions.ResourceNotFoundException:
116+
# Get exclude characters from environment variable
117+
exclude_characters = os.environ['EXCLUDE_CHARACTERS'] if 'EXCLUDE_CHARACTERS' in os.environ else ':/@"\'\\'
116118
# Generate a random password
117-
passwd = service_client.get_random_password(ExcludeCharacters=':/@"\'\\')
119+
passwd = service_client.get_random_password(ExcludeCharacters=exclude_characters)
118120
current_dict['password'] = passwd['RandomPassword']
119121

120122
# Put the secret

0 commit comments

Comments
 (0)