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

Don't error out on secret create --replace on missing secret #1909

Merged
merged 1 commit into from
Apr 20, 2024

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Mar 14, 2024

Consolidate all errors between the different secret drivers.

Fixes: containers/podman#22000
Fixes: containers/podman#21952

Copy link
Contributor

openshift-ci bot commented Mar 14, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan

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

@rhatdan
Copy link
Member Author

rhatdan commented Mar 14, 2024

@ashley-cui @vrothberg @Luap99 PTAL

@Luap99
Copy link
Member

Luap99 commented Mar 14, 2024

you didn't commit your new define dir I assume?

@@ -126,18 +116,18 @@ func (d *Driver) Lookup(id string) ([]byte, error) {
return nil, err
}
if err := d.gpg(context.TODO(), nil, out, "--decrypt", key); err != nil {
return nil, fmt.Errorf("%s: %w", id, errNoSecretData)
return nil, fmt.Errorf("%s: %w", id, define.ErrNoSuchSecret)
Copy link
Member

Choose a reason for hiding this comment

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

It doesn't change the current behavior but I am not sure this should return this error here.

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM
Can we vendor this one into a Podman PR?

@ashley-cui
Copy link
Member

LGTM but bad lint

Consolidate all errors between the different secret drivers.

Fixes: containers/podman#22000
Fixes: containers/podman#21952

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@rhatdan rhatdan added the lgtm label Apr 20, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 1c37313 into containers:main Apr 20, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants