Skip to content

Commit

Permalink
fix: checksum header (#2154)
Browse files Browse the repository at this point in the history 
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
  • Loading branch information
@caarlos0
caarlos0 committed Apr 1, 2021
1 parent 6916e05 commit f6b1d15
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 59 deletions.
4 changes: 3 additions & 1 deletion internal/pipe/artifactory/artifactory.go
View file
Expand Up @@ -23,7 +23,9 @@ func (Pipe) String() string {
// Default sets the pipe defaults.
func (Pipe) Default(ctx *context.Context) error {
for i := range ctx.Config.Artifactories {
ctx.Config.Artifactories[i].ChecksumHeader = "X-Checksum-SHA256"
if ctx.Config.Artifactories[i].ChecksumHeader == "" {
ctx.Config.Artifactories[i].ChecksumHeader = "X-Checksum-SHA256"
}
ctx.Config.Artifactories[i].Method = h.MethodPut
}
return http.Defaults(ctx.Config.Artifactories)
Expand Down
117 changes: 59 additions & 58 deletions internal/pipe/artifactory/artifactory_test.go
View file
Expand Up @@ -57,13 +57,13 @@ func TestRunPipe_ModeBinary(t *testing.T) {
setup()
defer teardown()

var folder = t.TempDir()
var dist = filepath.Join(folder, "dist")
require.NoError(t, os.Mkdir(dist, 0755))
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0755))
var binPath = filepath.Join(dist, "mybin", "mybin")
folder := t.TempDir()
dist := filepath.Join(folder, "dist")
require.NoError(t, os.Mkdir(dist, 0o755))
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0o755))
binPath := filepath.Join(dist, "mybin", "mybin")
d1 := []byte("hello\ngo\n")
require.NoError(t, ioutil.WriteFile(binPath, d1, 0666))
require.NoError(t, ioutil.WriteFile(binPath, d1, 0o666))

// Dummy artifactories
mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin", func(w http.ResponseWriter, r *http.Request) {
Expand Down Expand Up @@ -171,7 +171,7 @@ func TestRunPipe_ModeBinary(t *testing.T) {
}`)
})

var ctx = context.New(config.Project{
ctx := context.New(config.Project{
ProjectName: "mybin",
Dist: dist,
Artifactories: []config.Upload{
Expand Down Expand Up @@ -214,13 +214,13 @@ func TestRunPipe_ModeArchive(t *testing.T) {
setup()
defer teardown()

var folder = t.TempDir()
folder := t.TempDir()
tarfile, err := os.Create(filepath.Join(folder, "bin.tar.gz"))
require.NoError(t, err)
debfile, err := os.Create(filepath.Join(folder, "bin.deb"))
require.NoError(t, err)

var ctx = context.New(config.Project{
ctx := context.New(config.Project{
ProjectName: "goreleaser",
Dist: folder,
Artifactories: []config.Upload{
Expand Down Expand Up @@ -315,11 +315,11 @@ func TestRunPipe_ModeArchive(t *testing.T) {
}

func TestRunPipe_ArtifactoryDown(t *testing.T) {
var folder = t.TempDir()
folder := t.TempDir()
tarfile, err := os.Create(filepath.Join(folder, "bin.tar.gz"))
require.NoError(t, err)

var ctx = context.New(config.Project{
ctx := context.New(config.Project{
ProjectName: "goreleaser",
Dist: folder,
Artifactories: []config.Upload{
Expand Down Expand Up @@ -348,11 +348,11 @@ func TestRunPipe_ArtifactoryDown(t *testing.T) {
}

func TestRunPipe_TargetTemplateError(t *testing.T) {
var folder = t.TempDir()
var dist = filepath.Join(folder, "dist")
var binPath = filepath.Join(dist, "mybin", "mybin")
folder := t.TempDir()
dist := filepath.Join(folder, "dist")
binPath := filepath.Join(dist, "mybin", "mybin")

var ctx = context.New(config.Project{
ctx := context.New(config.Project{
ProjectName: "mybin",
Dist: dist,
Artifactories: []config.Upload{
Expand Down Expand Up @@ -387,13 +387,13 @@ func TestRunPipe_BadCredentials(t *testing.T) {
setup()
defer teardown()

var folder = t.TempDir()
var dist = filepath.Join(folder, "dist")
require.NoError(t, os.Mkdir(dist, 0755))
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0755))
var binPath = filepath.Join(dist, "mybin", "mybin")
folder := t.TempDir()
dist := filepath.Join(folder, "dist")
require.NoError(t, os.Mkdir(dist, 0o755))
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0o755))
binPath := filepath.Join(dist, "mybin", "mybin")
d1 := []byte("hello\ngo\n")
require.NoError(t, ioutil.WriteFile(binPath, d1, 0666))
require.NoError(t, ioutil.WriteFile(binPath, d1, 0o666))

// Dummy artifactories
mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin", func(w http.ResponseWriter, r *http.Request) {
Expand All @@ -411,7 +411,7 @@ func TestRunPipe_BadCredentials(t *testing.T) {
}`)
})

var ctx = context.New(config.Project{
ctx := context.New(config.Project{
ProjectName: "mybin",
Dist: dist,
Artifactories: []config.Upload{
Expand All @@ -438,7 +438,7 @@ func TestRunPipe_BadCredentials(t *testing.T) {
})

require.NoError(t, Pipe{}.Default(ctx))
var err = Pipe{}.Publish(ctx)
err := Pipe{}.Publish(ctx)
require.Error(t, err)
require.Contains(t, err.Error(), "Bad credentials")
}
Expand All @@ -447,13 +447,13 @@ func TestRunPipe_UnparsableErrorResponse(t *testing.T) {
setup()
defer teardown()

var folder = t.TempDir()
var dist = filepath.Join(folder, "dist")
require.NoError(t, os.Mkdir(dist, 0755))
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0755))
var binPath = filepath.Join(dist, "mybin", "mybin")
folder := t.TempDir()
dist := filepath.Join(folder, "dist")
require.NoError(t, os.Mkdir(dist, 0o755))
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0o755))
binPath := filepath.Join(dist, "mybin", "mybin")
d1 := []byte("hello\ngo\n")
require.NoError(t, ioutil.WriteFile(binPath, d1, 0666))
require.NoError(t, ioutil.WriteFile(binPath, d1, 0o666))

// Dummy artifactories
mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin", func(w http.ResponseWriter, r *http.Request) {
Expand All @@ -470,7 +470,7 @@ func TestRunPipe_UnparsableErrorResponse(t *testing.T) {
}`)
})

var ctx = context.New(config.Project{
ctx := context.New(config.Project{
ProjectName: "mybin",
Dist: dist,
Artifactories: []config.Upload{
Expand Down Expand Up @@ -501,7 +501,7 @@ func TestRunPipe_UnparsableErrorResponse(t *testing.T) {
}

func TestRunPipe_FileNotFound(t *testing.T) {
var ctx = context.New(config.Project{
ctx := context.New(config.Project{
ProjectName: "mybin",
Dist: "archivetest/dist",
Artifactories: []config.Upload{
Expand Down Expand Up @@ -532,15 +532,15 @@ func TestRunPipe_FileNotFound(t *testing.T) {
}

func TestRunPipe_UnparsableTarget(t *testing.T) {
var folder = t.TempDir()
var dist = filepath.Join(folder, "dist")
require.NoError(t, os.Mkdir(dist, 0755))
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0755))
var binPath = filepath.Join(dist, "mybin", "mybin")
folder := t.TempDir()
dist := filepath.Join(folder, "dist")
require.NoError(t, os.Mkdir(dist, 0o755))
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0o755))
binPath := filepath.Join(dist, "mybin", "mybin")
d1 := []byte("hello\ngo\n")
require.NoError(t, ioutil.WriteFile(binPath, d1, 0666))
require.NoError(t, ioutil.WriteFile(binPath, d1, 0o666))

var ctx = context.New(config.Project{
ctx := context.New(config.Project{
ProjectName: "mybin",
Dist: dist,
Artifactories: []config.Upload{
Expand Down Expand Up @@ -571,7 +571,7 @@ func TestRunPipe_UnparsableTarget(t *testing.T) {
}

func TestRunPipe_SkipWhenPublishFalse(t *testing.T) {
var ctx = context.New(config.Project{
ctx := context.New(config.Project{
Artifactories: []config.Upload{
{
Name: "production",
Expand All @@ -596,13 +596,13 @@ func TestRunPipe_SkipWhenPublishFalse(t *testing.T) {
}

func TestRunPipe_DirUpload(t *testing.T) {
var folder = t.TempDir()
var dist = filepath.Join(folder, "dist")
require.NoError(t, os.Mkdir(dist, 0755))
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0755))
var binPath = filepath.Join(dist, "mybin")
folder := t.TempDir()
dist := filepath.Join(folder, "dist")
require.NoError(t, os.Mkdir(dist, 0o755))
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0o755))
binPath := filepath.Join(dist, "mybin")

var ctx = context.New(config.Project{
ctx := context.New(config.Project{
ProjectName: "mybin",
Dist: dist,
Artifactories: []config.Upload{
Expand Down Expand Up @@ -637,13 +637,13 @@ func TestDescription(t *testing.T) {
}

func TestNoArtifactories(t *testing.T) {
var ctx = context.New(config.Project{})
ctx := context.New(config.Project{})
require.NoError(t, Pipe{}.Default(ctx))
require.True(t, pipe.IsSkip(Pipe{}.Publish(ctx)))
}

func TestArtifactoriesWithoutTarget(t *testing.T) {
var ctx = &context.Context{
ctx := &context.Context{
Env: map[string]string{
"ARTIFACTORY_PRODUCTION_SECRET": "deployuser-secret",
},
Expand All @@ -662,7 +662,7 @@ func TestArtifactoriesWithoutTarget(t *testing.T) {
}

func TestArtifactoriesWithoutUsername(t *testing.T) {
var ctx = &context.Context{
ctx := &context.Context{
Env: map[string]string{
"ARTIFACTORY_PRODUCTION_SECRET": "deployuser-secret",
},
Expand All @@ -681,7 +681,7 @@ func TestArtifactoriesWithoutUsername(t *testing.T) {
}

func TestArtifactoriesWithoutName(t *testing.T) {
var ctx = context.New(config.Project{
ctx := context.New(config.Project{
Artifactories: []config.Upload{
{
Username: "deployuser",
Expand All @@ -694,7 +694,7 @@ func TestArtifactoriesWithoutName(t *testing.T) {
}

func TestArtifactoriesWithoutSecret(t *testing.T) {
var ctx = context.New(config.Project{
ctx := context.New(config.Project{
Artifactories: []config.Upload{
{
Name: "production",
Expand All @@ -708,7 +708,7 @@ func TestArtifactoriesWithoutSecret(t *testing.T) {
}

func TestArtifactoriesWithInvalidMode(t *testing.T) {
var ctx = &context.Context{
ctx := &context.Context{
Env: map[string]string{
"ARTIFACTORY_PRODUCTION_SECRET": "deployuser-secret",
},
Expand All @@ -729,7 +729,7 @@ func TestArtifactoriesWithInvalidMode(t *testing.T) {
}

func TestDefault(t *testing.T) {
var ctx = &context.Context{
ctx := &context.Context{
Config: config.Project{
Artifactories: []config.Upload{
{
Expand All @@ -743,12 +743,12 @@ func TestDefault(t *testing.T) {

require.NoError(t, Pipe{}.Default(ctx))
require.Len(t, ctx.Config.Artifactories, 1)
var artifactory = ctx.Config.Artifactories[0]
artifactory := ctx.Config.Artifactories[0]
require.Equal(t, "archive", artifactory.Mode)
}

func TestDefaultNoArtifactories(t *testing.T) {
var ctx = &context.Context{
ctx := &context.Context{
Config: config.Project{
Artifactories: []config.Upload{},
},
Expand All @@ -758,18 +758,19 @@ func TestDefaultNoArtifactories(t *testing.T) {
}

func TestDefaultSet(t *testing.T) {
var ctx = &context.Context{
ctx := &context.Context{
Config: config.Project{
Artifactories: []config.Upload{
{
Mode: "custom",
Mode: "custom",
ChecksumHeader: "foo",
},
},
},
}
require.NoError(t, Pipe{}.Default(ctx))
require.Len(t, ctx.Config.Artifactories, 1)
var artifactory = ctx.Config.Artifactories[0]
artifactory := ctx.Config.Artifactories[0]
require.Equal(t, "custom", artifactory.Mode)
require.Equal(t, "X-Checksum-SHA256", artifactory.ChecksumHeader)
require.Equal(t, "foo", artifactory.ChecksumHeader)
}

1 comment on commit f6b1d15

@vercel
Copy link

@vercel vercel bot commented on f6b1d15 Apr 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

Please sign in to comment.