diff --git a/go.mod b/go.mod index 59a2e80f..fc99e538 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/spf13/cobra v1.9.1 github.com/stretchr/testify v1.10.0 google.golang.org/protobuf v1.36.6 - sigs.k8s.io/release-utils v0.12.0 + sigs.k8s.io/release-utils v0.12.1 ) require ( @@ -107,9 +107,9 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481 // indirect github.com/oklog/ulid v1.3.1 // indirect - github.com/olekukonko/errors v0.0.0-20250405072817-4e6d85265da6 // indirect - github.com/olekukonko/ll v0.0.8 // indirect - github.com/olekukonko/tablewriter v1.0.8 // indirect + github.com/olekukonko/errors v1.1.0 // indirect + github.com/olekukonko/ll v0.0.9 // indirect + github.com/olekukonko/tablewriter v1.0.9 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect diff --git a/go.sum b/go.sum index 92d08cb5..3afc0205 100644 --- a/go.sum +++ b/go.sum @@ -1142,12 +1142,12 @@ github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY= github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/olekukonko/errors v0.0.0-20250405072817-4e6d85265da6 h1:r3FaAI0NZK3hSmtTDrBVREhKULp8oUeqLT5Eyl2mSPo= -github.com/olekukonko/errors v0.0.0-20250405072817-4e6d85265da6/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y= -github.com/olekukonko/ll v0.0.8 h1:sbGZ1Fx4QxJXEqL/6IG8GEFnYojUSQ45dJVwN2FH2fc= -github.com/olekukonko/ll v0.0.8/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g= -github.com/olekukonko/tablewriter v1.0.8 h1:f6wJzHg4QUtJdvrVPKco4QTrAylgaU0+b9br/lJxEiQ= -github.com/olekukonko/tablewriter v1.0.8/go.mod h1:H428M+HzoUXC6JU2Abj9IT9ooRmdq9CxuDmKMtrOCMs= +github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM= +github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y= +github.com/olekukonko/ll v0.0.9 h1:Y+1YqDfVkqMWuEQMclsF9HUR5+a82+dxJuL1HHSRpxI= +github.com/olekukonko/ll v0.0.9/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g= +github.com/olekukonko/tablewriter v1.0.9 h1:XGwRsYLC2bY7bNd93Dk51bcPZksWZmLYuaTHR0FqfL8= +github.com/olekukonko/tablewriter v1.0.9/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfBkHR9Nhfp3NWrzo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= @@ -2094,8 +2094,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/release-utils v0.12.0 h1:+Z8cEUAaxItrMcTOJ0jtUg3Fm1uNgPNol+VIL6XtQqQ= -sigs.k8s.io/release-utils v0.12.0/go.mod h1:TveYRPK4Mq6qXA0PJiUMEOlWvvIQG0Mh5APQmHD5JpA= +sigs.k8s.io/release-utils v0.12.1 h1:3p9w137wBTTApHlL8izdJHcCuaBe8wZhQz+B0QIAaBE= +sigs.k8s.io/release-utils v0.12.1/go.mod h1:0z7JOb7iQcuDQcemQw5CSVrkH8evRHY0DMMjcyRB1e4= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k= diff --git a/internal/cmd/policy.go b/internal/cmd/policy.go index ceb1683a..c456d964 100644 --- a/internal/cmd/policy.go +++ b/internal/cmd/policy.go @@ -12,7 +12,7 @@ import ( "github.com/spf13/cobra" "google.golang.org/protobuf/proto" - "sigs.k8s.io/release-utils/util" + "sigs.k8s.io/release-utils/helpers" "github.com/slsa-framework/source-tool/pkg/policy" "github.com/slsa-framework/source-tool/pkg/sourcetool" @@ -204,7 +204,7 @@ just print the generated policy. fmt.Println("Do you want to update it?") fmt.Println() - _, s, err := util.Ask("Type 'yes' if you want to continue", "yes|no|no", 3) + _, s, err := helpers.Ask("Type 'yes' if you want to continue", "yes|no|no", 3) if err != nil { return err } @@ -250,7 +250,7 @@ open the pull request from there. `, policy.SourcePolicyRepoOwner, policy.SourcePolicyRepo, opts.owner, opts.repository) - _, s, err := util.Ask("Type 'yes' if you want to continue?", "yes|no|no", 3) + _, s, err := helpers.Ask("Type 'yes' if you want to continue?", "yes|no|no", 3) if err != nil { return err } @@ -327,7 +327,7 @@ func ensureOrCreatePolicyFork(srctool *sourcetool.Tool) error { fmt.Println("Would you like to create the fork in your GitHub account now?") fmt.Println() - _, s, err := util.Ask("Type 'yes' if you want to continue?", "yes|no|no", 3) + _, s, err := helpers.Ask("Type 'yes' if you want to continue?", "yes|no|no", 3) if err != nil { return err } diff --git a/internal/cmd/setup.go b/internal/cmd/setup.go index 0eb8deb6..876f4b91 100644 --- a/internal/cmd/setup.go +++ b/internal/cmd/setup.go @@ -9,7 +9,7 @@ import ( "slices" "github.com/spf13/cobra" - "sigs.k8s.io/release-utils/util" + "sigs.k8s.io/release-utils/helpers" "github.com/slsa-framework/source-tool/pkg/sourcetool" "github.com/slsa-framework/source-tool/pkg/sourcetool/models" @@ -172,7 +172,7 @@ Alternatively, to enable each control individually use: sourcetool setup control fmt.Println(">> " + actionDescr) fmt.Println() - _, s, err := util.Ask("Type 'yes' if you want to continue", "yes|no|no", 3) + _, s, err := helpers.Ask("Type 'yes' if you want to continue", "yes|no|no", 3) if err != nil { return err } @@ -204,7 +204,7 @@ sourcetool is about to perform the following actions on your behalf: srctool.ControlConfigurationDescr(opts.GetBranch(), models.CONFIG_BRANCH_RULES), ) - _, s, err := util.Ask("Type 'yes' if you want to continue", "yes|no|no", 3) + _, s, err := helpers.Ask("Type 'yes' if you want to continue", "yes|no|no", 3) if err != nil { return err } @@ -385,7 +385,7 @@ a fork of the repository you want to protect. fmt.Println(">> " + actionDescr) fmt.Println() - _, s, err := util.Ask("Type 'yes' if you want to continue", "yes|no|no", 3) + _, s, err := helpers.Ask("Type 'yes' if you want to continue", "yes|no|no", 3) if err != nil { return err } @@ -412,7 +412,7 @@ a fork of the repository you want to protect. fmt.Print(questions) fmt.Println() - _, s, err := util.Ask("Type 'yes' if you want to continue", "yes|no|no", 3) + _, s, err := helpers.Ask("Type 'yes' if you want to continue", "yes|no|no", 3) if err != nil { return err } diff --git a/pkg/policy/policy.pb.go b/pkg/policy/policy.pb.go index 08b8a45d..ba80569a 100644 --- a/pkg/policy/policy.pb.go +++ b/pkg/policy/policy.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc (unknown) // source: policy.proto diff --git a/pkg/provenance/provenance.pb.go b/pkg/provenance/provenance.pb.go index a6a1d340..0ee272e2 100644 --- a/pkg/provenance/provenance.pb.go +++ b/pkg/provenance/provenance.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc (unknown) // source: provenance.proto