Skip to content

Commit ccbd195

Browse files
authored
Fix Gitlab Scanning and Fork Ignore (#84)
* bumping dependencies and adapted to latets gitlab client * removing url encoding of project paths. It's actually not necessary * Fixing handling of forks, we should skip only the single repo not the repo and the rest of the loop
1 parent 54c668d commit ccbd195

File tree

4 files changed

+77
-81
lines changed

4 files changed

+77
-81
lines changed

analyze/analyze.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func (a *Analyzer) AnalyzeOrg(ctx context.Context, org string, numberOfGoroutine
117117
for _, repo := range repoBatch.Repositories {
118118
if a.Config.IgnoreForks && repo.GetIsFork() {
119119
bar.ChangeMax(repoBatch.TotalCount - 1)
120-
break
120+
continue
121121
}
122122
if err := sem.Acquire(ctx, 1); err != nil {
123123
close(errChan)

go.mod

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ require (
1212
github.com/package-url/packageurl-go v0.1.2
1313
github.com/rs/zerolog v1.32.0
1414
github.com/schollz/progressbar/v3 v3.14.2
15-
github.com/shurcooL/githubv4 v0.0.0-20240120211514-18a1ae0e79dc
15+
github.com/shurcooL/githubv4 v0.0.0-20240429030203-be2daab69064
1616
github.com/spf13/cobra v1.8.0
1717
github.com/spf13/viper v1.18.2
1818
github.com/stretchr/testify v1.9.0
19-
github.com/xanzy/go-gitlab v0.100.0
20-
golang.org/x/oauth2 v0.19.0
19+
github.com/xanzy/go-gitlab v0.105.0
20+
golang.org/x/oauth2 v0.20.0
2121
golang.org/x/sync v0.7.0
2222
gopkg.in/yaml.v3 v3.0.1
2323
)
@@ -26,7 +26,7 @@ require (
2626
github.com/OneOfOne/xxhash v1.2.8 // indirect
2727
github.com/agnivade/levenshtein v1.1.1 // indirect
2828
github.com/beorn7/perks v1.0.1 // indirect
29-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
29+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3030
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3131
github.com/fsnotify/fsnotify v1.7.0 // indirect
3232
github.com/go-ini/ini v1.67.0 // indirect
@@ -37,22 +37,22 @@ require (
3737
github.com/google/uuid v1.6.0 // indirect
3838
github.com/gorilla/mux v1.8.1 // indirect
3939
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
40-
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
40+
github.com/hashicorp/go-retryablehttp v0.7.6 // indirect
4141
github.com/hashicorp/hcl v1.0.0 // indirect
4242
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4343
github.com/magiconair/properties v1.8.7 // indirect
4444
github.com/mattn/go-colorable v0.1.13 // indirect
4545
github.com/mattn/go-isatty v0.0.20 // indirect
46-
github.com/mattn/go-runewidth v0.0.9 // indirect
46+
github.com/mattn/go-runewidth v0.0.15 // indirect
4747
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
4848
github.com/mitchellh/mapstructure v1.5.0 // indirect
49-
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
49+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
5050
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
51-
github.com/prometheus/client_golang v1.19.0 // indirect
51+
github.com/prometheus/client_golang v1.19.1 // indirect
5252
github.com/prometheus/client_model v0.6.1 // indirect
53-
github.com/prometheus/common v0.48.0 // indirect
54-
github.com/prometheus/procfs v0.12.0 // indirect
55-
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
53+
github.com/prometheus/common v0.53.0 // indirect
54+
github.com/prometheus/procfs v0.14.0 // indirect
55+
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
5656
github.com/rivo/uniseg v0.4.7 // indirect
5757
github.com/sagikazarmark/locafero v0.4.0 // indirect
5858
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -67,18 +67,17 @@ require (
6767
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
6868
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
6969
github.com/yashtewari/glob-intersection v0.2.0 // indirect
70-
go.opentelemetry.io/otel v1.21.0 // indirect
71-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
72-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
73-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
74-
go.uber.org/atomic v1.9.0 // indirect
75-
go.uber.org/multierr v1.9.0 // indirect
76-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
77-
golang.org/x/sys v0.19.0 // indirect
78-
golang.org/x/term v0.19.0 // indirect
79-
golang.org/x/text v0.14.0 // indirect
70+
go.opentelemetry.io/otel v1.26.0 // indirect
71+
go.opentelemetry.io/otel/metric v1.26.0 // indirect
72+
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
73+
go.opentelemetry.io/otel/trace v1.26.0 // indirect
74+
go.uber.org/multierr v1.11.0 // indirect
75+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
76+
golang.org/x/sys v0.20.0 // indirect
77+
golang.org/x/term v0.20.0 // indirect
78+
golang.org/x/text v0.15.0 // indirect
8079
golang.org/x/time v0.5.0 // indirect
81-
google.golang.org/protobuf v1.33.0 // indirect
80+
google.golang.org/protobuf v1.34.1 // indirect
8281
gopkg.in/ini.v1 v1.67.0 // indirect
8382
gopkg.in/yaml.v2 v2.4.0 // indirect
8483
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)