diff --git a/actions/changeloggenerate/changelog-generate.go b/actions/changeloggenerate/changelog-generate.go index 57c1245..97c96d6 100644 --- a/actions/changeloggenerate/changelog-generate.go +++ b/actions/changeloggenerate/changelog-generate.go @@ -6,7 +6,7 @@ import ( "github.com/cidverse/cid-actions-go/pkg/changelog" cidsdk "github.com/cidverse/cid-sdk-go" - "github.com/cidverse/cidverseutils/pkg/version" + "github.com/cidverse/cidverseutils/version" ) type Action struct { diff --git a/actions/container/containercommon/util.go b/actions/container/containercommon/util.go index 96cac3f..828525d 100644 --- a/actions/container/containercommon/util.go +++ b/actions/container/containercommon/util.go @@ -3,7 +3,7 @@ package containercommon import ( "strings" - "github.com/cidverse/cidverseutils/pkg/filesystem" + "github.com/cidverse/cidverseutils/filesystem" "github.com/oriser/regroup" ) diff --git a/actions/github/githubpublishrelease/github-release-publish.go b/actions/github/githubpublishrelease/github-release-publish.go index 7339511..310c8a9 100644 --- a/actions/github/githubpublishrelease/github-release-publish.go +++ b/actions/github/githubpublishrelease/github-release-publish.go @@ -5,7 +5,7 @@ import ( "strings" cidsdk "github.com/cidverse/cid-sdk-go" - "github.com/cidverse/cidverseutils/pkg/version" + "github.com/cidverse/cidverseutils/version" ) type Action struct { diff --git a/actions/github/githubpublishsarif/github-sarif-upload.go b/actions/github/githubpublishsarif/github-sarif-upload.go index c0b4cf5..ff1c18a 100644 --- a/actions/github/githubpublishsarif/github-sarif-upload.go +++ b/actions/github/githubpublishsarif/github-sarif-upload.go @@ -7,7 +7,7 @@ import ( "github.com/cidverse/cid-actions-go/pkg/githubapi" cidsdk "github.com/cidverse/cid-sdk-go" - "github.com/cidverse/cidverseutils/pkg/encoding" + "github.com/cidverse/cidverseutils/compress" "github.com/google/go-github/v61/github" "golang.org/x/oauth2" ) @@ -53,7 +53,7 @@ func (a Action) Execute() (err error) { } // encoding - sarifEncoded, reportErr := encoding.GZIPBase64EncodeBytes(sarif) + sarifEncoded, reportErr := compress.GZIPBase64EncodeBytes(sarif) if reportErr != nil { return fmt.Errorf("failed to encode sarif report (gzip/base64): %w", err) } diff --git a/go.mod b/go.mod index 9c80a17..c10e726 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,11 @@ module github.com/cidverse/cid-actions-go go 1.21 require ( - github.com/cidverse/cid-sdk-go v0.0.0-20240318001225-c193d83f053e + github.com/cidverse/cid-sdk-go v0.0.0-20240509101703-81f74548ee23 github.com/cidverse/cidverseutils v0.0.0-20240302003507-f592801a7e1a + github.com/cidverse/cidverseutils/compress v0.1.0 + github.com/cidverse/cidverseutils/filesystem v0.1.0 + github.com/cidverse/cidverseutils/version v0.1.0 github.com/containers/image/v5 v5.30.0 github.com/go-resty/resty/v2 v2.13.0 github.com/google/go-github/v61 v61.0.0 @@ -21,11 +24,12 @@ require ( ) require ( + github.com/charlievieth/fastwalk v1.0.3 // indirect github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect - github.com/containers/ocicrypt v1.1.9 // indirect + github.com/containers/ocicrypt v1.1.10 // indirect github.com/containers/storage v1.53.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/docker/docker v25.0.3+incompatible // indirect + github.com/docker/docker v26.1.2+incompatible // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gosimple/unidecode v1.0.1 // indirect @@ -40,9 +44,9 @@ require ( github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.2 // indirect - golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect + golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/net v0.25.0 // indirect - golang.org/x/sync v0.6.0 // indirect + golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.20.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect ) diff --git a/go.sum b/go.sum index bb0354b..31257dc 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,22 @@ github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= -github.com/cidverse/cid-sdk-go v0.0.0-20240318001225-c193d83f053e h1:CaFTWFKaj6iEx6EH3KSg9yd1/cLp/ezWGP+nNOP+EgY= -github.com/cidverse/cid-sdk-go v0.0.0-20240318001225-c193d83f053e/go.mod h1:UzzSq9FltGxXOJ1uB3oUGT6cxi3AzZaIHOfY7uK732g= +github.com/charlievieth/fastwalk v1.0.3 h1:eNWFaNPe5srPqQ5yyDbhAf11paeZaHWcihRhpuYFfSg= +github.com/charlievieth/fastwalk v1.0.3/go.mod h1:JSfglY/gmL/rqsUS1NCsJTocB5n6sSl9ApAqif4CUbs= +github.com/cidverse/cid-sdk-go v0.0.0-20240509101703-81f74548ee23 h1:7NHx8Bo8H/rFxfrXBYBLnJJGq0czAC7sgbIA6lVXb24= +github.com/cidverse/cid-sdk-go v0.0.0-20240509101703-81f74548ee23/go.mod h1:vMkg6F0qb4yPbaTwXhGAJ0MasFbIbHiX7Jm0z/Noqyg= github.com/cidverse/cidverseutils v0.0.0-20240302003507-f592801a7e1a h1:bnLhBQh+pGkf5lMfkC5nVVvooMFeWhrn3nlYbZ2UZ+s= github.com/cidverse/cidverseutils v0.0.0-20240302003507-f592801a7e1a/go.mod h1:m71LmY0gEvKZ2jxFboMdGCcN9DgFlOmwNGH2TjM2nS4= +github.com/cidverse/cidverseutils/compress v0.1.0 h1:GrCp/50/Ltl3rn/WctHxY6lN+wgoms0qBqYpEbWmiZw= +github.com/cidverse/cidverseutils/compress v0.1.0/go.mod h1:Xga0FDD+hHizd9zH99+DrbqXTAsblYQVEolYiOCN/Ug= +github.com/cidverse/cidverseutils/filesystem v0.1.0 h1:0WF4gBtThvRMWUsoGtK1MT5O6yE5Ql6H2x6RkMLQoc8= +github.com/cidverse/cidverseutils/filesystem v0.1.0/go.mod h1:rw4oLD+q/7HCMkQUooxVz4He06ORyoAn2cXLFqpBinQ= +github.com/cidverse/cidverseutils/version v0.1.0 h1:+t9AaSW+++38SnlzF4x12E7oAdvXFw6HY7ujwBN7HCA= +github.com/cidverse/cidverseutils/version v0.1.0/go.mod h1:PbRN1pUYDBOT5uZXmOlQBCIoNJm6ubHJsg6Thgaq0TU= github.com/containers/image/v5 v5.30.0 h1:CmHeSwI6W2kTRWnUsxATDFY5TEX4b58gPkaQcEyrLIA= github.com/containers/image/v5 v5.30.0/go.mod h1:gSD8MVOyqBspc0ynLsuiMR9qmt8UQ4jpVImjmK0uXfk= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY= -github.com/containers/ocicrypt v1.1.9 h1:2Csfba4jse85Raxk5HIyEk8OwZNjRvfkhEGijOjIdEM= -github.com/containers/ocicrypt v1.1.9/go.mod h1:dTKx1918d8TDkxXvarscpNVY+lyPakPNFN4jwA9GBys= +github.com/containers/ocicrypt v1.1.10 h1:r7UR6o8+lyhkEywetubUUgcKFjOWOaWz8cEBrCPX0ic= +github.com/containers/ocicrypt v1.1.10/go.mod h1:YfzSSr06PTHQwSTUKqDSjish9BeW1E4HUmreluQcMd8= github.com/containers/storage v1.53.0 h1:VSES3C/u1pxjTJIXvLrSmyP7OBtDky04oGu07UvdTEA= github.com/containers/storage v1.53.0/go.mod h1:pujcoOSc+upx15Jirdkebhtd8uJiLwbSd/mYT6zDJK8= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -16,8 +24,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/docker/docker v25.0.3+incompatible h1:D5fy/lYmY7bvZa0XTZ5/UJPljor41F+vdyJG5luQLfQ= -github.com/docker/docker v25.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v26.1.2+incompatible h1:UVX5ZOrrfTGZZYEP+ZDq3Xn9PdHNXaSYMFPDumMqG2k= +github.com/docker/docker v26.1.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/go-resty/resty/v2 v2.13.0 h1:joaL6wxSgm1OZal4FAAyddkL1T4uo5NxHYFkGmUusqE= github.com/go-resty/resty/v2 v2.13.0/go.mod h1:GznXlLxkq6Nh4sU59rPmUw3VtgpO3aS96ORAI6Q7d+0= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -109,8 +117,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= -golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= +golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= +golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= @@ -128,8 +136,8 @@ golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbht golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/pkg/changelog/util.go b/pkg/changelog/util.go index 3b0e0f3..0df7162 100644 --- a/pkg/changelog/util.go +++ b/pkg/changelog/util.go @@ -5,7 +5,7 @@ import ( "errors" cidsdk "github.com/cidverse/cid-sdk-go" - "github.com/cidverse/cidverseutils/pkg/filesystem" + "github.com/cidverse/cidverseutils/filesystem" ) // GetFileContent returns the file content from either the directory or the embedded filesystem in that order