diff --git a/internal/builders/go/main.go b/internal/builders/go/main.go index 63bb341477..2255ca6e25 100644 --- a/internal/builders/go/main.go +++ b/internal/builders/go/main.go @@ -116,18 +116,17 @@ func main() { switch os.Args[1] { case buildCmd.Name(): - buildCmd.Parse(os.Args[2:]) + check(buildCmd.Parse(os.Args[2:])) if len(buildCmd.Args()) < 1 { usage(os.Args[0]) } configFile := buildCmd.Args()[0] evaluatedEnvs := buildCmd.Args()[1] - err := runBuild(*buildDry, configFile, evaluatedEnvs) - check(err) + check(runBuild(*buildDry, configFile, evaluatedEnvs)) case provenanceCmd.Name(): - provenanceCmd.Parse(os.Args[2:]) + check(provenanceCmd.Parse(os.Args[2:])) // Note: *provenanceEnv may be empty. if *provenanceName == "" || *provenanceDigest == "" || *provenanceCommand == "" || *provenanceWorkingDir == "" { diff --git a/internal/builders/go/main_test.go b/internal/builders/go/main_test.go index 7594c7a8fc..a1f546415f 100644 --- a/internal/builders/go/main_test.go +++ b/internal/builders/go/main_test.go @@ -340,7 +340,9 @@ func (r *run) end() string { os.Stdout = r.oldStdout var buf bytes.Buffer - io.Copy(&buf, r.rPipe) + if _, err := io.Copy(&buf, r.rPipe); err != nil { + panic(err) + } s := buf.String() r.oldStdout = nil diff --git a/internal/builders/go/pkg/config.go b/internal/builders/go/pkg/config.go index d5e58016e8..9756c14953 100644 --- a/internal/builders/go/pkg/config.go +++ b/internal/builders/go/pkg/config.go @@ -38,7 +38,7 @@ type goReleaserConfigFile struct { Env []string `yaml:"env"` Flags []string `yaml:"flags"` Ldflags []string `yaml:"ldflags"` - Binary string `yaml:"binary` + Binary string `yaml:"binary"` Version int `yaml:"version"` Main *string `yaml:"main"` Dir *string `yaml:"dir"` diff --git a/internal/builders/go/pkg/marshall.go b/internal/builders/go/pkg/marshall.go index a6a5a53040..5055877baa 100644 --- a/internal/builders/go/pkg/marshall.go +++ b/internal/builders/go/pkg/marshall.go @@ -40,23 +40,3 @@ func marshallToBytes(args interface{}) ([]byte, error) { } return []byte(encoded), nil } - -// TODO: use generics to support any type. -func unmarshallList(arg string) ([]string, error) { - var res []string - // If argument is empty, return an empty list early, - // because `json.Unmarshal` would fail. - if arg == "" { - return res, nil - } - - cs, err := base64.StdEncoding.DecodeString(arg) - if err != nil { - return res, fmt.Errorf("base64.StdEncoding.DecodeString: %w", err) - } - - if err := json.Unmarshal(cs, &res); err != nil { - return []string{}, fmt.Errorf("json.Unmarshal: %w", err) - } - return res, nil -} diff --git a/internal/builders/go/pkg/provenance.go b/internal/builders/go/pkg/provenance.go index 6444ab87f7..f6dd7ab2d8 100644 --- a/internal/builders/go/pkg/provenance.go +++ b/internal/builders/go/pkg/provenance.go @@ -29,12 +29,8 @@ import ( ) const ( - parametersVersion int = 1 buildConfigVersion int = 1 buildType = "https://github.com/slsa-framework/slsa-github-generator/go@v1" - requestTokenEnvKey = "ACTIONS_ID_TOKEN_REQUEST_TOKEN" - requestURLEnvKey = "ACTIONS_ID_TOKEN_REQUEST_URL" - audience = "slsa-framework/slsa-github-generator" ) type ( diff --git a/internal/builders/go/pkg/utils.go b/internal/builders/go/pkg/utils.go index 984ecb5fae..9bd279e1e9 100644 --- a/internal/builders/go/pkg/utils.go +++ b/internal/builders/go/pkg/utils.go @@ -44,15 +44,6 @@ func pathIsUnderCurrentDirectory(path string) error { return nil } -func isDirectory(path string) (bool, error) { - fileInfo, err := os.Stat(path) - if err != nil { - return false, err - } - - return fileInfo.IsDir(), err -} - func UnmarshallList(arg string) ([]string, error) { var res []string // If argument is empty, return an empty list early,