Skip to content

Commit 8438953

Browse files
Merge pull request #60 from devtron-labs/revert-56-4030-git-sensor-panic-fix4-1
Revert "fix: 4030 git sensor panic"
2 parents cb42daf + 9242125 commit 8438953

File tree

787 files changed

+10180
-66065
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

787 files changed

+10180
-66065
lines changed

go.mod

+14-19
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module github.com/devtron-labs/git-sensor
33
go 1.17
44

55
require (
6-
github.com/devtron-labs/go-git v1.2.0
76
github.com/caarlos0/env v3.5.0+incompatible
87
github.com/devtron-labs/common-lib v0.0.0-20230109070754-ff4dca200a2c
98
github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2
@@ -20,54 +19,50 @@ require (
2019
go.uber.org/zap v1.21.0
2120
google.golang.org/grpc v1.51.0
2221
google.golang.org/protobuf v1.28.1
22+
gopkg.in/src-d/go-git.v4 v4.13.1
2323
)
2424

2525
require (
26-
github.com/Microsoft/go-winio v0.5.2 // indirect
27-
github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903 // indirect
28-
github.com/acomagu/bufpipe v1.0.4 // indirect
2926
github.com/beorn7/perks v1.0.1 // indirect
3027
github.com/cespare/xxhash/v2 v2.1.1 // indirect
31-
github.com/cloudflare/circl v1.3.3 // indirect
3228
github.com/davecgh/go-spew v1.1.1 // indirect
33-
github.com/emirpasic/gods v1.18.1 // indirect
29+
github.com/emirpasic/gods v1.12.0 // indirect
3430
github.com/gammazero/deque v0.0.0-20200124200322-7e84b94275b8 // indirect
35-
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
36-
github.com/go-git/go-billy/v5 v5.4.1 // indirect
37-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3831
github.com/golang/protobuf v1.5.2 // indirect
39-
github.com/imdario/mergo v0.3.15 // indirect
4032
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
4133
github.com/jinzhu/inflection v1.0.0 // indirect
42-
github.com/kevinburke/ssh_config v1.2.0 // indirect
34+
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
4335
github.com/klauspost/compress v1.15.12 // indirect
4436
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
4537
github.com/minio/highwayhash v1.0.2 // indirect
38+
github.com/mitchellh/go-homedir v1.1.0 // indirect
4639
github.com/nats-io/jwt/v2 v2.3.0 // indirect
4740
github.com/nats-io/nats.go v1.19.0 // indirect
4841
github.com/nats-io/nkeys v0.3.0 // indirect
4942
github.com/nats-io/nuid v1.0.1 // indirect
43+
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
5044
github.com/onsi/ginkgo v1.10.3 // indirect
5145
github.com/onsi/gomega v1.7.1 // indirect
52-
github.com/pjbgf/sha1cd v0.3.0 // indirect
5346
github.com/pmezard/go-difflib v1.0.0 // indirect
5447
github.com/prometheus/client_model v0.2.0 // indirect
5548
github.com/prometheus/common v0.13.0 // indirect
5649
github.com/prometheus/procfs v0.1.3 // indirect
57-
github.com/sergi/go-diff v1.3.0 // indirect
58-
github.com/skeema/knownhosts v1.1.1 // indirect
50+
github.com/sergi/go-diff v1.1.0 // indirect
51+
github.com/src-d/gcfg v1.4.0 // indirect
5952
github.com/stretchr/objx v0.5.0 // indirect
6053
github.com/tidwall/match v1.0.3 // indirect
6154
github.com/tidwall/pretty v1.2.0 // indirect
62-
github.com/xanzy/ssh-agent v0.3.3 // indirect
55+
github.com/xanzy/ssh-agent v0.2.1 // indirect
6356
go.uber.org/atomic v1.7.0 // indirect
6457
go.uber.org/multierr v1.6.0 // indirect
65-
golang.org/x/crypto v0.9.0 // indirect
66-
golang.org/x/net v0.10.0 // indirect
67-
golang.org/x/sys v0.8.0 // indirect
68-
golang.org/x/text v0.9.0 // indirect
58+
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
59+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
60+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
61+
golang.org/x/text v0.4.0 // indirect
6962
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
7063
google.golang.org/genproto v0.0.0-20220810155839-1856144b1d9c // indirect
64+
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
65+
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
7166
gopkg.in/warnings.v0 v0.1.2 // indirect
7267
gopkg.in/yaml.v3 v3.0.1 // indirect
7368
mellium.im/sasl v0.2.1 // indirect

go.sum

+42-109
Large diffs are not rendered by default.

pkg/git/Bean.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package git
1818

1919
import (
2020
"github.com/devtron-labs/git-sensor/internal/sql"
21-
"github.com/devtron-labs/go-git/plumbing/object"
21+
"gopkg.in/src-d/go-git.v4/plumbing/object"
2222
"time"
2323
)
2424

pkg/git/GitCliUtil.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package git
22

33
import (
44
"fmt"
5-
"github.com/devtron-labs/go-git"
6-
"github.com/devtron-labs/go-git/config"
75
"go.uber.org/zap"
6+
"gopkg.in/src-d/go-git.v4"
7+
"gopkg.in/src-d/go-git.v4/config"
88
"os"
99
"os/exec"
1010
"strings"

pkg/git/RepositoryManager.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import (
2929

3030
"github.com/devtron-labs/git-sensor/internal/middleware"
3131
"github.com/devtron-labs/git-sensor/internal/sql"
32-
"github.com/devtron-labs/go-git"
33-
"github.com/devtron-labs/go-git/plumbing"
34-
"github.com/devtron-labs/go-git/plumbing/object"
35-
"github.com/devtron-labs/go-git/plumbing/transport"
3632
"go.uber.org/zap"
33+
"gopkg.in/src-d/go-git.v4"
34+
"gopkg.in/src-d/go-git.v4/plumbing"
35+
"gopkg.in/src-d/go-git.v4/plumbing/object"
36+
"gopkg.in/src-d/go-git.v4/plumbing/transport"
3737
)
3838

3939
type RepositoryManager interface {

pkg/git/Watcher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"github.com/devtron-labs/git-sensor/internal/middleware"
2626
"github.com/devtron-labs/git-sensor/internal/sql"
2727
"github.com/devtron-labs/git-sensor/util"
28-
"github.com/devtron-labs/go-git/plumbing/object"
2928
"github.com/gammazero/workerpool"
3029
"github.com/robfig/cron/v3"
3130
"go.uber.org/zap"
31+
"gopkg.in/src-d/go-git.v4/plumbing/object"
3232
"regexp"
3333
"strings"
3434
"time"

vendor/github.com/Microsoft/go-winio/.gitignore

-1
This file was deleted.

vendor/github.com/Microsoft/go-winio/CODEOWNERS

-1
This file was deleted.

vendor/github.com/Microsoft/go-winio/README.md

-37
This file was deleted.

0 commit comments

Comments
 (0)