Changes after rebase an already approved PR:24767 #40088

rsubra13 · 2018-05-14T16:12:31Z

SUMMARY

Rebase changes after an already approved PR:24767

ISSUE TYPE

Feature Pull Request

COMPONENT NAME

ec2_ami_copy

ANSIBLE VERSION

ansible 2.5.2

ADDITIONAL INFORMATION

Nil

When `tag_equality` is set true, use tags to determine if AMIs in different accounts are the same, and don't copy the AMI twice if they are the same. Use AnsibleAWSModule and make imports more consistent with other modules

ansibot · 2018-05-14T16:21:31Z

cc @amir343 @defunctio
click here for bot help

ryansb · 2018-05-14T16:23:01Z

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py

    version_added: "2.2"
  kms_key_id:
    description:
      - KMS key id used to encrypt image. If not specified, uses default EBS Customer Master Key (CMK) for your account.
+    required: false
+    default: null


No need to re-add these docs, as the default for any non-specified param is null

ryansb · 2018-05-14T16:24:57Z

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py

        if module.params.get('wait'):
-            delay = 15
+            ec2.get_waiter('image_available').wait(ImageIds=[image['ImageId']])


No need to wait twice - the below lines do the same "wait" while respecting max wait time.

ryansb · 2018-05-14T16:43:28Z

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py

    default: "default"
  description:
    description:
      - An optional human-readable string describing the contents and purpose of the new AMI.
  encrypted:
    description:
      - Whether or not the destination snapshots of the copied AMI should be encrypted.
+    required: false


These lines should also be removed

Removed them! Thanks @ryansb

ryansb · 2018-05-14T16:44:21Z

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py


+    module = AnsibleAWSModule(argument_spec=argument_spec)
+    # TODO: Check botocore version
    region, ec2_url, aws_connect_params = get_aws_connection_info(module, boto3=True)
    ec2 = boto3_conn(module, conn_type='client', resource='ec2', region=region, endpoint=ec2_url,


Also, these 2 lines can be replaced with ec2 = module.client('ec2') and the boto3_conn and get_aws_connection_info imports can be removed.

Done! Thanks.

ansibot · 2018-05-14T17:21:49Z

The test ansible-test sanity --test pylint [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:146:0: syntax-error unexpected indent (&lt;string&gt;, line 146)

The test ansible-test sanity --test ansible-doc --python 2.7 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: has a documentation error formatting or is missing documentation.

The test ansible-test sanity --test ansible-doc --python 2.6 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: has a documentation error formatting or is missing documentation.

The test ansible-test sanity --test ansible-doc --python 3.5 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: has a documentation error formatting or is missing documentation.

The test ansible-test sanity --test ansible-doc --python 3.6 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: has a documentation error formatting or is missing documentation.

The test ansible-test sanity --test ansible-doc --python 3.7 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: has a documentation error formatting or is missing documentation.

The test ansible-test sanity --test compile --python 2.6 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:146:4: SyntaxError: from botocore.exceptions import ClientError, NoCredentialsError, WaiterError

The test ansible-test sanity --test compile --python 2.7 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:146:4: SyntaxError: from botocore.exceptions import ClientError, NoCredentialsError, WaiterError

The test ansible-test sanity --test compile --python 3.5 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:146:4: SyntaxError: from botocore.exceptions import ClientError, NoCredentialsError, WaiterError

The test ansible-test sanity --test compile --python 3.6 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:146:4: SyntaxError: from botocore.exceptions import ClientError, NoCredentialsError, WaiterError

The test ansible-test sanity --test compile --python 3.7 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:146:4: SyntaxError: from botocore.exceptions import ClientError, NoCredentialsError, WaiterError

The test ansible-test sanity --test docs-build [explain] failed with the error:

Command "/usr/bin/python test/sanity/code-smell/docs-build.py" returned exit status 1.
>>> Standard Error
Traceback (most recent call last):
  File "test/sanity/code-smell/docs-build.py", line 101, in <module>
    main()
  File "test/sanity/code-smell/docs-build.py", line 17, in main
    raise subprocess.CalledProcessError(sphinx.returncode, cmd, output=stdout, stderr=stderr)
subprocess.CalledProcessError: Command '['make', 'singlehtmldocs']' returned non-zero exit status 2.

The test ansible-test sanity --test import --python 2.6 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:146:4: IndentationError: unexpected indent

The test ansible-test sanity --test import --python 2.7 [explain] failed with 2 errors:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: IndentationError: unexpected indent (ec2_ami_copy.py, line 146) (in /root/ansible/test/runner/.tox/minimal-py27/bin/importer.py:82)
lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:146:4: IndentationError: unexpected indent

The test ansible-test sanity --test import --python 3.5 [explain] failed with 2 errors:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: IndentationError: unexpected indent (ec2_ami_copy.py, line 146) (in /root/ansible/test/runner/.tox/minimal-py35/bin/importer.py:82)
lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:146:4: IndentationError: unexpected indent

The test ansible-test sanity --test import --python 3.6 [explain] failed with 2 errors:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: IndentationError: unexpected indent (ec2_ami_copy.py, line 146) (in /root/ansible/test/runner/.tox/minimal-py36/bin/importer.py:82)
lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:146:4: IndentationError: unexpected indent

The test ansible-test sanity --test import --python 3.7 [explain] failed with 2 errors:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: IndentationError: unexpected indent (ec2_ami_copy.py, line 146) (in /root/ansible/test/runner/.tox/minimal-py37/bin/importer.py:82)
lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:146:4: IndentationError: unexpected indent

The test ansible-test sanity --test pep8 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:146:5: E113 unexpected indentation

The test ansible-test sanity --test validate-modules [explain] failed with 2 errors:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: E401 Python SyntaxError while parsing module
test/sanity/validate-modules/ignore.txt:44:1: A102 Remove since "lib/ansible/modules/cloud/amazon/ec2_ami_copy.py" passes "E325" test

The test ansible-test sanity --test yamllint [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:146:4: python-syntax-error unexpected indent (<unknown>, line 146)

click here for bot help

rsubra13

Finished with the changes!

ansibot · 2018-05-14T18:12:40Z

The test ansible-test sanity --test pylint [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:143:0: syntax-error unexpected indent (&lt;string&gt;, line 143)

The test ansible-test sanity --test ansible-doc --python 2.6 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: has a documentation error formatting or is missing documentation.

The test ansible-test sanity --test ansible-doc --python 3.5 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: has a documentation error formatting or is missing documentation.

The test ansible-test sanity --test ansible-doc --python 2.7 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: has a documentation error formatting or is missing documentation.

The test ansible-test sanity --test ansible-doc --python 3.7 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: has a documentation error formatting or is missing documentation.

The test ansible-test sanity --test ansible-doc --python 3.6 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: has a documentation error formatting or is missing documentation.

The test ansible-test sanity --test compile --python 2.6 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:143:4: SyntaxError: from botocore.exceptions import ClientError, NoCredentialsError, WaiterError

The test ansible-test sanity --test compile --python 2.7 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:143:4: SyntaxError: from botocore.exceptions import ClientError, NoCredentialsError, WaiterError

The test ansible-test sanity --test compile --python 3.5 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:143:4: SyntaxError: from botocore.exceptions import ClientError, NoCredentialsError, WaiterError

The test ansible-test sanity --test compile --python 3.6 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:143:4: SyntaxError: from botocore.exceptions import ClientError, NoCredentialsError, WaiterError

The test ansible-test sanity --test compile --python 3.7 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:143:4: SyntaxError: from botocore.exceptions import ClientError, NoCredentialsError, WaiterError

The test ansible-test sanity --test docs-build [explain] failed with the error:

Command "/usr/bin/python test/sanity/code-smell/docs-build.py" returned exit status 1.
>>> Standard Error
Traceback (most recent call last):
  File "test/sanity/code-smell/docs-build.py", line 101, in <module>
    main()
  File "test/sanity/code-smell/docs-build.py", line 17, in main
    raise subprocess.CalledProcessError(sphinx.returncode, cmd, output=stdout, stderr=stderr)
subprocess.CalledProcessError: Command '['make', 'singlehtmldocs']' returned non-zero exit status 2.

The test ansible-test sanity --test import --python 2.6 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:143:4: IndentationError: unexpected indent

The test ansible-test sanity --test import --python 2.7 [explain] failed with 2 errors:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: IndentationError: unexpected indent (ec2_ami_copy.py, line 143) (in /root/ansible/test/runner/.tox/minimal-py27/bin/importer.py:82)
lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:143:4: IndentationError: unexpected indent

The test ansible-test sanity --test import --python 3.5 [explain] failed with 2 errors:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: IndentationError: unexpected indent (ec2_ami_copy.py, line 143) (in /root/ansible/test/runner/.tox/minimal-py35/bin/importer.py:82)
lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:143:4: IndentationError: unexpected indent

The test ansible-test sanity --test import --python 3.6 [explain] failed with 2 errors:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: IndentationError: unexpected indent (ec2_ami_copy.py, line 143) (in /root/ansible/test/runner/.tox/minimal-py36/bin/importer.py:82)
lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:143:4: IndentationError: unexpected indent

The test ansible-test sanity --test import --python 3.7 [explain] failed with 2 errors:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: IndentationError: unexpected indent (ec2_ami_copy.py, line 143) (in /root/ansible/test/runner/.tox/minimal-py37/bin/importer.py:82)
lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:143:4: IndentationError: unexpected indent

The test ansible-test sanity --test pep8 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:143:5: E113 unexpected indentation

The test ansible-test sanity --test validate-modules [explain] failed with 2 errors:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:0:0: E401 Python SyntaxError while parsing module
test/sanity/validate-modules/ignore.txt:44:1: A102 Remove since "lib/ansible/modules/cloud/amazon/ec2_ami_copy.py" passes "E325" test

The test ansible-test sanity --test yamllint [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2_ami_copy.py:143:4: python-syntax-error unexpected indent (<unknown>, line 143)

click here for bot help

s-hertel · 2018-05-14T19:12:16Z

Thanks for your first contribution @rsubra13!

…ible#40088) * Allow idempotent use of ec2_ami_copy When `tag_equality` is set true, use tags to determine if AMIs in different accounts are the same, and don't copy the AMI twice if they are the same. Use AnsibleAWSModule and make imports more consistent with other modules * Update version added * More code review changes * Review changes - Recommended way to start EC2 connection

Will Thames and others added 5 commits May 14, 2018 09:50

Allow idempotent use of ec2_ami_copy

fc14043

When `tag_equality` is set true, use tags to determine if AMIs in different accounts are the same, and don't copy the AMI twice if they are the same. Use AnsibleAWSModule and make imports more consistent with other modules

Resolve merge conflicts due to rebase

2c579df

Update version added

86bd986

pep8

257cf5b

Still some leftovers from merge conflicts

f3f9781

rsubra13 mentioned this pull request May 14, 2018

Allow idempotent use of ec2_ami_copy #24767

Closed

Remove whitespaces

4bc545b

ryansb suggested changes May 14, 2018

View reviewed changes

More code review changes

bf285eb

s-hertel approved these changes May 14, 2018

View reviewed changes

ansibot removed the needs_triage Needs a first human triage before being processed. label May 14, 2018

ryansb suggested changes May 14, 2018

View reviewed changes

ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed community_review In order to be merged, this PR must follow the community review workflow. labels May 14, 2018

Review changes - Recommended way to start EC2 connection

5c94dbb

rsubra13 commented May 14, 2018

View reviewed changes

Review changes - Removed few unncessary doc

6c212ed

Sanity test Changes

6f89dd2

ryansb approved these changes May 14, 2018

View reviewed changes

PEP8

9b0bcb7

ansibot added community_review In order to be merged, this PR must follow the community review workflow. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels May 14, 2018

s-hertel merged commit 3955e52 into ansible:devel May 14, 2018

ansible locked and limited conversation to collaborators May 14, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Changes after rebase an already approved PR:24767 #40088

Changes after rebase an already approved PR:24767 #40088

rsubra13 commented May 14, 2018

ansibot commented May 14, 2018

ryansb May 14, 2018

ryansb May 14, 2018

ryansb May 14, 2018

rsubra13 May 14, 2018

ryansb May 14, 2018

rsubra13 May 14, 2018

ansibot commented May 14, 2018

rsubra13 left a comment

ansibot commented May 14, 2018

s-hertel commented May 14, 2018

Changes after rebase an already approved PR:24767 #40088

Changes after rebase an already approved PR:24767 #40088

Conversation

rsubra13 commented May 14, 2018

SUMMARY

ISSUE TYPE

COMPONENT NAME

ANSIBLE VERSION

ADDITIONAL INFORMATION

ansibot commented May 14, 2018

ryansb May 14, 2018

Choose a reason for hiding this comment

ryansb May 14, 2018

Choose a reason for hiding this comment

ryansb May 14, 2018

Choose a reason for hiding this comment

rsubra13 May 14, 2018

Choose a reason for hiding this comment

ryansb May 14, 2018

Choose a reason for hiding this comment

rsubra13 May 14, 2018

Choose a reason for hiding this comment

ansibot commented May 14, 2018

rsubra13 left a comment

Choose a reason for hiding this comment

ansibot commented May 14, 2018

s-hertel commented May 14, 2018