fix: improve error message when adoption-fields annotation is missing

[shinichitazawa]

Description

When using services.k8s.aws/adoption-policy: adopt without the services.k8s.aws/adoption-fields annotation, ExtractAdoptionFields in pkg/runtime/util.go calls json.Unmarshal on an empty string, producing the generic Go error unexpected end of JSON input.

This error gives no indication that the adoption-fields annotation is missing, making it very difficult to diagnose — especially since it becomes a TerminalError that permanently blocks reconciliation.

Changes

• Added an explicit empty-string check in ExtractAdoptionFields that returns a descriptive error message explaining that the adoption-fields annotation is required when adoption-policy is set to adopt
• Wrapped json.Unmarshal error with fmt.Errorf and %w to provide context about which annotation failed to parse
• Added two unit tests for the new error cases

Before

{"level":"error","msg":"Reconciler error","error":"unexpected end of JSON input"}

After

{"level":"error","msg":"Reconciler error","error":"services.k8s.aws/adoption-fields annotation is required when adoption-policy is set to 'adopt'; please provide the resource identifier fields as a JSON object (e.g. '{\"name\": \"my-resource\"}')"}

Testing

• Unit tests added and passing (go test ./pkg/runtime/...)
• Manually verified with ACK IAM Controller v1.6.2 on EKS

Fixes aws-controllers-k8s/community#2824

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

[ack-prow]

Hi @shinichitazawa. 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.

Details

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.

[michaelhtm]

Thanks @shinichitazawa
/test all

[aries1980]

It would be nice if this could get merged.

AWS recently added a BlockedEncryptionTypes field to the GetBucketEncryption API response. The S3 controller v1.2.2 cannot parse this new field, causing a JSON unmarshal failure during reconciliation.

[shinichitazawa]

/retest

[ack-prow]

@shinichitazawa: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

Details

In response to this:

/retest

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-sigs/prow repository.

[michaelhtm]

/ok-to-test

[michaelhtm]

/test ec2-controller-test

[michaelhtm]

Thanks for the contribution @shinichitazawa
/lgtm

[ack-prow]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: michaelhtm, shinichitazawa

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [michaelhtm]

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