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

[PR #1886/9c85fec7 backport][stable-6] mq_broker - fix creation with tags #1971

Conversation

patchback[bot]
Copy link

@patchback patchback bot commented Oct 20, 2023

This is a backport of PR #1886 as merged into main (9c85fec).

SUMMARY

Fixes #1832

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

mq_broker

ADDITIONAL INFORMATION

before:

ok: [testhost] => {
    "result_c1": {
        "broker": {
            "authentication_strategy": "simple",
            "auto_minor_version_upgrade": true,
            "broker_arn": "arn:aws:mq:ca-central-1:196233192477:broker:ansible-test-22180167-ali-mq:b-ebaf0e8c-4414-4ac1-9517-67c7968e677d",
            "broker_id": "b-ebaf0e8c-4414-4ac1-9517-67c7968e677d",
            "broker_instances": [],
            "broker_name": "ansible-test-22180167-ali-mq",
            "broker_state": "CREATION_IN_PROGRESS",
            "configurations": {
                "history": [],
                "pending": {
                    "id": "c-2c5fc151-0091-4c1e-a590-096ffc633d07",
                    "revision": 1
                }
            },
            "created": "2023-07-12T10:02:38.207000+00:00",
            "deployment_mode": "SINGLE_INSTANCE",
            "encryption_options": {
                "kms_key_id": "arn:aws:kms:ca-central-1:196233192477:key/7cdaffb8-ad16-4623-b370-efb041df45cc",
                "use_aws_owned_key": false
            },
            "engine_type": "ActiveMQ",
            "engine_version": "5.17.3",
            "host_instance_type": "mq.t3.micro",
            "logs": {
                "audit": false,
                "audit_log_group": "/aws/amazonmq/broker/b-ebaf0e8c-4414-4ac1-9517-67c7968e677d/audit",
                "general": false,
                "general_log_group": "/aws/amazonmq/broker/b-ebaf0e8c-4414-4ac1-9517-67c7968e677d/general"
            },
            "maintenance_window_start_time": {
                "day_of_week": "TUESDAY",
                "time_of_day": "17:00",
                "time_zone": "UTC"
            },
            "publicly_accessible": false,
            "response_metadata": {
                "http_headers": {
                    "access-control-allow-origin": "*",
                    "access-control-expose-headers": "x-amzn-errortype,x-amzn-requestid,x-amzn-errormessage,x-amzn-trace-id,x-amz-apigw-id,date",
                    "cache-control": "no-cache; no-store, must-revalidate, private",
                    "connection": "keep-alive",
                    "content-length": "1784",
                    "content-type": "application/json",
                    "date": "Wed, 12 Jul 2023 10:02:40 GMT",
                    "expires": "0",
                    "pragma": "no-cache",
                    "x-amz-apigw-id": "H8gKCFJMYosFrgA=",
                    "x-amzn-requestid": "b7280747-8f0e-4c9f-9f32-e78b84eed485",
                    "x-amzn-trace-id": "Root=1-64ae7a3f-20b2061251100a3d6ed1f9a2"
                },
                "http_status_code": 200,
                "request_id": "b7280747-8f0e-4c9f-9f32-e78b84eed485",
                "retry_attempts": 0
            },
            "security_groups": [
                "sg-0aa726c0444fc83f7"
            ],
            "storage_type": "efs",
            "subnet_ids": [
                "subnet-0179f9e2489397b2e"
            ],
            "tags": {},
            "users": [
                {
                    "pending_change": "CREATE",
                    "username": "admin"
                }
            ]
        },
        "changed": false,
        "failed": false,
        "resource_actions": [
            "mq:DescribeBroker"
        ]
    }
}

after:

ok: [testhost] => {
    "result_c1": {
        "broker": {
            "authentication_strategy": "simple",
            "auto_minor_version_upgrade": true,
            "broker_arn": "arn:aws:mq:ca-central-1:196233192477:broker:ansible-test-25482350-ali-mq:b-3dd2d767-7740-4889-b004-62d771b36661",
            "broker_id": "b-3dd2d767-7740-4889-b004-62d771b36661",
            "broker_instances": [],
            "broker_name": "ansible-test-25482350-ali-mq",
            "broker_state": "CREATION_IN_PROGRESS",
            "configurations": {
                "history": [],
                "pending": {
                    "id": "c-6e226c2d-4ae1-4748-9720-b127ac041824",
                    "revision": 1
                }
            },
            "created": "2023-07-12T09:19:49.020000+00:00",
            "deployment_mode": "SINGLE_INSTANCE",
            "encryption_options": {
                "kms_key_id": "arn:aws:kms:ca-central-1:196233192477:key/7cdaffb8-ad16-4623-b370-efb041df45cc",
                "use_aws_owned_key": false
            },
            "engine_type": "ActiveMQ",
            "engine_version": "5.17.3",
            "host_instance_type": "mq.t3.micro",
            "logs": {
                "audit": false,
                "audit_log_group": "/aws/amazonmq/broker/b-3dd2d767-7740-4889-b004-62d771b36661/audit",
                "general": false,
                "general_log_group": "/aws/amazonmq/broker/b-3dd2d767-7740-4889-b004-62d771b36661/general"
            },
            "maintenance_window_start_time": {
                "day_of_week": "FRIDAY",
                "time_of_day": "17:00",
                "time_zone": "UTC"
            },
            "publicly_accessible": false,
            "response_metadata": {
                "http_headers": {
                    "access-control-allow-origin": "*",
                    "access-control-expose-headers": "x-amzn-errortype,x-amzn-requestid,x-amzn-errormessage,x-amzn-trace-id,x-amz-apigw-id,date",
                    "cache-control": "no-cache; no-store, must-revalidate, private",
                    "connection": "keep-alive",
                    "content-length": "1814",
                    "content-type": "application/json",
                    "date": "Wed, 12 Jul 2023 09:19:51 GMT",
                    "expires": "0",
                    "pragma": "no-cache",
                    "x-amz-apigw-id": "H8Z4pGfC4osFeAg=",
                    "x-amzn-requestid": "f469a522-80b7-4da4-af53-875f50962d2c",
                    "x-amzn-trace-id": "Root=1-64ae7037-43906aac58ab1798156f7003"
                },
                "http_status_code": 200,
                "request_id": "f469a522-80b7-4da4-af53-875f50962d2c",
                "retry_attempts": 0
            },
            "security_groups": [
                "sg-0e83937e543dc249c"
            ],
            "storage_type": "efs",
            "subnet_ids": [
                "subnet-054a759ac833bf4b3"
            ],
            "tags": {
                "workload_type": "other"
            },
            "users": [
                {
                    "pending_change": "CREATE",
                    "username": "admin"
                }
            ]
        },
        "changed": false,
        "failed": false,
        "resource_actions": [
            "mq:DescribeBroker"
        ]
    }
}

mq_broker - fix creation with tags

SUMMARY
Fixes #1832
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
mq_broker
ADDITIONAL INFORMATION
before:
ok: [testhost] => {
    "result_c1": {
        "broker": {
            "authentication_strategy": "simple",
            "auto_minor_version_upgrade": true,
            "broker_arn": "arn:aws:mq:ca-central-1:196233192477:broker:ansible-test-22180167-ali-mq:b-ebaf0e8c-4414-4ac1-9517-67c7968e677d",
            "broker_id": "b-ebaf0e8c-4414-4ac1-9517-67c7968e677d",
            "broker_instances": [],
            "broker_name": "ansible-test-22180167-ali-mq",
            "broker_state": "CREATION_IN_PROGRESS",
            "configurations": {
                "history": [],
                "pending": {
                    "id": "c-2c5fc151-0091-4c1e-a590-096ffc633d07",
                    "revision": 1
                }
            },
            "created": "2023-07-12T10:02:38.207000+00:00",
            "deployment_mode": "SINGLE_INSTANCE",
            "encryption_options": {
                "kms_key_id": "arn:aws:kms:ca-central-1:196233192477:key/7cdaffb8-ad16-4623-b370-efb041df45cc",
                "use_aws_owned_key": false
            },
            "engine_type": "ActiveMQ",
            "engine_version": "5.17.3",
            "host_instance_type": "mq.t3.micro",
            "logs": {
                "audit": false,
                "audit_log_group": "/aws/amazonmq/broker/b-ebaf0e8c-4414-4ac1-9517-67c7968e677d/audit",
                "general": false,
                "general_log_group": "/aws/amazonmq/broker/b-ebaf0e8c-4414-4ac1-9517-67c7968e677d/general"
            },
            "maintenance_window_start_time": {
                "day_of_week": "TUESDAY",
                "time_of_day": "17:00",
                "time_zone": "UTC"
            },
            "publicly_accessible": false,
            "response_metadata": {
                "http_headers": {
                    "access-control-allow-origin": "*",
                    "access-control-expose-headers": "x-amzn-errortype,x-amzn-requestid,x-amzn-errormessage,x-amzn-trace-id,x-amz-apigw-id,date",
                    "cache-control": "no-cache; no-store, must-revalidate, private",
                    "connection": "keep-alive",
                    "content-length": "1784",
                    "content-type": "application/json",
                    "date": "Wed, 12 Jul 2023 10:02:40 GMT",
                    "expires": "0",
                    "pragma": "no-cache",
                    "x-amz-apigw-id": "H8gKCFJMYosFrgA=",
                    "x-amzn-requestid": "b7280747-8f0e-4c9f-9f32-e78b84eed485",
                    "x-amzn-trace-id": "Root=1-64ae7a3f-20b2061251100a3d6ed1f9a2"
                },
                "http_status_code": 200,
                "request_id": "b7280747-8f0e-4c9f-9f32-e78b84eed485",
                "retry_attempts": 0
            },
            "security_groups": [
                "sg-0aa726c0444fc83f7"
            ],
            "storage_type": "efs",
            "subnet_ids": [
                "subnet-0179f9e2489397b2e"
            ],
            "tags": {},
            "users": [
                {
                    "pending_change": "CREATE",
                    "username": "admin"
                }
            ]
        },
        "changed": false,
        "failed": false,
        "resource_actions": [
            "mq:DescribeBroker"
        ]
    }
}

after:
ok: [testhost] => {
    "result_c1": {
        "broker": {
            "authentication_strategy": "simple",
            "auto_minor_version_upgrade": true,
            "broker_arn": "arn:aws:mq:ca-central-1:196233192477:broker:ansible-test-25482350-ali-mq:b-3dd2d767-7740-4889-b004-62d771b36661",
            "broker_id": "b-3dd2d767-7740-4889-b004-62d771b36661",
            "broker_instances": [],
            "broker_name": "ansible-test-25482350-ali-mq",
            "broker_state": "CREATION_IN_PROGRESS",
            "configurations": {
                "history": [],
                "pending": {
                    "id": "c-6e226c2d-4ae1-4748-9720-b127ac041824",
                    "revision": 1
                }
            },
            "created": "2023-07-12T09:19:49.020000+00:00",
            "deployment_mode": "SINGLE_INSTANCE",
            "encryption_options": {
                "kms_key_id": "arn:aws:kms:ca-central-1:196233192477:key/7cdaffb8-ad16-4623-b370-efb041df45cc",
                "use_aws_owned_key": false
            },
            "engine_type": "ActiveMQ",
            "engine_version": "5.17.3",
            "host_instance_type": "mq.t3.micro",
            "logs": {
                "audit": false,
                "audit_log_group": "/aws/amazonmq/broker/b-3dd2d767-7740-4889-b004-62d771b36661/audit",
                "general": false,
                "general_log_group": "/aws/amazonmq/broker/b-3dd2d767-7740-4889-b004-62d771b36661/general"
            },
            "maintenance_window_start_time": {
                "day_of_week": "FRIDAY",
                "time_of_day": "17:00",
                "time_zone": "UTC"
            },
            "publicly_accessible": false,
            "response_metadata": {
                "http_headers": {
                    "access-control-allow-origin": "*",
                    "access-control-expose-headers": "x-amzn-errortype,x-amzn-requestid,x-amzn-errormessage,x-amzn-trace-id,x-amz-apigw-id,date",
                    "cache-control": "no-cache; no-store, must-revalidate, private",
                    "connection": "keep-alive",
                    "content-length": "1814",
                    "content-type": "application/json",
                    "date": "Wed, 12 Jul 2023 09:19:51 GMT",
                    "expires": "0",
                    "pragma": "no-cache",
                    "x-amz-apigw-id": "H8Z4pGfC4osFeAg=",
                    "x-amzn-requestid": "f469a522-80b7-4da4-af53-875f50962d2c",
                    "x-amzn-trace-id": "Root=1-64ae7037-43906aac58ab1798156f7003"
                },
                "http_status_code": 200,
                "request_id": "f469a522-80b7-4da4-af53-875f50962d2c",
                "retry_attempts": 0
            },
            "security_groups": [
                "sg-0e83937e543dc249c"
            ],
            "storage_type": "efs",
            "subnet_ids": [
                "subnet-054a759ac833bf4b3"
            ],
            "tags": {
                "workload_type": "other"
            },
            "users": [
                {
                    "pending_change": "CREATE",
                    "username": "admin"
                }
            ]
        },
        "changed": false,
        "failed": false,
        "resource_actions": [
            "mq:DescribeBroker"
        ]
    }
}

Reviewed-by: Alina Buzachis
(cherry picked from commit 9c85fec)
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/0075a105f8bb419d97a353eec58f2102

✔️ ansible-galaxy-importer SUCCESS in 4m 22s (non-voting)
✔️ build-ansible-collection SUCCESS in 13m 09s
✔️ ansible-test-splitter SUCCESS in 4m 45s
✔️ integration-community.aws-1 SUCCESS in 5m 20s
Skipped 21 jobs

@tremble tremble added the mergeit Merge the PR (SoftwareFactory) label Oct 20, 2023
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/bb2840d77b154e73bc9ee38ad2b16d81

✔️ ansible-galaxy-importer SUCCESS in 4m 32s (non-voting)
✔️ build-ansible-collection SUCCESS in 13m 20s
✔️ ansible-test-splitter SUCCESS in 4m 51s
✔️ integration-community.aws-1 SUCCESS in 6m 55s
Skipped 21 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 8afd0fc into stable-6 Oct 20, 2023
54 checks passed
@softwarefactory-project-zuul softwarefactory-project-zuul bot deleted the patchback/backports/stable-6/9c85fec7e3729e2ba17d9988c7f8910c9a9f693f/pr-1886 branch October 20, 2023 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants