Skip to content

Commit

Permalink
Remove experimental warning from Fulcio flags (#2923)
Browse files Browse the repository at this point in the history
Signed-off-by: Priya Wadhwa <[email protected]>
  • Loading branch information
priyawadhwa authored Apr 24, 2023
1 parent 0da5bc0 commit dc22795
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 57 deletions.
6 changes: 3 additions & 3 deletions cmd/cosign/cli/options/fulcio.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ var _ Interface = (*FulcioOptions)(nil)
func (o *FulcioOptions) AddFlags(cmd *cobra.Command) {
// TODO: change this back to api.SigstorePublicServerURL after the v1 migration is complete.
cmd.Flags().StringVar(&o.URL, "fulcio-url", DefaultFulcioURL,
"[EXPERIMENTAL] address of sigstore PKI server")
"address of sigstore PKI server")

cmd.Flags().StringVar(&o.IdentityToken, "identity-token", "",
"[EXPERIMENTAL] identity token to use for certificate from fulcio. the token or a path to a file containing the token is accepted.")
"identity token to use for certificate from fulcio. the token or a path to a file containing the token is accepted.")

cmd.Flags().BoolVar(&o.InsecureSkipFulcioVerify, "insecure-skip-verify", false,
"[EXPERIMENTAL] skip verifying fulcio published to the SCT (this should only be used for testing).")
"skip verifying fulcio published to the SCT (this should only be used for testing).")
}
12 changes: 6 additions & 6 deletions cmd/cosign/cli/options/oidc.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,21 @@ var _ Interface = (*OIDCOptions)(nil)
// AddFlags implements Interface
func (o *OIDCOptions) AddFlags(cmd *cobra.Command) {
cmd.Flags().StringVar(&o.Issuer, "oidc-issuer", DefaultOIDCIssuerURL,
"[EXPERIMENTAL] OIDC provider to be used to issue ID token")
"OIDC provider to be used to issue ID token")

cmd.Flags().StringVar(&o.ClientID, "oidc-client-id", "sigstore",
"[EXPERIMENTAL] OIDC client ID for application")
"OIDC client ID for application")

cmd.Flags().StringVar(&o.clientSecretFile, "oidc-client-secret-file", "",
"[EXPERIMENTAL] Path to file containing OIDC client secret for application")
"Path to file containing OIDC client secret for application")
_ = cmd.Flags().SetAnnotation("oidc-client-secret-file", cobra.BashCompFilenameExt, []string{})

cmd.Flags().StringVar(&o.RedirectURL, "oidc-redirect-url", "",
"[EXPERIMENTAL] OIDC redirect URL (Optional). The default oidc-redirect-url is 'http://localhost:0/auth/callback'.")
"OIDC redirect URL (Optional). The default oidc-redirect-url is 'http://localhost:0/auth/callback'.")

cmd.Flags().StringVar(&o.Provider, "oidc-provider", "",
"[EXPERIMENTAL] Specify the provider to get the OIDC token from (Optional). If unset, all options will be tried. Options include: [spiffe, google, github, filesystem, buildkite-agent]")
"Specify the provider to get the OIDC token from (Optional). If unset, all options will be tried. Options include: [spiffe, google, github, filesystem, buildkite-agent]")

cmd.Flags().BoolVar(&o.DisableAmbientProviders, "oidc-disable-ambient-providers", false,
"[EXPERIMENTAL] Disable ambient OIDC providers. When true, ambient credentials will not be read")
"Disable ambient OIDC providers. When true, ambient credentials will not be read")
}
2 changes: 1 addition & 1 deletion cmd/cosign/cli/options/rekor.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ var _ Interface = (*RekorOptions)(nil)
// AddFlags implements Interface
func (o *RekorOptions) AddFlags(cmd *cobra.Command) {
cmd.Flags().StringVar(&o.URL, "rekor-url", DefaultRekorURL,
"[EXPERIMENTAL] address of rekor STL server")
"address of rekor STL server")
}
20 changes: 10 additions & 10 deletions doc/cosign_attest-blob.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions doc/cosign_attest.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion doc/cosign_dockerfile_verify.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion doc/cosign_manifest_verify.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions doc/cosign_sign-blob.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dc22795

Please sign in to comment.