Skip to content

fix: use WithSecretVariable in Sign() for consistent credential handling #952

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

Open
Sypher845 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use WithSecretVariable in Sign() for consistent credential handling #952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .dagger/publishimage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,29 +253,29 @@ func (m *HarborCli) Sign(ctx context.Context,
registryPassword *dagger.Secret,
imageAddr string,
) (string, error) {
registryPasswordPlain, _ := registryPassword.Plaintext(ctx)

cosing_ctr := dag.Container().From("cgr.dev/chainguard/cosign")
cosignCtr := dag.Container().
From("cgr.dev/chainguard/cosign").
WithSecretVariable("REGISTRY_PASSWORD", registryPassword)

// If githubToken is provided, use it to sign the image
// If githubToken is provided, configure OIDC for keyless signing
if githubToken != nil {
if actionsIdTokenRequestUrl == nil || actionsIdTokenRequestToken == nil {
return "", fmt.Errorf("actionsIdTokenRequestUrl (exist=%s) and actionsIdTokenRequestToken (exist=%t) must be provided when githubToken is provided", actionsIdTokenRequestUrl, actionsIdTokenRequestToken != nil)
return "", fmt.Errorf("actionsIdTokenRequestUrl (exist=%v) and actionsIdTokenRequestToken (exist=%t) must be provided when githubToken is provided", actionsIdTokenRequestUrl != nil, actionsIdTokenRequestToken != nil)
}
fmt.Printf("Setting the ENV Vars GITHUB_TOKEN, ACTIONS_ID_TOKEN_REQUEST_URL, ACTIONS_ID_TOKEN_REQUEST_TOKEN to sign with GitHub Token")
cosing_ctr = cosing_ctr.WithSecretVariable("GITHUB_TOKEN", githubToken).
cosignCtr = cosignCtr.
WithSecretVariable("GITHUB_TOKEN", githubToken).
WithSecretVariable("ACTIONS_ID_TOKEN_REQUEST_URL", actionsIdTokenRequestUrl).
WithSecretVariable("ACTIONS_ID_TOKEN_REQUEST_TOKEN", actionsIdTokenRequestToken)
}

return cosing_ctr.WithSecretVariable("REGISTRY_PASSWORD", registryPassword).
return cosignCtr.
WithExec([]string{"cosign", "env"}).
WithExec([]string{
"cosign", "sign", "--yes", "--recursive",
"--registry-username", registryUsername,
"--registry-password", registryPasswordPlain,
imageAddr,
"--timeout", "1m",
"sh", "-c",
fmt.Sprintf(
"cosign sign --yes --recursive --registry-username %s --registry-password $REGISTRY_PASSWORD %s --timeout 1m",
registryUsername, imageAddr,
),
}).Stdout(ctx)
}

Expand Down
Loading