diff --git a/go.mod b/go.mod index 6ac43db276..53e380c84a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/slsa-framework/slsa-github-generator +module github.com/slsa-framework/slsa-github-generator/v2 go 1.23.1 diff --git a/internal/builders/common/buildtype.go b/internal/builders/common/buildtype.go index 5709ddfebe..4d4eadebce 100644 --- a/internal/builders/common/buildtype.go +++ b/internal/builders/common/buildtype.go @@ -14,7 +14,7 @@ package common -import "github.com/slsa-framework/slsa-github-generator/slsa" +import "github.com/slsa-framework/slsa-github-generator/v2/slsa" // GenericBuild is a very generic build type where build type can be specified. type GenericBuild struct { diff --git a/internal/builders/container/generate.go b/internal/builders/container/generate.go index e49172d35d..9b43032dea 100644 --- a/internal/builders/container/generate.go +++ b/internal/builders/container/generate.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" - "github.com/slsa-framework/slsa-github-generator/github" - "github.com/slsa-framework/slsa-github-generator/internal/builders/common" - "github.com/slsa-framework/slsa-github-generator/internal/utils" - "github.com/slsa-framework/slsa-github-generator/slsa" + "github.com/slsa-framework/slsa-github-generator/v2/github" + "github.com/slsa-framework/slsa-github-generator/v2/internal/builders/common" + "github.com/slsa-framework/slsa-github-generator/v2/internal/utils" + "github.com/slsa-framework/slsa-github-generator/v2/slsa" ) // generateCmd returns the 'generate' command. diff --git a/internal/builders/container/generate_test.go b/internal/builders/container/generate_test.go index 4edd056d64..87756d08bd 100644 --- a/internal/builders/container/generate_test.go +++ b/internal/builders/container/generate_test.go @@ -21,8 +21,8 @@ import ( "path/filepath" "testing" - "github.com/slsa-framework/slsa-github-generator/internal/utils" - "github.com/slsa-framework/slsa-github-generator/slsa" + "github.com/slsa-framework/slsa-github-generator/v2/internal/utils" + "github.com/slsa-framework/slsa-github-generator/v2/slsa" ) func checkTest(t *testing.T) func(err error) { diff --git a/internal/builders/container/version.go b/internal/builders/container/version.go index 2e71bca108..cc2ec0f1b2 100644 --- a/internal/builders/container/version.go +++ b/internal/builders/container/version.go @@ -19,7 +19,7 @@ import ( "github.com/spf13/cobra" - "github.com/slsa-framework/slsa-github-generator/version" + "github.com/slsa-framework/slsa-github-generator/v2/version" ) func versionCmd() *cobra.Command { diff --git a/internal/builders/docker/commands.go b/internal/builders/docker/commands.go index 59a5e2c126..41a7fef675 100644 --- a/internal/builders/docker/commands.go +++ b/internal/builders/docker/commands.go @@ -29,8 +29,8 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/spf13/cobra" - "github.com/slsa-framework/slsa-github-generator/internal/builders/docker/pkg" - "github.com/slsa-framework/slsa-github-generator/internal/utils" + "github.com/slsa-framework/slsa-github-generator/v2/internal/builders/docker/pkg" + "github.com/slsa-framework/slsa-github-generator/v2/internal/utils" ) // DryRunCmd returns a new *cobra.Command that validates the input flags, and diff --git a/internal/builders/docker/pkg/builder.go b/internal/builders/docker/pkg/builder.go index 1e438aab3f..24321c0a18 100644 --- a/internal/builders/docker/pkg/builder.go +++ b/internal/builders/docker/pkg/builder.go @@ -42,7 +42,7 @@ import ( intoto "github.com/in-toto/in-toto-golang/in_toto" slsa1 "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v1" - "github.com/slsa-framework/slsa-github-generator/internal/utils" + "github.com/slsa-framework/slsa-github-generator/v2/internal/utils" ) var ( diff --git a/internal/builders/docker/pkg/config.go b/internal/builders/docker/pkg/config.go index 605a2e299f..731e134d2c 100644 --- a/internal/builders/docker/pkg/config.go +++ b/internal/builders/docker/pkg/config.go @@ -23,7 +23,7 @@ import ( "strings" toml "github.com/pelletier/go-toml" - "github.com/slsa-framework/slsa-github-generator/internal/utils" + "github.com/slsa-framework/slsa-github-generator/v2/internal/utils" ) // BuildConfig is a collection of parameters to use for building the artifact. diff --git a/internal/builders/generic/attest.go b/internal/builders/generic/attest.go index 4bb9bba1f4..a794a0c5f1 100644 --- a/internal/builders/generic/attest.go +++ b/internal/builders/generic/attest.go @@ -26,11 +26,11 @@ import ( "github.com/spf13/cobra" intoto "github.com/in-toto/in-toto-golang/in_toto" - "github.com/slsa-framework/slsa-github-generator/github" - "github.com/slsa-framework/slsa-github-generator/internal/builders/common" - "github.com/slsa-framework/slsa-github-generator/internal/utils" - "github.com/slsa-framework/slsa-github-generator/signing" - "github.com/slsa-framework/slsa-github-generator/slsa" + "github.com/slsa-framework/slsa-github-generator/v2/github" + "github.com/slsa-framework/slsa-github-generator/v2/internal/builders/common" + "github.com/slsa-framework/slsa-github-generator/v2/internal/utils" + "github.com/slsa-framework/slsa-github-generator/v2/signing" + "github.com/slsa-framework/slsa-github-generator/v2/slsa" ) // attestCmd returns the 'attest' command. diff --git a/internal/builders/generic/attest_test.go b/internal/builders/generic/attest_test.go index 6399ec0eff..b0a745cabe 100644 --- a/internal/builders/generic/attest_test.go +++ b/internal/builders/generic/attest_test.go @@ -27,9 +27,9 @@ import ( intoto "github.com/in-toto/in-toto-golang/in_toto" slsacommon "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/common" - "github.com/slsa-framework/slsa-github-generator/internal/testutil" - "github.com/slsa-framework/slsa-github-generator/internal/utils" - "github.com/slsa-framework/slsa-github-generator/slsa" + "github.com/slsa-framework/slsa-github-generator/v2/internal/testutil" + "github.com/slsa-framework/slsa-github-generator/v2/internal/utils" + "github.com/slsa-framework/slsa-github-generator/v2/slsa" ) const ( diff --git a/internal/builders/generic/main.go b/internal/builders/generic/main.go index 329152f75c..180fcfff35 100644 --- a/internal/builders/generic/main.go +++ b/internal/builders/generic/main.go @@ -20,7 +20,7 @@ import ( // TODO: Allow use of other OIDC providers? // Enable the github OIDC auth provider. _ "github.com/sigstore/cosign/v2/pkg/providers/github" - "github.com/slsa-framework/slsa-github-generator/signing/sigstore" + "github.com/slsa-framework/slsa-github-generator/v2/signing/sigstore" "github.com/spf13/cobra" ) diff --git a/internal/builders/generic/version.go b/internal/builders/generic/version.go index 2e71bca108..cc2ec0f1b2 100644 --- a/internal/builders/generic/version.go +++ b/internal/builders/generic/version.go @@ -19,7 +19,7 @@ import ( "github.com/spf13/cobra" - "github.com/slsa-framework/slsa-github-generator/version" + "github.com/slsa-framework/slsa-github-generator/v2/version" ) func versionCmd() *cobra.Command { diff --git a/internal/builders/go/main.go b/internal/builders/go/main.go index 92e539270c..a34a0c5750 100644 --- a/internal/builders/go/main.go +++ b/internal/builders/go/main.go @@ -24,14 +24,14 @@ import ( "os" "os/exec" - "github.com/slsa-framework/slsa-github-generator/github" - "github.com/slsa-framework/slsa-github-generator/signing/sigstore" + "github.com/slsa-framework/slsa-github-generator/v2/github" + "github.com/slsa-framework/slsa-github-generator/v2/signing/sigstore" // Enable the GitHub OIDC auth provider. _ "github.com/sigstore/cosign/v2/pkg/providers/github" - "github.com/slsa-framework/slsa-github-generator/internal/builders/go/pkg" - "github.com/slsa-framework/slsa-github-generator/internal/utils" + "github.com/slsa-framework/slsa-github-generator/v2/internal/builders/go/pkg" + "github.com/slsa-framework/slsa-github-generator/v2/internal/utils" ) func usage(p string) { diff --git a/internal/builders/go/main_test.go b/internal/builders/go/main_test.go index f1a692b524..6f79810f92 100644 --- a/internal/builders/go/main_test.go +++ b/internal/builders/go/main_test.go @@ -26,8 +26,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/slsa-framework/slsa-github-generator/internal/builders/go/pkg" - "github.com/slsa-framework/slsa-github-generator/internal/utils" + "github.com/slsa-framework/slsa-github-generator/v2/internal/builders/go/pkg" + "github.com/slsa-framework/slsa-github-generator/v2/internal/utils" ) func checkWorkingDir(t *testing.T, wd, expected string) { diff --git a/internal/builders/go/pkg/build.go b/internal/builders/go/pkg/build.go index 76f846dcff..45bc81f0bb 100644 --- a/internal/builders/go/pkg/build.go +++ b/internal/builders/go/pkg/build.go @@ -23,9 +23,9 @@ import ( "regexp" "strings" - "github.com/slsa-framework/slsa-github-generator/github" - "github.com/slsa-framework/slsa-github-generator/internal/runner" - "github.com/slsa-framework/slsa-github-generator/internal/utils" + "github.com/slsa-framework/slsa-github-generator/v2/github" + "github.com/slsa-framework/slsa-github-generator/v2/internal/runner" + "github.com/slsa-framework/slsa-github-generator/v2/internal/utils" ) var unknownTag = "unknown" diff --git a/internal/builders/go/pkg/config.go b/internal/builders/go/pkg/config.go index 2bbc351f52..b475dcc510 100644 --- a/internal/builders/go/pkg/config.go +++ b/internal/builders/go/pkg/config.go @@ -23,7 +23,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/slsa-framework/slsa-github-generator/internal/utils" + "github.com/slsa-framework/slsa-github-generator/v2/internal/utils" ) var supportedVersions = map[int]bool{ diff --git a/internal/builders/go/pkg/provenance.go b/internal/builders/go/pkg/provenance.go index 787f7fbc93..1cb2eca50f 100644 --- a/internal/builders/go/pkg/provenance.go +++ b/internal/builders/go/pkg/provenance.go @@ -20,13 +20,13 @@ import ( "fmt" "os" - "github.com/slsa-framework/slsa-github-generator/signing" + "github.com/slsa-framework/slsa-github-generator/v2/signing" intoto "github.com/in-toto/in-toto-golang/in_toto" slsacommon "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/common" - "github.com/slsa-framework/slsa-github-generator/github" - "github.com/slsa-framework/slsa-github-generator/internal/utils" - "github.com/slsa-framework/slsa-github-generator/slsa" + "github.com/slsa-framework/slsa-github-generator/v2/github" + "github.com/slsa-framework/slsa-github-generator/v2/internal/utils" + "github.com/slsa-framework/slsa-github-generator/v2/slsa" ) const ( diff --git a/internal/builders/go/pkg/provenance_test.go b/internal/builders/go/pkg/provenance_test.go index 47d059e5b3..c6b1516ba0 100644 --- a/internal/builders/go/pkg/provenance_test.go +++ b/internal/builders/go/pkg/provenance_test.go @@ -17,8 +17,8 @@ package pkg import ( "testing" - "github.com/slsa-framework/slsa-github-generator/internal/testutil" - "github.com/slsa-framework/slsa-github-generator/slsa" + "github.com/slsa-framework/slsa-github-generator/v2/internal/testutil" + "github.com/slsa-framework/slsa-github-generator/v2/slsa" ) func TestGenerateProvenance(t *testing.T) { diff --git a/internal/testutil/signing.go b/internal/testutil/signing.go index ebc87e6a7a..4ce8a7b986 100644 --- a/internal/testutil/signing.go +++ b/internal/testutil/signing.go @@ -19,7 +19,7 @@ import ( "errors" intoto "github.com/in-toto/in-toto-golang/in_toto" - "github.com/slsa-framework/slsa-github-generator/signing" + "github.com/slsa-framework/slsa-github-generator/v2/signing" ) // TestAttestation is a basic Attestation implementation. diff --git a/signing/sigstore/bundle.go b/signing/sigstore/bundle.go index d1f0e9b88c..74ea07192f 100644 --- a/signing/sigstore/bundle.go +++ b/signing/sigstore/bundle.go @@ -23,8 +23,8 @@ import ( sigstoreBundle "github.com/sigstore/sigstore-go/pkg/bundle" sigstoreRoot "github.com/sigstore/sigstore-go/pkg/root" sigstoreSign "github.com/sigstore/sigstore-go/pkg/sign" - "github.com/slsa-framework/slsa-github-generator/github" - "github.com/slsa-framework/slsa-github-generator/signing" + "github.com/slsa-framework/slsa-github-generator/v2/github" + "github.com/slsa-framework/slsa-github-generator/v2/signing" ) // BundleSigner is used to produce Sigstore Bundles from provenance statements. diff --git a/signing/sigstore/fulcio.go b/signing/sigstore/fulcio.go index 1ba6ab099c..c1cc38a854 100644 --- a/signing/sigstore/fulcio.go +++ b/signing/sigstore/fulcio.go @@ -25,8 +25,8 @@ import ( "github.com/sigstore/cosign/v2/cmd/cosign/cli/sign" "github.com/sigstore/cosign/v2/pkg/providers" "github.com/sigstore/sigstore/pkg/signature/dsse" - "github.com/slsa-framework/slsa-github-generator/signing" - "github.com/slsa-framework/slsa-github-generator/signing/envelope" + "github.com/slsa-framework/slsa-github-generator/v2/signing" + "github.com/slsa-framework/slsa-github-generator/v2/signing/envelope" intoto "github.com/in-toto/in-toto-golang/in_toto" ) diff --git a/signing/sigstore/rekor.go b/signing/sigstore/rekor.go index 1a08370451..ff4650e6a4 100644 --- a/signing/sigstore/rekor.go +++ b/signing/sigstore/rekor.go @@ -22,7 +22,7 @@ import ( "github.com/sigstore/rekor/pkg/client" "github.com/sigstore/rekor/pkg/generated/client/entries" "github.com/sigstore/rekor/pkg/generated/models" - "github.com/slsa-framework/slsa-github-generator/signing" + "github.com/slsa-framework/slsa-github-generator/v2/signing" ) const ( diff --git a/slsa/buildtype.go b/slsa/buildtype.go index fbf96a1848..a17efb68f3 100644 --- a/slsa/buildtype.go +++ b/slsa/buildtype.go @@ -26,7 +26,7 @@ import ( slsa "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2" slsa02 "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2" - "github.com/slsa-framework/slsa-github-generator/github" + "github.com/slsa-framework/slsa-github-generator/v2/github" ) // BuildType implements generation of buildType specific elements of SLSA diff --git a/slsa/clientprovider.go b/slsa/clientprovider.go index 30d65f050f..b24403b00a 100644 --- a/slsa/clientprovider.go +++ b/slsa/clientprovider.go @@ -19,7 +19,7 @@ import ( githubapi "github.com/google/go-github/v57/github" - "github.com/slsa-framework/slsa-github-generator/github" + "github.com/slsa-framework/slsa-github-generator/v2/github" ) // ClientProvider creates Github API clients. diff --git a/slsa/provenance_test.go b/slsa/provenance_test.go index b09959285a..34a33e983c 100644 --- a/slsa/provenance_test.go +++ b/slsa/provenance_test.go @@ -23,7 +23,7 @@ import ( intoto "github.com/in-toto/in-toto-golang/in_toto" slsacommon "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/common" slsa02 "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2" - "github.com/slsa-framework/slsa-github-generator/github" + "github.com/slsa-framework/slsa-github-generator/v2/github" ) var (