Fix PEP-8 issues in setup_gerrit.py
flake8 reported several PEP-8 issues, mostly to do with whitespace
and indentation, but also about line length.
Fix most of them using:
autopep8 --in-place
and then manually fix the line lengths.
Change-Id: I0bc7d5e5b52e50341b64e96f2ce0b42a606f4f14
diff --git a/gerrit/setup_gerrit.py b/gerrit/setup_gerrit.py
index 34fe129..0925804 100755
--- a/gerrit/setup_gerrit.py
+++ b/gerrit/setup_gerrit.py
@@ -7,6 +7,7 @@
from botocore.exceptions import ClientError
from jinja2 import Environment, FileSystemLoader
+
def get_secret(secret_name):
# Create a Secrets Manager client
session = boto3.session.Session()
@@ -21,7 +22,8 @@
)
except ClientError as e:
if e.response['Error']['Code'] == 'DecryptionFailureException':
- # Secrets Manager can't decrypt the protected secret text using the provided KMS key.
+ # Secrets Manager can't decrypt the protected secret text using the
+ # provided KMS key.
# Deal with the exception here, and/or rethrow at your discretion.
raise e
elif e.response['Error']['Code'] == 'InternalServiceErrorException':
@@ -33,7 +35,8 @@
# Deal with the exception here, and/or rethrow at your discretion.
raise e
elif e.response['Error']['Code'] == 'InvalidRequestException':
- # You provided a parameter value that is not valid for the current state of the resource.
+ # You provided a parameter value that is not valid for the current
+ # state of the resource.
# Deal with the exception here, and/or rethrow at your discretion.
raise e
elif e.response['Error']['Code'] == 'ResourceNotFoundException':
@@ -42,12 +45,14 @@
raise e
else:
# Decrypts secret using the associated KMS CMK.
- # Depending on whether the secret is a string or binary, one of these fields will be populated.
+ # Depending on whether the secret is a string or binary, one of these
+ # fields will be populated.
if 'SecretString' in get_secret_value_response:
return get_secret_value_response['SecretString']
else:
return base64.b64decode(get_secret_value_response['SecretBinary'])
+
secretIds = [
"ssh_host_ecdsa_384_key",
"ssh_host_ecdsa_384_key.pub",
@@ -64,35 +69,41 @@
GERRIT_KEY_PREFIX = "gerrit_secret_"
GERRIT_CONFIG_DIRECTORY = "/var/gerrit/etc/"
-print("Installing SSH Keys from Secret Manager in directory: " + GERRIT_CONFIG_DIRECTORY)
+print("Installing SSH Keys from Secret Manager in directory: " +
+ GERRIT_CONFIG_DIRECTORY)
for secretId in secretIds:
print("* Installing SSH Key: " + secretId)
- with open(GERRIT_CONFIG_DIRECTORY + secretId, 'w', encoding = 'utf-8') as f:
+ with open(GERRIT_CONFIG_DIRECTORY + secretId, 'w', encoding='utf-8') as f:
f.write(get_secret(GERRIT_KEY_PREFIX + secretId))
file_loader = FileSystemLoader(GERRIT_CONFIG_DIRECTORY)
env = Environment(loader=file_loader)
-print("Setting Register Email Private Key in '" + GERRIT_CONFIG_DIRECTORY + "secure.config'")
+print("Setting Register Email Private Key in '" +
+ GERRIT_CONFIG_DIRECTORY + "secure.config'")
template = env.get_template("secure.config.template")
-with open(GERRIT_CONFIG_DIRECTORY + "secure.config", 'w', encoding = 'utf-8') as f:
+with open(GERRIT_CONFIG_DIRECTORY + "secure.config", 'w',
+ encoding='utf-8') as f:
f.write(template.render(
- REGISTER_EMAIL_PRIVATE_KEY=get_secret(GERRIT_KEY_PREFIX + "registerEmailPrivateKey"),
- LDAP_PASSWORD=get_secret(GERRIT_KEY_PREFIX + "ldapPassword"),
- SMTP_PASSWORD=get_secret(GERRIT_KEY_PREFIX + "smtpPassword"))
- )
+ REGISTER_EMAIL_PRIVATE_KEY=get_secret(
+ GERRIT_KEY_PREFIX + "registerEmailPrivateKey"),
+ LDAP_PASSWORD=get_secret(GERRIT_KEY_PREFIX + "ldapPassword"),
+ SMTP_PASSWORD=get_secret(GERRIT_KEY_PREFIX + "smtpPassword"))
+ )
config = configparser.ConfigParser()
config.read('/tmp/gerrit.setup')
-print("Setting Gerrit config in '" + GERRIT_CONFIG_DIRECTORY + "gerrit.config'")
+print("Setting Gerrit config in '" + GERRIT_CONFIG_DIRECTORY +
+ "gerrit.config'")
template = env.get_template("gerrit.config.template")
-with open(GERRIT_CONFIG_DIRECTORY + "gerrit.config", 'w', encoding = 'utf-8') as f:
+with open(GERRIT_CONFIG_DIRECTORY + "gerrit.config", 'w',
+ encoding='utf-8') as f:
f.write(template.render(
- LDAP_SERVER=config['ldap']['server'],
- LDAP_USERNAME=config['ldap']['username'],
- LDAP_ACCOUNT_BASE=config['ldap']['accountBase'],
- LDAP_GROUP_BASE=config['ldap']['groupBase'],
- SMTP_SERVER=config['smtp']["server"],
- SMTP_USER=config['smtp']["user"],
- SMTP_DOMAIN=config['smtp']["domain"])
- )
+ LDAP_SERVER=config['ldap']['server'],
+ LDAP_USERNAME=config['ldap']['username'],
+ LDAP_ACCOUNT_BASE=config['ldap']['accountBase'],
+ LDAP_GROUP_BASE=config['ldap']['groupBase'],
+ SMTP_SERVER=config['smtp']["server"],
+ SMTP_USER=config['smtp']["user"],
+ SMTP_DOMAIN=config['smtp']["domain"])
+ )
