Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
331 changes: 213 additions & 118 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion internal/builders/common/buildtype.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions internal/builders/container/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions internal/builders/container/generate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion internal/builders/container/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions internal/builders/docker/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/builders/docker/pkg/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion internal/builders/docker/pkg/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions internal/builders/generic/attest.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions internal/builders/generic/attest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion internal/builders/generic/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/builders/generic/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions internal/builders/go/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions internal/builders/go/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions internal/builders/go/pkg/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/builders/go/pkg/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
8 changes: 4 additions & 4 deletions internal/builders/go/pkg/provenance.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions internal/builders/go/pkg/provenance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion internal/testutil/signing.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions signing/sigstore/bundle.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions signing/sigstore/fulcio.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion signing/sigstore/rekor.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion slsa/buildtype.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion slsa/clientprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion slsa/provenance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down