From 537a5ef5b8e14d6e860e8f0b1ac911cc831437c0 Mon Sep 17 00:00:00 2001 From: Eyal Ben Moshe Date: Sun, 11 Jul 2021 18:15:04 +0300 Subject: [PATCH] Adapt to API change in jfrog-client-go (#43) * Go 1 13 compatibility. * Added code descriptions for the CmdOutputPattern variables. * Do not remove go.sum files. * Do not remove go.sum files. * Remove VCS fallback functionality * Adapt to API change in jfrog-client-go * Update go.mod Co-authored-by: Eyal Ben Moshe --- executers/gopackage.go | 2 +- go.mod | 4 ++-- go.sum | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/executers/gopackage.go b/executers/gopackage.go index 764fae3..005d323 100644 --- a/executers/gopackage.go +++ b/executers/gopackage.go @@ -109,7 +109,7 @@ func (dependencyPackage *Package) Dependencies() []buildinfo.Dependency { func (dependencyPackage *Package) CreateBuildInfoDependencies() error { // Zip file dependency for the build-info zipDependency := buildinfo.Dependency{Id: dependencyPackage.id} - fileDetails, err := fileutils.GetFileDetails(dependencyPackage.zipPath) + fileDetails, err := fileutils.GetFileDetails(dependencyPackage.zipPath, true) if err != nil { return err } diff --git a/go.mod b/go.mod index a16195d..f6aa9b0 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/jfrog/gocmd go 1.15 require ( - github.com/jfrog/gofrog v1.0.6 + github.com/jfrog/gofrog v1.0.7 github.com/jfrog/jfrog-client-go v1.0.1 github.com/stretchr/testify v1.7.0 ) -// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v0.24.1-0.20210623152109-410745e2ff11 +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.0.2-0.20210711150920-e7fd48d9f0cb diff --git a/go.sum b/go.sum index 4c1f489..85c28ea 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,10 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jfrog/gofrog v1.0.6 h1:yUDxSCw8gTK6vC4PvtG0HTnEOQJSZ+O4lWGCgkev1nU= github.com/jfrog/gofrog v1.0.6/go.mod h1:HkDzg+tMNw23UryoOv0+LB94BzYcl6MCIoz8Tmlb+s8= -github.com/jfrog/jfrog-client-go v1.0.1 h1:v/s6RulJ2eEaOWS5go/DVrr8cIV5HLxzRiR4ZAZb+HA= -github.com/jfrog/jfrog-client-go v1.0.1/go.mod h1:bjBL6Svr951HZH7JvMtzPJ9Xy5cO0OweNjkhUzxKmtw= +github.com/jfrog/gofrog v1.0.7 h1:sHR5IDGFY61+mGqTH/dIZlojTeIb6kXdK74oxMAjTgc= +github.com/jfrog/gofrog v1.0.7/go.mod h1:HkDzg+tMNw23UryoOv0+LB94BzYcl6MCIoz8Tmlb+s8= +github.com/jfrog/jfrog-client-go v1.0.2-0.20210711150920-e7fd48d9f0cb h1:g/KSZBsSAsj7ndbDdKkktKZGlNcgQ9G21JvD8wH9u8I= +github.com/jfrog/jfrog-client-go v1.0.2-0.20210711150920-e7fd48d9f0cb/go.mod h1:bjBL6Svr951HZH7JvMtzPJ9Xy5cO0OweNjkhUzxKmtw= github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck= github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=