From c2a12ec89615465298c1d1a82f56a3e71fcaa371 Mon Sep 17 00:00:00 2001 From: Philipp Heuer Date: Fri, 10 May 2024 21:38:40 +0200 Subject: [PATCH] chore(deps): update module github.com/cidverse/repoanalyzer to v0.1.1-0.20240510193438-abb053de8c14 --- go.mod | 12 ++++++------ go.sum | 30 ++++++++++++++++-------------- pkg/cmd/api.go | 4 ++-- pkg/cmd/info.go | 4 ++-- pkg/cmd/module.go | 4 ++-- pkg/common/workflowrun/workflow.go | 4 ++-- 6 files changed, 30 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index b52b024..abeee09 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/cidverse/go-rules v0.0.0-20231112122021-075e5e6f8abc github.com/cidverse/go-vcs v0.0.0-20240402102656-5c7ce4c133c6 github.com/cidverse/normalizeci v1.1.1-0.20240507162324-423657017129 - github.com/cidverse/repoanalyzer v0.1.0 + github.com/cidverse/repoanalyzer v0.1.1-0.20240510193438-abb053de8c14 github.com/go-resty/resty/v2 v2.13.0 github.com/google/uuid v1.6.0 github.com/hashicorp/go-version v1.6.0 @@ -48,7 +48,7 @@ require ( github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect github.com/antlr4-go/antlr/v4 v4.13.0 // indirect github.com/charlievieth/fastwalk v1.0.3 // indirect - github.com/cidverse/cidverseutils/exec v0.0.0-20240507203508-adb806ff2095 // indirect + github.com/cidverse/cidverseutils/exec v0.1.0 // indirect github.com/cloudflare/circl v1.3.8 // indirect github.com/cyphar/filepath-securejoin v0.2.5 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -68,7 +68,7 @@ require ( github.com/gosimple/slug v1.14.0 // indirect github.com/gosimple/unidecode v1.0.1 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-retryablehttp v0.7.5 // indirect + github.com/hashicorp/go-retryablehttp v0.7.6 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect @@ -90,7 +90,7 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - github.com/xanzy/go-gitlab v0.104.1 // indirect + github.com/xanzy/go-gitlab v0.105.0 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect golang.org/x/crypto v0.23.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect @@ -101,8 +101,8 @@ require ( golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.15.0 // indirect golang.org/x/time v0.5.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240506185236-b8a5c65736ae // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240509183442-62759503f434 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434 // indirect google.golang.org/protobuf v1.34.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect ) diff --git a/go.sum b/go.sum index 09798bd..b6b0f3a 100644 --- a/go.sum +++ b/go.sum @@ -32,8 +32,8 @@ github.com/cidverse/cidverseutils/compress v0.1.0 h1:GrCp/50/Ltl3rn/WctHxY6lN+wg github.com/cidverse/cidverseutils/compress v0.1.0/go.mod h1:Xga0FDD+hHizd9zH99+DrbqXTAsblYQVEolYiOCN/Ug= github.com/cidverse/cidverseutils/containerruntime v0.1.0 h1:Jqv7/ughImvDL/Q/pTei4m2tZskG4hXTLTfK/byLIY4= github.com/cidverse/cidverseutils/containerruntime v0.1.0/go.mod h1:dyoA0ZzJc8YeTbZDtDnEFBXOuRXpOrQd5/9Y3XnZ3fg= -github.com/cidverse/cidverseutils/exec v0.0.0-20240507203508-adb806ff2095 h1:CdAAS+hm8tq02u0O7W3fqrQys0Ylc6sEt6/y5DjmJaY= -github.com/cidverse/cidverseutils/exec v0.0.0-20240507203508-adb806ff2095/go.mod h1:DHW1LndctiozzTrK8lgBtVFjdc3ynZviR5nEACmnB5E= +github.com/cidverse/cidverseutils/exec v0.1.0 h1:KbCnDISptCrFJFHDrA9efNM0GWNLVkon3yEzehisETY= +github.com/cidverse/cidverseutils/exec v0.1.0/go.mod h1:pBST2lLq7AnIZ6xM0foiz1VSUamGswN1csT/2MJAHHI= 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/hash v0.1.0 h1:bWZoBCuZDy4HsBLQD4Os5XjpHwqP64GdG1IZytD/GeU= @@ -50,8 +50,8 @@ github.com/cidverse/go-vcs v0.0.0-20240402102656-5c7ce4c133c6 h1:MFnUQVoQj3etU3D github.com/cidverse/go-vcs v0.0.0-20240402102656-5c7ce4c133c6/go.mod h1:QDjMQz4P6BH7AsBNRuLfgtSFUwmLRFozbe8h92tRhao= github.com/cidverse/normalizeci v1.1.1-0.20240507162324-423657017129 h1:pbgchEoNEvKnIv2Hs7vmT9p+mCpr07ewjlpw0XIGzlI= github.com/cidverse/normalizeci v1.1.1-0.20240507162324-423657017129/go.mod h1:fIJEgJ5jCHFxS61NPSpBSKXoNyMSYZC9GY3x5pVK960= -github.com/cidverse/repoanalyzer v0.1.0 h1:RQZG/c/5A0B+9l8ARTO5MT2CtqNNmimdgwZPTEYMi/0= -github.com/cidverse/repoanalyzer v0.1.0/go.mod h1:VmVAUm3a91TDIjDE3EwyvEnGjF9ST2RKKdBvfKoDWxE= +github.com/cidverse/repoanalyzer v0.1.1-0.20240510193438-abb053de8c14 h1:awlmw+fLSV6nLytZwFdjynR63sRzt4pkI7vGiYV0lFA= +github.com/cidverse/repoanalyzer v0.1.1-0.20240510193438-abb053de8c14/go.mod h1:seX5hGx0kH2Fo3d10BBH8Ojj2ar3ztsn9iweDJ2LANU= github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI= github.com/cloudflare/circl v1.3.8/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= @@ -68,6 +68,8 @@ github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcej github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE= @@ -112,10 +114,10 @@ github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6 github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= -github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-retryablehttp v0.7.5 h1:bJj+Pj19UZMIweq/iie+1u5YCdGrnxCT9yvm0e+Nd5M= -github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-retryablehttp v0.7.6 h1:TwRYfx2z2C4cLbXmT8I5PgP/xmuqASDyiVuGYfs9GZM= +github.com/hashicorp/go-retryablehttp v0.7.6/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/in-toto/in-toto-golang v0.9.0 h1:tHny7ac4KgtsfrG6ybU8gVOZux2H8jN05AXJ9EBM1XU= @@ -215,8 +217,8 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/xanzy/go-gitlab v0.104.1 h1:g/liXIPJH0jsTwVuzTAUMiKdTf6Qup3u2XZq5Rp90Wc= -github.com/xanzy/go-gitlab v0.104.1/go.mod h1:ETg8tcj4OhrB84UEgeE8dSuV/0h4BBL1uOV/qK0vlyI= +github.com/xanzy/go-gitlab v0.105.0 h1:3nyLq0ESez0crcaM19o5S//SvezOQguuIHZ3wgX64hM= +github.com/xanzy/go-gitlab v0.105.0/go.mod h1:ETg8tcj4OhrB84UEgeE8dSuV/0h4BBL1uOV/qK0vlyI= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= @@ -299,10 +301,10 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae h1:AH34z6WAGVNkllnKs5raNq3yRq93VnjBG6rpfub/jYk= -google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae/go.mod h1:FfiGhwUm6CJviekPrc0oJ+7h29e+DmWU6UtjX0ZvI7Y= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240506185236-b8a5c65736ae h1:c55+MER4zkBS14uJhSZMGGmya0yJx5iHV4x/fpOSNRk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240506185236-b8a5c65736ae/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM= +google.golang.org/genproto/googleapis/api v0.0.0-20240509183442-62759503f434 h1:OpXbo8JnN8+jZGPrL4SSfaDjSCjupr8lXyBAbexEm/U= +google.golang.org/genproto/googleapis/api v0.0.0-20240509183442-62759503f434/go.mod h1:FfiGhwUm6CJviekPrc0oJ+7h29e+DmWU6UtjX0ZvI7Y= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434 h1:umK/Ey0QEzurTNlsV3R+MfxHAb78HCEX/IkuR+zH4WQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM= google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/cmd/api.go b/pkg/cmd/api.go index bb8b821..ddddb88 100644 --- a/pkg/cmd/api.go +++ b/pkg/cmd/api.go @@ -7,7 +7,7 @@ import ( "github.com/cidverse/cid/pkg/common/api" "github.com/cidverse/cid/pkg/core/restapi" "github.com/cidverse/cid/pkg/core/state" - "github.com/cidverse/repoanalyzer" + "github.com/cidverse/repoanalyzer/analyzer" "github.com/cidverse/repoanalyzer/analyzerapi" "github.com/rs/zerolog/log" "github.com/spf13/cobra" @@ -44,7 +44,7 @@ cid api --type http --listen localhost:7400`, log.Debug().Str("command", "api").Str("type", apiType).Str("listen", listen).Str("socket", socketFile).Str("dir", projectDir).Msg("running command") // scan for modules - modules := repoanalyzer.AnalyzeProject(projectDir, projectDir) + modules := analyzer.ScanDirectory(projectDir) var currentModule *analyzerapi.ProjectModule = nil if currentModuleID >= 0 && currentModuleID < len(modules) { currentModule = modules[currentModuleID] diff --git a/pkg/cmd/info.go b/pkg/cmd/info.go index cd4ad77..a83931e 100644 --- a/pkg/cmd/info.go +++ b/pkg/cmd/info.go @@ -8,7 +8,7 @@ import ( "github.com/cidverse/cid/pkg/common/api" "github.com/cidverse/cid/pkg/common/command" "github.com/cidverse/cidverseutils/redact" - "github.com/cidverse/repoanalyzer" + "github.com/cidverse/repoanalyzer/analyzer" "github.com/cidverse/repoanalyzer/analyzerapi" "github.com/rs/zerolog/log" "github.com/spf13/cobra" @@ -51,7 +51,7 @@ var infoCmd = &cobra.Command{ } // detect project modules - for _, module := range repoanalyzer.AnalyzeProject(projectDir, projectDir) { + for _, module := range analyzer.ScanDirectory(projectDir) { if funk.Contains(excludes, "dep") { module.Dependencies = nil } diff --git a/pkg/cmd/module.go b/pkg/cmd/module.go index 15224c6..2fbe366 100644 --- a/pkg/cmd/module.go +++ b/pkg/cmd/module.go @@ -8,7 +8,7 @@ import ( "github.com/cidverse/cid/pkg/common/api" "github.com/cidverse/cidverseutils/redact" - "github.com/cidverse/repoanalyzer" + "github.com/cidverse/repoanalyzer/analyzer" "github.com/rs/zerolog" "github.com/spf13/cobra" ) @@ -40,7 +40,7 @@ var moduleListCmd = &cobra.Command{ projectDir := api.FindProjectDir() // analyze - modules := repoanalyzer.AnalyzeProject(projectDir, projectDir) + modules := analyzer.ScanDirectory(projectDir) // print list w := tabwriter.NewWriter(redact.NewProtectedWriter(nil, os.Stdout, &sync.Mutex{}, nil), 1, 1, 1, ' ', 0) diff --git a/pkg/common/workflowrun/workflow.go b/pkg/common/workflowrun/workflow.go index 53e2f95..19ca581 100644 --- a/pkg/common/workflowrun/workflow.go +++ b/pkg/common/workflowrun/workflow.go @@ -12,7 +12,7 @@ import ( "github.com/cidverse/cid/pkg/core/catalog" "github.com/cidverse/cid/pkg/core/state" "github.com/cidverse/cidverseutils/filesystem" - "github.com/cidverse/repoanalyzer" + "github.com/cidverse/repoanalyzer/analyzer" "github.com/cidverse/cid/pkg/common/api" "github.com/cidverse/cid/pkg/core/config" @@ -121,7 +121,7 @@ func RunWorkflowAction(cfg *config.CIDConfig, action *catalog.WorkflowAction, en if catalogAction == nil { log.Fatal().Str("action_id", action.ID).Msg("workflow configuration error, referencing actions that do not exist") } - modules := repoanalyzer.AnalyzeProject(projectDir, filesystem.WorkingDirOrPanic()) + modules := analyzer.ScanDirectory(filesystem.WorkingDirOrPanic()) ctx := api.GetActionContext(modules, projectDir, env, &catalogAction.Access) // serialize action config for pass-thru