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.

Sign up for GitHub

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

Jump to bottom

Avoid parsing known empty inputs #619

Merged
merged 2 commits into from
Aug 7, 2023
Merged

Avoid parsing known empty inputs #619

merged 2 commits into from
Aug 7, 2023

Conversation

DanielCKennedy
Copy link
Contributor

Cherry-pick of #618 to add to 0.5 release

What this PR does / why we need it:
We are seeing instances of the configmap in the wild with variations like below:

apiVersion: v1
data:
mapAccounts: |
    ''
mapUsers: |
    ""

We should tolerate these as the user literally means, there's no data they need in there.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@dims @DanielCKennedy
Avoid parsing known empty inputs
cfe3abc 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 4, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @DanielCKennedy. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 4, 2023
@nnmin-aws
Copy link
Contributor

/test

@k8s-ci-robot
Copy link
Contributor

@nnmin-aws: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test pull-aws-iam-authenticator-e2e
  • /test pull-aws-iam-authenticator-e2e-kind
  • /test pull-aws-iam-authenticator-integration
  • /test pull-aws-iam-authenticator-unit

Use /test all to run all jobs.

In response to this:

/test

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.

@nnmin-aws
Copy link
Contributor

/test all

@nnmin-aws
Copy link
Contributor

/retest

@nnmin-aws
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot 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 Aug 7, 2023
@DanielCKennedy
Copy link
Contributor Author

/retest

1 similar comment
@DanielCKennedy
Copy link
Contributor Author

/retest

@nnmin-aws
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 7, 2023
@dims dims added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 7, 2023
@dims
Copy link
Member

dims commented Aug 7, 2023

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: DanielCKennedy, dims

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:

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

@k8s-ci-robot k8s-ci-robot merged commit f80d3ea into kubernetes-sigs:release-0.5 Aug 7, 2023
nckturner
nckturner reviewed Aug 7, 2023
View reviewed changes
pkg/mapper/configmap/configmap.go
@@ -146,6 +152,11 @@ func ParseMap(m map[string]string) (userMappings []config.UserMapping, roleMappi
return userMappings, roleMappings, awsAccounts, err
}

func isSkippable(data string) bool {
trimmed := strings.TrimSpace(data)
return trimmed == "" || trimmed == "``" || trimmed == "\"\""
Copy link
Contributor

Choose a reason for hiding this comment

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

What about single quotes? Your example has one with single quotes in the PR description.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nckturner nckturner nckturner left review comments

@micahhausler micahhausler Awaiting requested review from micahhausler

Assignees

@nnmin-aws nnmin-aws

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@DanielCKennedy @k8s-ci-robot @nnmin-aws @dims @nckturner