Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

inventory aws_ec2 - add support for AND logic #1365

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

abikouo
Copy link
Contributor

@abikouo abikouo commented Feb 13, 2023

SUMMARY

Closes #1354

ISSUE TYPE
  • Feature Pull Request

@github-actions
Copy link

github-actions bot commented Feb 13, 2023

Docs Build 📝

Thank you for contribution!✨

The docsite for this PR is available for download as an artifact from this run:
https://github.com/ansible-collections/amazon.aws/actions/runs/4679498688

You can compare to the docs for the main branch here:
https://ansible-collections.github.io/amazon.aws/branch/main

File changes:

  • M collections/amazon/aws/aws_ec2_inventory.html
Click to see the diff comparison.

NOTE: only file modifications are shown here. New and deleted files are excluded.
See the file list and check the published docs to see those files.

diff --git a/home/runner/work/amazon.aws/amazon.aws/docsbuild/base/collections/amazon/aws/aws_ec2_inventory.html b/home/runner/work/amazon.aws/amazon.aws/docsbuild/head/collections/amazon/aws/aws_ec2_inventory.html
index f3c667d..dcb4db7 100644
--- a/home/runner/work/amazon.aws/amazon.aws/docsbuild/base/collections/amazon/aws/aws_ec2_inventory.html
+++ b/home/runner/work/amazon.aws/amazon.aws/docsbuild/head/collections/amazon/aws/aws_ec2_inventory.html
@@ -218,6 +218,32 @@ see <a class="reference internal" href="#ansible-collections-amazon-aws-aws-ec2-
 </div></td>
 </tr>
 <tr class="row-even"><td><div class="ansible-option-cell">
+<div class="ansibleOptionAnchor" id="parameter-apply_and_logic_on_exclude_filters"></div><p class="ansible-option-title" id="ansible-collections-amazon-aws-aws-ec2-inventory-parameter-apply-and-logic-on-exclude-filters"><strong>apply_and_logic_on_exclude_filters</strong></p>
+<a class="ansibleOptionLink" href="#parameter-apply_and_logic_on_exclude_filters" title="Permalink to this option"></a><p class="ansible-option-type-line"><span class="ansible-option-type">boolean</span></p>
+<p><span class="ansible-option-versionadded">added in amazon.aws 6.0.0</span></p>
+</div></td>
+<td><div class="ansible-option-cell"><p>When multiple filters are specified on the <code class="docutils literal notranslate"><span class="pre">exclude_filters</span></code>, the filters are joined with an AND, if this parameter is set to <em>true</em> therefore any instances matching all of the filters are excluded from the result.</p>
+<p class="ansible-option-line"><span class="ansible-option-choices">Choices:</span></p>
+<ul class="simple">
+<li><p><code class="ansible-option-default-bold docutils literal notranslate"><span class="pre">false</span></code> <span class="ansible-option-choices-default-mark">← (default)</span></p></li>
+<li><p><code class="ansible-option-choices-entry docutils literal notranslate"><span class="pre">true</span></code></p></li>
+</ul>
+</div></td>
+</tr>
+<tr class="row-odd"><td><div class="ansible-option-cell">
+<div class="ansibleOptionAnchor" id="parameter-apply_and_logic_on_include_filters"></div><p class="ansible-option-title" id="ansible-collections-amazon-aws-aws-ec2-inventory-parameter-apply-and-logic-on-include-filters"><strong>apply_and_logic_on_include_filters</strong></p>
+<a class="ansibleOptionLink" href="#parameter-apply_and_logic_on_include_filters" title="Permalink to this option"></a><p class="ansible-option-type-line"><span class="ansible-option-type">boolean</span></p>
+<p><span class="ansible-option-versionadded">added in amazon.aws 6.0.0</span></p>
+</div></td>
+<td><div class="ansible-option-cell"><p>When multiple filters are specified on the <code class="docutils literal notranslate"><span class="pre">include_filters</span></code> and <code class="docutils literal notranslate"><span class="pre">filters</span></code> keys, the filters are joined with an AND, if this parameter is set to <em>true</em> therefore only instances matching all of the specified filters are returned in the result.</p>
+<p class="ansible-option-line"><span class="ansible-option-choices">Choices:</span></p>
+<ul class="simple">
+<li><p><code class="ansible-option-default-bold docutils literal notranslate"><span class="pre">false</span></code> <span class="ansible-option-choices-default-mark">← (default)</span></p></li>
+<li><p><code class="ansible-option-choices-entry docutils literal notranslate"><span class="pre">true</span></code></p></li>
+</ul>
+</div></td>
+</tr>
+<tr class="row-even"><td><div class="ansible-option-cell">
 <div class="ansibleOptionAnchor" id="parameter-assume_role_arn"></div>
 <div class="ansibleOptionAnchor" id="parameter-iam_role_arn"></div><p class="ansible-option-title" id="ansible-collections-amazon-aws-aws-ec2-inventory-parameter-iam-role-arn"><span id="ansible-collections-amazon-aws-aws-ec2-inventory-parameter-assume-role-arn"></span><strong>assume_role_arn</strong></p>
 <a class="ansibleOptionLink" href="#parameter-assume_role_arn" title="Permalink to this option"></a><p class="ansible-option-type-line"><span class="ansible-option-aliases">aliases: iam_role_arn</span></p>
@@ -383,7 +409,7 @@ see <a class="reference internal" href="#ansible-collections-amazon-aws-aws-ec2-
 <td><div class="ansible-option-cell"><p>A list of filters. Any instances matching one of the filters are excluded from the result.</p>
 <p>The filters from <code class="docutils literal notranslate"><span class="pre">exclude_filters</span></code> take priority over the <code class="docutils literal notranslate"><span class="pre">include_filters</span></code> and <code class="docutils literal notranslate"><span class="pre">filters</span></code> keys</p>
 <p>Available filters are listed here <a class="reference external" href="http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-instances.html#options">http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-instances.html#options</a>.</p>
-<p>Every entry in this list triggers a search query. As such, from a performance point of view, it’s better to keep the list as short as possible.</p>
+<p>Every entry in this list triggers a search query if <code class="docutils literal notranslate"><span class="pre">apply_and_logic_on_exclude_filters</span></code> is not set to <em>true</em>. As such, from a performance point of view, it’s better to keep the list as short as possible.</p>
 <p class="ansible-option-line"><span class="ansible-option-default-bold">Default:</span> <code class="ansible-option-default docutils literal notranslate"><span class="pre">[]</span></code></p>
 </div></td>
 </tr>
@@ -476,7 +502,7 @@ see <a class="reference internal" href="#ansible-collections-amazon-aws-aws-ec2-
 </div></td>
 <td><div class="ansible-option-cell"><p>A list of filters. Any instances matching at least one of the filters are included in the result.</p>
 <p>Available filters are listed here <a class="reference external" href="http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-instances.html#options">http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-instances.html#options</a>.</p>
-<p>Every entry in this list triggers a search query. As such, from a performance point of view, it’s better to keep the list as short as possible.</p>
+<p>Every entry in this list triggers a search query if <code class="docutils literal notranslate"><span class="pre">apply_and_logic_on_include_filters</span></code> is not set to <em>true</em>. As such, from a performance point of view, it’s better to keep the list as short as possible.</p>
 <p class="ansible-option-line"><span class="ansible-option-default-bold">Default:</span> <code class="ansible-option-default docutils literal notranslate"><span class="pre">[]</span></code></p>
 </div></td>
 </tr>
@@ -882,6 +908,16 @@ see <a class="reference internal" href="#ansible-collections-amazon-aws-aws-ec2-
 <span class="w">  </span><span class="p p-Indicator">-</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">us-east-1</span>
 <span class="nt">hostvars_prefix</span><span class="p">:</span><span class="w"> </span><span class="s">&#39;aws_&#39;</span>
 <span class="nt">hostvars_suffix</span><span class="p">:</span><span class="w"> </span><span class="s">&#39;_ec2&#39;</span>
+
+<span class="c1"># Example using include_filters and apply_and_logic_on_include_filters to compose the inventory.</span>
+<span class="nt">plugin</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">aws_ec2</span>
+<span class="nt">regions</span><span class="p">:</span>
+<span class="w">  </span><span class="p p-Indicator">-</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">us-east-1</span>
+<span class="w">  </span><span class="p p-Indicator">-</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">us-west-1</span>
+<span class="nt">include_filters</span><span class="p">:</span>
+<span class="p p-Indicator">-</span><span class="w"> </span><span class="nt">tag-key</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">Role</span>
+<span class="p p-Indicator">-</span><span class="w"> </span><span class="nt">tag-key</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">Team</span>
+<span class="nt">apply_and_logic_on_include_filters</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">true</span>
 </pre></div>
 </div>
 <section id="authors">

@ansibullbot ansibullbot added community_review feature This issue/PR relates to a feature request integration tests/integration inventory inventory plugin needs_triage plugins plugin (any type) tests tests labels Feb 13, 2023
@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/675442ca110b46f8baa864140e2e7982

ansible-galaxy-importer RETRY_LIMIT in 15s
✔️ build-ansible-collection SUCCESS in 12m 15s
ansible-test-sanity-aws-ansible-python38 FAILURE in 21m 54s (non-voting)
ansible-test-sanity-aws-ansible-2.12-python38 FAILURE in 8m 52s
ansible-test-sanity-aws-ansible-2.13-python38 FAILURE in 11m 18s
ansible-test-sanity-aws-ansible-2.14 RETRY_LIMIT in 15s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 11m 12s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 9m 18s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 7m 43s
ansible-test-units-amazon-aws-python310 RETRY_LIMIT in 17s
✔️ cloud-tox-py3 SUCCESS in 7m 04s
✔️ ansible-test-changelog SUCCESS in 4m 13s
✔️ ansible-test-splitter SUCCESS in 4m 55s
✔️ integration-amazon.aws-1 SUCCESS in 15m 29s
Skipped 43 jobs

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/8eac72c80a42465283bc74c7162ba5ae

✔️ ansible-galaxy-importer SUCCESS in 10m 03s
✔️ build-ansible-collection SUCCESS in 13m 15s
✔️ ansible-test-sanity-aws-ansible-python38 SUCCESS in 12m 15s (non-voting)
✔️ ansible-test-sanity-aws-ansible-2.12-python38 SUCCESS in 11m 15s
ansible-test-sanity-aws-ansible-2.13-python38 RETRY_LIMIT in 16s
✔️ ansible-test-sanity-aws-ansible-2.14 SUCCESS in 8m 18s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 11m 23s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 12m 16s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 11m 18s
ansible-test-units-amazon-aws-python310 RETRY_LIMIT in 16s
✔️ cloud-tox-py3 SUCCESS in 8m 30s
✔️ ansible-test-changelog SUCCESS in 4m 12s
✔️ ansible-test-splitter SUCCESS in 4m 41s
✔️ integration-amazon.aws-1 SUCCESS in 13m 06s
Skipped 43 jobs

@abikouo
Copy link
Contributor Author

abikouo commented Feb 13, 2023

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/60972781957c4035ad8dbea01e1951b6

✔️ ansible-galaxy-importer SUCCESS in 3m 33s
✔️ build-ansible-collection SUCCESS in 12m 47s
✔️ ansible-test-sanity-aws-ansible-python38 SUCCESS in 11m 04s (non-voting)
✔️ ansible-test-sanity-aws-ansible-2.12-python38 SUCCESS in 10m 24s
ansible-test-sanity-aws-ansible-2.13-python38 RETRY_LIMIT in 17s
ansible-test-sanity-aws-ansible-2.14 RETRY_LIMIT in 1m 28s
ansible-test-units-amazon-aws-python36 RETRY_LIMIT in 7m 01s
ansible-test-units-amazon-aws-python38 RETRY_LIMIT in 4m 21s
ansible-test-units-amazon-aws-python39 RETRY_LIMIT in 17s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 9m 06s
✔️ cloud-tox-py3 SUCCESS in 6m 59s
✔️ ansible-test-changelog SUCCESS in 4m 19s
✔️ ansible-test-splitter SUCCESS in 4m 51s
integration-amazon.aws-1 RETRY_LIMIT in 1m 31s
Skipped 43 jobs

@abikouo
Copy link
Contributor Author

abikouo commented Feb 14, 2023

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/da5cd15422194bc89b27dddf09804c5b

✔️ ansible-galaxy-importer SUCCESS in 4m 51s
✔️ build-ansible-collection SUCCESS in 12m 18s
✔️ ansible-test-sanity-aws-ansible-python38 SUCCESS in 9m 44s (non-voting)
✔️ ansible-test-sanity-aws-ansible-2.12-python38 SUCCESS in 14m 00s
✔️ ansible-test-sanity-aws-ansible-2.13-python38 SUCCESS in 8m 45s
ansible-test-sanity-aws-ansible-2.14 RETRY_LIMIT in 16s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 12m 05s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 10m 50s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 7m 32s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 8m 15s
✔️ cloud-tox-py3 SUCCESS in 8m 14s
✔️ ansible-test-changelog SUCCESS in 4m 12s
✔️ ansible-test-splitter SUCCESS in 5m 25s
✔️ integration-amazon.aws-1 SUCCESS in 15m 27s
Skipped 43 jobs

@abikouo
Copy link
Contributor Author

abikouo commented Feb 14, 2023

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/ea5d54f070644f27aac95ddae569518e

✔️ ansible-galaxy-importer SUCCESS in 4m 03s
✔️ build-ansible-collection SUCCESS in 12m 26s
✔️ ansible-test-sanity-aws-ansible-python38 SUCCESS in 8m 42s (non-voting)
✔️ ansible-test-sanity-aws-ansible-2.12-python38 SUCCESS in 8m 57s
✔️ ansible-test-sanity-aws-ansible-2.13-python38 SUCCESS in 9m 39s
✔️ ansible-test-sanity-aws-ansible-2.14 SUCCESS in 18m 40s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 8m 27s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 9m 59s
ansible-test-units-amazon-aws-python39 RETRY_LIMIT in 16s
ansible-test-units-amazon-aws-python310 RETRY_LIMIT in 16s
✔️ cloud-tox-py3 SUCCESS in 7m 54s
✔️ ansible-test-changelog SUCCESS in 4m 11s
✔️ ansible-test-splitter SUCCESS in 4m 37s
integration-amazon.aws-1 RETRY_LIMIT in 16s
Skipped 43 jobs

@abikouo
Copy link
Contributor Author

abikouo commented Feb 15, 2023

recheck

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/4556dd80b43d4029bd6a67037e86f62a

✔️ ansible-galaxy-importer SUCCESS in 4m 27s
✔️ build-ansible-collection SUCCESS in 12m 19s
✔️ ansible-test-sanity-aws-ansible-python38 SUCCESS in 10m 56s (non-voting)
✔️ ansible-test-sanity-aws-ansible-2.12-python38 SUCCESS in 11m 33s
✔️ ansible-test-sanity-aws-ansible-2.13-python38 SUCCESS in 11m 03s
✔️ ansible-test-sanity-aws-ansible-2.14 SUCCESS in 11m 52s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 9m 58s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 10m 34s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 8m 57s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 9m 46s
✔️ cloud-tox-py3 SUCCESS in 6m 08s
✔️ ansible-test-changelog SUCCESS in 4m 14s
✔️ ansible-test-splitter SUCCESS in 4m 31s
✔️ integration-amazon.aws-1 SUCCESS in 13m 02s
Skipped 43 jobs

@abikouo abikouo force-pushed the aws_ec2_inventory_and_logic_1 branch from bf073ce to 4c14565 Compare March 6, 2023 09:54
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/42f00ecf3611495f9c76c0c27bc439b7

✔️ ansible-galaxy-importer SUCCESS in 5m 29s
✔️ build-ansible-collection SUCCESS in 48m 08s
✔️ ansible-test-sanity-aws-ansible-python38 SUCCESS in 9m 45s (non-voting)
✔️ ansible-test-sanity-aws-ansible-2.12-python38 SUCCESS in 12m 23s
✔️ ansible-test-sanity-aws-ansible-2.13-python38 SUCCESS in 11m 05s
✔️ ansible-test-sanity-aws-ansible-2.14 SUCCESS in 12m 16s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 9m 47s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 11m 17s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 10m 09s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 12m 22s
✔️ cloud-tox-py3 SUCCESS in 8m 43s
✔️ ansible-test-changelog SUCCESS in 20m 13s
✔️ ansible-test-splitter SUCCESS in 22m 22s
✔️ integration-amazon.aws-1 SUCCESS in 13m 30s
Skipped 43 jobs

@abikouo abikouo force-pushed the aws_ec2_inventory_and_logic_1 branch from 80c3ba4 to f46afa8 Compare March 8, 2023 12:08
@softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/ae6797a19ff34bdeb410bc6e543a045a

✔️ ansible-galaxy-importer SUCCESS in 4m 27s
✔️ build-ansible-collection SUCCESS in 24m 15s
✔️ ansible-test-sanity-aws-ansible-python38 SUCCESS in 12m 11s (non-voting)
✔️ ansible-test-sanity-aws-ansible-2.12-python38 SUCCESS in 11m 36s
✔️ ansible-test-sanity-aws-ansible-2.13-python38 SUCCESS in 12m 50s
✔️ ansible-test-sanity-aws-ansible-2.14 SUCCESS in 12m 41s
ansible-test-units-amazon-aws-python36 FAILURE in 9m 39s
ansible-test-units-amazon-aws-python38 FAILURE in 11m 12s
ansible-test-units-amazon-aws-python39 FAILURE in 10m 07s
ansible-test-units-amazon-aws-python310 FAILURE in 12m 25s
cloud-tox-py3 FAILURE in 6m 59s
✔️ ansible-test-changelog SUCCESS in 8m 56s
✔️ ansible-test-splitter SUCCESS in 9m 53s
✔️ integration-amazon.aws-1 SUCCESS in 17m 45s
✔️ integration-amazon.aws-2 SUCCESS in 14m 17s
✔️ integration-community.aws-1 SUCCESS in 33m 25s
integration-community.aws-2 RETRY_LIMIT in 1m 33s
✔️ integration-community.aws-3 SUCCESS in 5m 26s
✔️ integration-community.aws-4 SUCCESS in 49m 31s
✔️ integration-community.aws-5 SUCCESS in 6m 05s
✔️ integration-community.aws-6 SUCCESS in 27m 07s
✔️ integration-community.aws-7 SUCCESS in 22m 05s
✔️ integration-community.aws-8 SUCCESS in 43m 24s
✔️ integration-community.aws-9 SUCCESS in 27m 56s
✔️ integration-community.aws-10 SUCCESS in 37m 27s
✔️ integration-community.aws-11 SUCCESS in 23m 24s
✔️ integration-community.aws-12 SUCCESS in 21m 49s
✔️ integration-community.aws-13 SUCCESS in 19m 00s
✔️ integration-community.aws-14 SUCCESS in 27m 58s
✔️ integration-community.aws-15 SUCCESS in 35m 15s
✔️ integration-community.aws-16 SUCCESS in 48m 44s
✔️ integration-community.aws-17 SUCCESS in 20m 44s
✔️ integration-community.aws-18 SUCCESS in 39m 17s
✔️ integration-community.aws-19 SUCCESS in 12m 35s
✔️ integration-community.aws-20 SUCCESS in 18m 34s
✔️ integration-community.aws-21 SUCCESS in 13m 21s
Skipped 21 jobs

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/1bb4594612334459a7bc4cfa969f5217

✔️ ansible-galaxy-importer SUCCESS in 5m 14s
✔️ build-ansible-collection SUCCESS in 23m 00s
✔️ ansible-test-sanity-aws-ansible-python38 SUCCESS in 12m 53s (non-voting)
✔️ ansible-test-sanity-aws-ansible-2.12-python38 SUCCESS in 12m 22s
✔️ ansible-test-sanity-aws-ansible-2.13-python38 SUCCESS in 13m 01s
✔️ ansible-test-sanity-aws-ansible-2.14 SUCCESS in 9m 54s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 9m 58s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 11m 51s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 9m 07s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 12m 20s
✔️ cloud-tox-py3 SUCCESS in 8m 02s
✔️ ansible-test-changelog SUCCESS in 8m 23s
✔️ ansible-test-splitter SUCCESS in 9m 31s
✔️ integration-amazon.aws-1 SUCCESS in 20m 32s
Skipped 43 jobs

@abikouo abikouo force-pushed the aws_ec2_inventory_and_logic_1 branch from b38acea to 81a8707 Compare April 12, 2023 14:30
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/53595b5a7bc44401b9f42bae3113cba7

✔️ ansible-galaxy-importer SUCCESS in 4m 37s
✔️ build-ansible-collection SUCCESS in 12m 57s
✔️ ansible-test-sanity-aws-ansible-python38 SUCCESS in 9m 52s (non-voting)
✔️ ansible-test-sanity-aws-ansible-2.12-python38 SUCCESS in 10m 38s
✔️ ansible-test-sanity-aws-ansible-2.13-python38 SUCCESS in 10m 34s
✔️ ansible-test-sanity-aws-ansible-2.14 SUCCESS in 11m 21s
✔️ ansible-test-units-amazon-aws-python36 SUCCESS in 10m 31s
✔️ ansible-test-units-amazon-aws-python38 SUCCESS in 10m 31s
✔️ ansible-test-units-amazon-aws-python39 SUCCESS in 7m 57s
✔️ ansible-test-units-amazon-aws-python310 SUCCESS in 10m 57s
✔️ cloud-tox-py3 SUCCESS in 7m 14s
✔️ ansible-test-changelog SUCCESS in 4m 36s
✔️ ansible-test-splitter SUCCESS in 5m 05s
✔️ integration-amazon.aws-1 SUCCESS in 18m 17s
✔️ integration-community.aws-1 SUCCESS in 7m 52s
Skipped 42 jobs

@ansibullbot ansibullbot added needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR and removed community_review labels Jul 12, 2023
abikouo pushed a commit to abikouo/amazon.aws that referenced this pull request Sep 18, 2023
)

Re-enable integration tests for elb_network_lb

Depends-On: ansible-collections#940
SUMMARY

Re-enables integration tests for elb_network_lb
Moves from hard-coded SSL certs to generating them on the fly
Fixes bug where ip_address_type in return value wasn't updated

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
tests/integration/targets/elb_network_lb
ADDITIONAL INFORMATION

Reviewed-by: Joseph Torcasso <None>
Reviewed-by: Mark Chappell <None>
Reviewed-by: Alina Buzachis <None>
abikouo pushed a commit to abikouo/amazon.aws that referenced this pull request Sep 18, 2023
)

Re-enable integration tests for elb_network_lb

Depends-On: ansible-collections#940
SUMMARY

Re-enables integration tests for elb_network_lb
Moves from hard-coded SSL certs to generating them on the fly
Fixes bug where ip_address_type in return value wasn't updated

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
tests/integration/targets/elb_network_lb
ADDITIONAL INFORMATION

Reviewed-by: Joseph Torcasso <None>
Reviewed-by: Mark Chappell <None>
Reviewed-by: Alina Buzachis <None>
abikouo pushed a commit to abikouo/amazon.aws that referenced this pull request Oct 24, 2023
)

Re-enable integration tests for elb_network_lb

Depends-On: ansible-collections#940
SUMMARY

Re-enables integration tests for elb_network_lb
Moves from hard-coded SSL certs to generating them on the fly
Fixes bug where ip_address_type in return value wasn't updated

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
tests/integration/targets/elb_network_lb
ADDITIONAL INFORMATION

Reviewed-by: Joseph Torcasso <None>
Reviewed-by: Mark Chappell <None>
Reviewed-by: Alina Buzachis <None>
Copy link
Contributor

@tremble tremble left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently I forgot to submit my comment. I think this PR should be revivable...

Comment on lines +642 to +652
def _build_aws_filters(filters_opts, apply_and_logic):
aws_filters = []
for filter in filters_opts:
aws_boto3_filter = ansible_dict_to_boto3_filter_list(filter)
if apply_and_logic:
aws_filters += aws_boto3_filter
else:
aws_filters.append(aws_boto3_filter)
return [aws_filters] if apply_and_logic else aws_filters
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels like something which should be pulled up a level with unit tests added.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature This issue/PR relates to a feature request integration tests/integration inventory inventory plugin needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR plugins plugin (any type) tests tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

aws_ec2 inventory plugin - Filters does not support AND logic of multiple tag-key values
5 participants