ecs_cluster capacity provider strategy #1640

karcadia · 2023-01-05T19:05:44Z

SUMMARY

Fixes #770 - Add AWS ECS_Cluster Capacity Provider Strategy Support

ISSUE TYPE

Feature Pull Request

COMPONENT NAME

ecs_cluster

ADDITIONAL INFORMATION

When creating or updating an ECS Cluster, configure the capacity providers and capacity provider strategy as provided by the user.

Given playbook task:

- name: Create an ECS Cluster with Capacity Providers
  ecs_cluster:
    name: default
    state: present
    capacity_providers:
      - FARGATE
      - FARGATE_SPOT
    capacity_provider_strategy:
      - capacity_provider: FARGATE
        base: 1
        weight: 1
      - capacity_provider: FARGATE_SPOT
        weight: 100

Previously would throw "Unsupported parameter" and no other parameter exists to expose these features.
Now you should see changed: [localhost] with the resultant created ECS Cluster having the same providers and provider_strategy fields as provided by the user.

ansibullbot · 2023-01-05T19:07:49Z

cc @Java1Guy @jillr @markuman @s-hertel @tremble
click here for bot help

github-actions · 2023-01-05T19:09:53Z

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

softwarefactory-project-zuul · 2023-01-05T19:22:39Z

Build failed.

softwarefactory-project-zuul · 2023-01-05T19:46:30Z

Build failed.

softwarefactory-project-zuul · 2023-01-05T21:21:29Z

Build succeeded.

softwarefactory-project-zuul · 2023-01-05T23:09:11Z

Build failed.

softwarefactory-project-zuul · 2023-01-06T16:49:19Z

Build succeeded.

ansibullbot · 2023-01-10T19:14:33Z

@karcadia this PR contains the following merge commits:

c96b8c9

Please rebase your branch to remove these commits.

click here for bot help

Now a cluster will only show change if the actual content of each nested dictionary has changed instead of checking if they match exactly which was always causing change.

Rework the comparison of two lists of dictionaries to determine if an update to the cluster is needed.

softwarefactory-project-zuul · 2023-01-18T09:08:51Z

Build succeeded.

karcadia · 2023-01-18T15:26:37Z

Thanks for fixing it. Unfortunetaly the [tiny test playbook from above is failing now](https://github.com/ansible- collections/community.aws/pull/1640#issuecomment-1380664771) while adding the capacity providers to an existing ecs cluster.
"In order to maintain backwards compatibility, the capacity providers and strategy will not be changed by default.",
"Set purge_capacity_providers to True to override this behavior."
TASK [check that ecs_cluster was correctly updated] *****************************************************************************************************************************
fatal: [localhost]: FAILED! => {
"assertion": "ecs_cluster_update.changed",
"changed": false,
"evaluated_to": false,
"msg": "Assertion failed"
}

@markuman

Assuming you did not provide "purge_capacity_providers: True", this behavior is correct, at least as far as I understood the purge_capacity_providers addition. It will show changed false unless it actually updates the cp/cps which requires the purge_capacity_providers argument.

Let me know if this should be implemented differently. Thanks.

Update: I see now. Integration test updated to include purge_capacity_providers True.

… ready.

softwarefactory-project-zuul · 2023-01-18T17:56:17Z

Build succeeded.

done

markuman · 2023-01-18T19:16:05Z

@karcadia ah yes, you're right.

now I hit another error. when the same cluster is requested, it returns a change, even if nothing was changed.

TASK [create same ECS cluster (should do nothing)] ******************************************************************************************************************************
changed: [localhost]

TASK [debug] ********************************************************************************************************************************************************************
ok: [localhost] => {
    "ecs_cluster_again": {
        "changed": true,
        "cluster": {
            "activeServicesCount": 0,
            "capacityProviders": [],
            "clusterArn": "arn:aws:ecs:eu-central-1:12345677889:cluster/pxoveaxt",
            "clusterName": "pxoveaxt",
            "defaultCapacityProviderStrategy": [],
            "pendingTasksCount": 0,
            "registeredContainerInstancesCount": 0,
            "runningTasksCount": 0,
            "settings": [
                {
                    "name": "containerInsights",
                    "value": "disabled"
                }
            ],
            "statistics": [],
            "status": "ACTIVE",
            "tags": []
        },
        "failed": false
    }
}

TASK [check that ecs_cluster did not change] ************************************************************************************************************************************
fatal: [localhost]: FAILED! => {
    "assertion": "not ecs_cluster_again.changed",
    "changed": false,
    "evaluated_to": false,
    "msg": "Assertion failed"
}

…ge_capacity_providers.

softwarefactory-project-zuul · 2023-01-19T20:53:58Z

Build succeeded.

plugins/modules/ecs_cluster.py

softwarefactory-project-zuul · 2023-01-20T13:43:01Z

Build succeeded.

softwarefactory-project-zuul · 2023-01-23T11:59:18Z

Build succeeded (gate pipeline).

patchback · 2023-01-23T11:59:22Z

Backport to stable-5: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 3937464 on top of patchback/backports/stable-5/3937464f94add69462c14a48b84c6c2e672c1350/pr-1640

Backporting merged PR #1640 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/ansible-collections/community.aws.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/stable-5/3937464f94add69462c14a48b84c6c2e672c1350/pr-1640 upstream/stable-5

Now, cherry-pick PR ecs_cluster capacity provider strategy #1640 contents into that branch:
```
$ git cherry-pick -x 3937464f94add69462c14a48b84c6c2e672c1350
```
If it'll yell at you with something like fatal: Commit 3937464f94add69462c14a48b84c6c2e672c1350 is a merge but no -m option was given., add -m 1 as follows intead:
```
$ git cherry-pick -m1 -x 3937464f94add69462c14a48b84c6c2e672c1350
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR ecs_cluster capacity provider strategy #1640 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-5/3937464f94add69462c14a48b84c6c2e672c1350/pr-1640

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

ecs_cluster capacity provider strategy SUMMARY Fixes ansible-collections#770 - Add AWS ECS_Cluster Capacity Provider Strategy Support ISSUE TYPE Feature Pull Request COMPONENT NAME ecs_cluster ADDITIONAL INFORMATION When creating or updating an ECS Cluster, configure the capacity providers and capacity provider strategy as provided by the user. Given playbook task: - name: Create an ECS Cluster with Capacity Providers ecs_cluster: name: default state: present capacity_providers: - FARGATE - FARGATE_SPOT capacity_provider_strategy: - capacity_provider: FARGATE base: 1 weight: 1 - capacity_provider: FARGATE_SPOT weight: 100 Previously would throw "Unsupported parameter" and no other parameter exists to expose these features. Now you should see changed: [localhost] with the resultant created ECS Cluster having the same providers and provider_strategy fields as provided by the user. Reviewed-by: Markus Bergholz <[email protected]> Reviewed-by: Justin McCormick <None> Reviewed-by: Alina Buzachis <None>

ecs_cluster: add default value to doc SUMMARY missing default value in the docs section of #1640 not released yet. ISSUE TYPE Docs Pull Request COMPONENT NAME ecs_cluster Reviewed-by: Alina Buzachis <None> Reviewed-by: Mark Chappell <None>

… (#1678) backport stable-5 - ecs_cluster capacity provider strategy #1640 #1673 backport #1640 ecs_cluster capacity provider strategy #1640 (comment) backport #1676 waiting for #1676 SUMMARY Fixes #770 - Add AWS ECS_Cluster Capacity Provider Strategy Support ISSUE TYPE Feature Pull Request COMPONENT NAME ecs_cluster ADDITIONAL INFORMATION When creating or updating an ECS Cluster, configure the capacity providers and capacity provider strategy as provided by the user. Given playbook task: name: Create an ECS Cluster with Capacity Providers ecs_cluster: name: default state: present capacity_providers: - FARGATE - FARGATE_SPOT capacity_provider_strategy: - capacity_provider: FARGATE base: 1 weight: 1 - capacity_provider: FARGATE_SPOT weight: 100 Previously would throw "Unsupported parameter" and no other parameter exists to expose these features. Now you should see changed: [localhost] with the resultant created ECS Cluster having the same providers and provider_strategy fields as provided by the user. Reviewed-by: Markus Bergholz [email protected] Reviewed-by: Justin McCormick Reviewed-by: Alina Buzachis SUMMARY ISSUE TYPE Bugfix Pull Request Docs Pull Request Feature Pull Request New Module Pull Request COMPONENT NAME ADDITIONAL INFORMATION Reviewed-by: Mark Chappell <None>

Bump 2024 deprecations from dates to release versions SUMMARY Bump 2024 deprecations from dates to release versions ISSUE TYPE Docs Pull Request COMPONENT NAME plugins/modules/ecs_cluster.py plugins/modules/ecs_service.py plugins/modules/glue_connection.py ADDITIONAL INFORMATION See also: #518 #1640 #1716 Reviewed-by: Alina Buzachis

ansibullbot added community_review feature This issue/PR relates to a feature request integration tests/integration module module needs_triage plugins plugin (any type) tests tests labels Jan 5, 2023

ansibullbot added merge_commit This PR contains at least one merge commit. Please resolve! needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html and removed community_review labels Jan 10, 2023

karcadia added 12 commits January 10, 2023 13:19

Merge conflict.

8cfea5d

Some lines are too long.

f1b34f5

Provide more detail to argument spec and documentation.

d03d6d5

PEP8 Indentation Rules.

19400ee

Indentation Rules.

4ac5d21

Spaces everywhere.

bfa1fc5

Probably trading an indent error for a line long error.

efc3336

refactor to avoid line splitting

fd8521c

Linting / Indentation

1c7ff8c

Linting / Indentation

fd17f51

Fix idempotency

15b9f32

Now a cluster will only show change if the actual content of each nested dictionary has changed instead of checking if they match exactly which was always causing change.

Refactor to avoid assert.

2f52d93

Rework the comparison of two lists of dictionaries to determine if an update to the cluster is needed.

karcadia added 2 commits January 18, 2023 11:13

Integration test should use purge_capacity_providers True for now.

d31c8af

Only extract detail from existing when existing cluster exists and is…

ffe6d23

… ready.

Fix idempotency -- override cps_update_needed to false as part of pur…

67be965

…ge_capacity_providers.

markuman reviewed Jan 20, 2023

View reviewed changes

plugins/modules/ecs_cluster.py Outdated Show resolved Hide resolved

Update plugins/modules/ecs_cluster.py

7b353b1

markuman reviewed Jan 20, 2023

View reviewed changes

plugins/modules/ecs_cluster.py Outdated Show resolved Hide resolved

Update plugins/modules/ecs_cluster.py

265df83

markuman approved these changes Jan 20, 2023

View reviewed changes

markuman requested a review from alinabuzachis January 20, 2023 13:46

alinabuzachis approved these changes Jan 23, 2023

View reviewed changes

markuman added the mergeit Merge the PR (SoftwareFactory) label Jan 23, 2023

softwarefactory-project-zuul bot merged commit 3937464 into ansible-collections:main Jan 23, 2023

This was referenced Jan 23, 2023

backport stable-5 - ecs_cluster capacity provider strategy #1640 #1673

Closed

ecs_cluster: add default value to doc #1676

Merged

markuman mentioned this pull request Jan 23, 2023

backport stable-5 - ecs_cluster capacity provider strategy #1640 #1673 #1678

Merged

tremble mentioned this pull request Apr 26, 2024

Bump 2024 deprecations from dates to release versions #2082

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ecs_cluster capacity provider strategy #1640

ecs_cluster capacity provider strategy #1640

karcadia commented Jan 5, 2023

ansibullbot commented Jan 5, 2023

github-actions bot commented Jan 5, 2023 •

edited

Loading

softwarefactory-project-zuul bot commented Jan 5, 2023

softwarefactory-project-zuul bot commented Jan 5, 2023

softwarefactory-project-zuul bot commented Jan 5, 2023

softwarefactory-project-zuul bot commented Jan 5, 2023

softwarefactory-project-zuul bot commented Jan 6, 2023

ansibullbot commented Jan 10, 2023

softwarefactory-project-zuul bot commented Jan 18, 2023

karcadia commented Jan 18, 2023 •

edited

Loading

softwarefactory-project-zuul bot commented Jan 18, 2023

markuman commented Jan 18, 2023

softwarefactory-project-zuul bot commented Jan 19, 2023

softwarefactory-project-zuul bot commented Jan 20, 2023

softwarefactory-project-zuul bot commented Jan 23, 2023

patchback bot commented Jan 23, 2023 •

edited

Loading

ecs_cluster capacity provider strategy #1640

ecs_cluster capacity provider strategy #1640

Conversation

karcadia commented Jan 5, 2023

SUMMARY

ISSUE TYPE

COMPONENT NAME

ADDITIONAL INFORMATION

ansibullbot commented Jan 5, 2023

github-actions bot commented Jan 5, 2023 • edited Loading

Docs Build 📝

softwarefactory-project-zuul bot commented Jan 5, 2023

softwarefactory-project-zuul bot commented Jan 5, 2023

softwarefactory-project-zuul bot commented Jan 5, 2023

softwarefactory-project-zuul bot commented Jan 5, 2023

softwarefactory-project-zuul bot commented Jan 6, 2023

ansibullbot commented Jan 10, 2023

softwarefactory-project-zuul bot commented Jan 18, 2023

karcadia commented Jan 18, 2023 • edited Loading

softwarefactory-project-zuul bot commented Jan 18, 2023

markuman commented Jan 18, 2023

softwarefactory-project-zuul bot commented Jan 19, 2023

softwarefactory-project-zuul bot commented Jan 20, 2023

softwarefactory-project-zuul bot commented Jan 23, 2023

patchback bot commented Jan 23, 2023 • edited Loading

Backport to stable-5: 💔 cherry-picking failed — conflicts found

Backporting merged PR #1640 into main

github-actions bot commented Jan 5, 2023 •

edited

Loading

karcadia commented Jan 18, 2023 •

edited

Loading

patchback bot commented Jan 23, 2023 •

edited

Loading