Add tags for HostedZone #26

nnbu · 2023-07-01T00:32:44Z

Issue (aws-controllers-k8s/community#1554)

Description of changes:
Adds support of tags in HostedZone spec

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

I

ack-prow · 2023-07-01T00:32:54Z

Hi @nnbu. Thanks for your PR.

I'm waiting for a aws-controllers-k8s member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

a-hilaly · 2023-07-05T12:31:54Z

/ok-to-test

a-hilaly

Thank you @nnbu!!
I have few comments/questions bellow

test/e2e/tests/helper.py

test/e2e/tests/test_hosted_zone.py

templates/hooks/hosted_zone/sdk_read_one_post_set_output.go.tpl

pkg/resource/hosted_zone/sdk.go

a-hilaly · 2023-07-05T13:03:28Z

templates/hooks/hosted_zone/sdk_file_end.go.tpl

+{{- $operationName := $specField.From.Operation }}
+{{- $operation := (index $SDKAPI.API.Operations $operationName) -}}
+{{- range $hostedZoneRefName, $hostedZoneMemberRefs := $operation.InputRef.Shape.MemberRefs -}}
+{{- if eq $hostedZoneRefName "AddTags" }}


If i get this well, AddTags is a field part of of CreateHostedZone operation?

You are right. To be specific, Tags is a field in HostedZone resource. operationName is ChangeTagsForResource. AddTags is memberRef in that operation.

pkg/resource/hosted_zone/hook.go

nnbu · 2023-07-12T22:21:52Z

@a-hilaly I have addressed all the review comments. Could you please check?

config/controller/kustomization.yaml

pkg/resource/hosted_zone/hook.go

templates/hooks/hosted_zone/sdk_create_post_set_output.go.tpl

RedbackThomson · 2023-07-13T16:27:38Z

test/e2e/tests/test_hosted_zone.py

+        route53_validator = Route53Validator(route53_client)
+        route53_validator.assert_hosted_zone(zone_id)
+
+    @pytest.mark.resource_data({'tag_key': 'initialtagkey', 'tag_value': 'initialtagvalue'})


Sorry I still don't understand the value in initialising tags in a decorator vs. doing it directly in the method?

There are a few instances of initializing tags this way in ec2-controller.
E.g. https://github.com/aws-controllers-k8s/ec2-controller/blob/main/test/e2e/tests/test_dhcp_options.py#L123

I kept the same convention.

test/e2e/tests/test_hosted_zone.py

a-hilaly

👍
/approve

a-hilaly · 2023-07-17T18:13:41Z

/retest

a-hilaly · 2023-07-17T19:16:58Z

/test all

nnbu · 2023-07-17T20:04:33Z

e2e test failure seems unrelated.

Also, the test passes when I run it in my personal environment.

tests/test_hosted_zone.py::TestHostedZone::test_crud_tags
tests/test_hosted_zone.py::TestHostedZone::test_create_delete_public
tests/test_hosted_zone.py::TestHostedZone::test_create_delete_private
[gw1] [ 33%] PASSED tests/test_hosted_zone.py::TestHostedZone::test_create_delete_private
[gw0] [ 66%] PASSED tests/test_hosted_zone.py::TestHostedZone::test_create_delete_public
[gw2] [100%] PASSED tests/test_hosted_zone.py::TestHostedZone::test_crud_tags

nnbu · 2023-07-19T17:29:29Z

@a-hilaly Could you please tell me if the test failure is a baseline breakage?

a-hilaly · 2023-07-19T17:33:12Z

@nnbu this is an issue impacting all ACK controllers, we're tracking it here aws-controllers-k8s/community#1848

a-hilaly · 2023-07-19T20:55:14Z

@nnbu fix is available checkout aws-controllers-k8s/community#1848 (comment)

Issue (aws-controllers-k8s/community#1554) Description of changes: Adds support of tags in HostedZone spec By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

a-hilaly

Thank you for contribution @nnbu !
/lgtm
Can you make a release PR after this one is merged?

ack-prow · 2023-07-19T22:33:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: a-hilaly, nnbu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [a-hilaly]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

ack-prow bot requested review from RedbackThomson and a-hilaly July 1, 2023 00:32

ack-prow bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 1, 2023

ack-prow bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 5, 2023

a-hilaly reviewed Jul 5, 2023

View reviewed changes

a-hilaly reviewed Jul 6, 2023

View reviewed changes

pkg/resource/hosted_zone/hook.go Show resolved Hide resolved

nnbu force-pushed the hostedzone branch 2 times, most recently from eec2108 to b8aae74 Compare July 8, 2023 01:25

RedbackThomson changed the title ~~Route53: HostedZone spec should have tags support~~ Add tags for HostedZone Jul 10, 2023

RedbackThomson suggested changes Jul 13, 2023

View reviewed changes

nnbu force-pushed the hostedzone branch from b8aae74 to 9948dec Compare July 17, 2023 18:07

a-hilaly reviewed Jul 17, 2023

View reviewed changes

ack-prow bot added the approved label Jul 17, 2023

nnbu force-pushed the hostedzone branch from 9948dec to 30803ba Compare July 17, 2023 19:03

Route53: HostedZone spec should have tags support

84492a0

Issue (aws-controllers-k8s/community#1554) Description of changes: Adds support of tags in HostedZone spec By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

nnbu force-pushed the hostedzone branch from 30803ba to 84492a0 Compare July 19, 2023 22:27

a-hilaly approved these changes Jul 19, 2023

View reviewed changes

ack-prow bot assigned a-hilaly Jul 19, 2023

ack-prow bot added the lgtm Indicates that a PR is ready to be merged. label Jul 19, 2023

ack-prow bot merged commit 1dad631 into aws-controllers-k8s:main Jul 19, 2023

nnbu mentioned this pull request Jul 28, 2023

Route53 Operator - HostedZone spec should have tags support in Spec aws-controllers-k8s/community#1554

Closed

Add tags for HostedZone #26

Add tags for HostedZone #26

Uh oh!

Conversation

nnbu commented Jul 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ack-prow bot commented Jul 1, 2023

Uh oh!

a-hilaly commented Jul 5, 2023

Uh oh!

a-hilaly left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

a-hilaly Jul 5, 2023

Choose a reason for hiding this comment

Uh oh!

nnbu Jul 8, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nnbu commented Jul 12, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

RedbackThomson Jul 13, 2023

Choose a reason for hiding this comment

Uh oh!

nnbu Jul 17, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

a-hilaly left a comment

Choose a reason for hiding this comment

Uh oh!

a-hilaly commented Jul 17, 2023

Uh oh!

a-hilaly commented Jul 17, 2023

Uh oh!

nnbu commented Jul 17, 2023

Uh oh!

nnbu commented Jul 19, 2023

Uh oh!

a-hilaly commented Jul 19, 2023

Uh oh!

a-hilaly commented Jul 19, 2023

Uh oh!

a-hilaly left a comment

Choose a reason for hiding this comment

Uh oh!

ack-prow bot commented Jul 19, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

nnbu commented Jul 1, 2023 •

edited

Loading