mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-02 14:40:19 -07:00
Bulk autopep8 (modules)
As agreed in 2017-12-07 Core meeting bulk fix pep8 issues Generated using: autopep8 1.3.3 (pycodestyle: 2.3.1) autopep8 -r --max-line-length 160 --in-place --ignore E305,E402,E722,E741 lib/ansible/modules Manually fix issues that autopep8 has introduced
This commit is contained in:
parent
d13d7e9404
commit
c57a7f05e1
314 changed files with 3462 additions and 3383 deletions
|
@ -315,12 +315,12 @@ class MavenDownloader:
|
|||
def _request(self, url, failmsg, f):
|
||||
url_to_use = url
|
||||
parsed_url = urlparse(url)
|
||||
if parsed_url.scheme=='s3':
|
||||
if parsed_url.scheme == 's3':
|
||||
parsed_url = urlparse(url)
|
||||
bucket_name = parsed_url.netloc
|
||||
key_name = parsed_url.path[1:]
|
||||
client = boto3.client('s3',aws_access_key_id=self.module.params.get('username', ''), aws_secret_access_key=self.module.params.get('password', ''))
|
||||
url_to_use = client.generate_presigned_url('get_object',Params={'Bucket':bucket_name,'Key':key_name},ExpiresIn=10)
|
||||
client = boto3.client('s3', aws_access_key_id=self.module.params.get('username', ''), aws_secret_access_key=self.module.params.get('password', ''))
|
||||
url_to_use = client.generate_presigned_url('get_object', Params={'Bucket': bucket_name, 'Key': key_name}, ExpiresIn=10)
|
||||
|
||||
req_timeout = self.module.params.get('timeout')
|
||||
|
||||
|
@ -335,7 +335,6 @@ class MavenDownloader:
|
|||
else:
|
||||
return f(response)
|
||||
|
||||
|
||||
def download(self, artifact, filename=None):
|
||||
filename = artifact.get_filename(filename)
|
||||
if not artifact.version or artifact.version == "latest":
|
||||
|
@ -402,20 +401,20 @@ class MavenDownloader:
|
|||
def main():
|
||||
|
||||
module = AnsibleModule(
|
||||
argument_spec = dict(
|
||||
group_id = dict(default=None),
|
||||
artifact_id = dict(default=None),
|
||||
version = dict(default="latest"),
|
||||
classifier = dict(default=''),
|
||||
extension = dict(default='jar'),
|
||||
repository_url = dict(default=None),
|
||||
username = dict(default=None,aliases=['aws_secret_key']),
|
||||
password = dict(default=None, no_log=True,aliases=['aws_secret_access_key']),
|
||||
state = dict(default="present", choices=["present","absent"]), # TODO - Implement a "latest" state
|
||||
timeout = dict(default=10, type='int'),
|
||||
dest = dict(type="path", default=None),
|
||||
validate_certs = dict(required=False, default=True, type='bool'),
|
||||
keep_name = dict(required=False, default=False, type='bool'),
|
||||
argument_spec=dict(
|
||||
group_id=dict(default=None),
|
||||
artifact_id=dict(default=None),
|
||||
version=dict(default="latest"),
|
||||
classifier=dict(default=''),
|
||||
extension=dict(default='jar'),
|
||||
repository_url=dict(default=None),
|
||||
username=dict(default=None, aliases=['aws_secret_key']),
|
||||
password=dict(default=None, no_log=True, aliases=['aws_secret_access_key']),
|
||||
state=dict(default="present", choices=["present", "absent"]), # TODO - Implement a "latest" state
|
||||
timeout=dict(default=10, type='int'),
|
||||
dest=dict(type="path", default=None),
|
||||
validate_certs=dict(required=False, default=True, type='bool'),
|
||||
keep_name=dict(required=False, default=False, type='bool'),
|
||||
),
|
||||
add_file_common_args=True
|
||||
)
|
||||
|
@ -429,7 +428,7 @@ def main():
|
|||
except AttributeError as e:
|
||||
module.fail_json(msg='url parsing went wrong %s' % e)
|
||||
|
||||
if parsed_url.scheme=='s3' and not HAS_BOTO:
|
||||
if parsed_url.scheme == 's3' and not HAS_BOTO:
|
||||
module.fail_json(msg='boto3 required for this module, when using s3:// repository URLs')
|
||||
|
||||
group_id = module.params["group_id"]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue