Skip to content

Commit

Permalink
add support for go workspaces
Browse files Browse the repository at this point in the history 
Add a go.work file listing all modules in this monorepo and remove local
replace directives from all go.mod files

Signed-off-by: Sanskar Jaiswal <[email protected]>
  • Loading branch information
@aryan9600
aryan9600 committed Feb 6, 2023
1 parent 2d2a14d commit 0c8c487
Show file tree
Hide file tree
Showing 18 changed files with 534 additions and 49 deletions.
7 changes: 0 additions & 7 deletions git/gogit/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ module github.com/fluxcd/pkg/git/gogit

go 1.18

replace (
github.com/fluxcd/pkg/git => ../../git
github.com/fluxcd/pkg/gittestserver => ../../gittestserver
github.com/fluxcd/pkg/ssh => ../../ssh
github.com/fluxcd/pkg/version => ../../version
)

require (
github.com/Masterminds/semver/v3 v3.1.1
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
Expand Down
8 changes: 8 additions & 0 deletions git/gogit/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg=
github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo=
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df h1:2BHXJp1PwX7D47Q2oaKDekn+BZVZCmxeCWNi+FyownE=
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df/go.mod h1:raWgfUV7lDQVXp4QXUaeNNJkRVKz97UQuF+0kdY7Vmo=
github.com/fluxcd/pkg/git v0.8.0 h1:7mIbdqSf+qXwY17+A+Kge2yWIJCMJ1p1DiBDGnKRohg=
github.com/fluxcd/pkg/git v0.8.0/go.mod h1:3deiLPws4DSQ3hqwtQd7Dt66GXTN/4RcT/yHAljXaHo=
github.com/fluxcd/pkg/gittestserver v0.8.0 h1:YrYe63KScKlLxx0GAiQthx2XqHDx0vKitIIx4JnDtIo=
github.com/fluxcd/pkg/gittestserver v0.8.0/go.mod h1:/LI/xKMrnQbIsTDnTyABQ71iaYhFIZ8fb4cvY7WAlBU=
github.com/fluxcd/pkg/ssh v0.7.0 h1:FX5ky8SU9dYwbM6zEIDR3TSveLF01iyS95CtB5Ykpno=
github.com/fluxcd/pkg/ssh v0.7.0/go.mod h1:tCVZJI8jPOL0XCInJOrYGKapWA/zZCzqPtpiYUSQxww=
github.com/fluxcd/pkg/version v0.2.0 h1:jG22c59Bsv6vL51N7Bqn8tjHArYOXrjbIkGArlIrv5w=
github.com/fluxcd/pkg/version v0.2.0/go.mod h1:umN1VAOV0sB1JDVwb8eXZzuuqIAEku+y+vcCVBBUIf0=
github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
Expand Down
14 changes: 2 additions & 12 deletions git/internal/e2e/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@ module github.com/fluxcd/pkg/git/internal/e2e

go 1.18

replace (
github.com/fluxcd/pkg/git => ../../../git
github.com/fluxcd/pkg/git/gogit => ../../gogit
github.com/fluxcd/pkg/git/libgit2 => ../../libgit2
github.com/fluxcd/pkg/gittestserver => ../../../gittestserver
github.com/fluxcd/pkg/http/transport => ../../../http/transport
github.com/fluxcd/pkg/ssh => ../../../ssh
github.com/fluxcd/pkg/version => ../../../version
)

// Fix CVE-2022-1996 (for v2, Go Modules incompatible)
replace github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.16.0+incompatible

Expand All @@ -27,8 +17,8 @@ require (
github.com/fluxcd/go-git-providers v0.10.0
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df
github.com/fluxcd/pkg/git v0.8.0
github.com/fluxcd/pkg/git/gogit v0.3.1
github.com/fluxcd/pkg/git/libgit2 v0.2.0
github.com/fluxcd/pkg/git/gogit v0.5.0
github.com/fluxcd/pkg/git/libgit2 v0.4.1
github.com/fluxcd/pkg/gittestserver v0.8.0
github.com/fluxcd/pkg/ssh v0.7.0
github.com/go-logr/logr v1.2.3
Expand Down
14 changes: 14 additions & 0 deletions git/internal/e2e/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,20 @@ github.com/fluxcd/go-git-providers v0.10.0 h1:6zH/HzEFcc9iP2gRTjrog0Ou11MUins8tH
github.com/fluxcd/go-git-providers v0.10.0/go.mod h1:d/Fu+FtvniNJo6B3HbeEQd4TDTUitsA/zjNOGbEjmDE=
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df h1:2BHXJp1PwX7D47Q2oaKDekn+BZVZCmxeCWNi+FyownE=
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df/go.mod h1:raWgfUV7lDQVXp4QXUaeNNJkRVKz97UQuF+0kdY7Vmo=
github.com/fluxcd/pkg/git v0.8.0 h1:7mIbdqSf+qXwY17+A+Kge2yWIJCMJ1p1DiBDGnKRohg=
github.com/fluxcd/pkg/git v0.8.0/go.mod h1:3deiLPws4DSQ3hqwtQd7Dt66GXTN/4RcT/yHAljXaHo=
github.com/fluxcd/pkg/git/gogit v0.5.0 h1:3Fzx2W16K/37ZHT6WmLFuRYgs+CGvzka+dwY7ktoxJE=
github.com/fluxcd/pkg/git/gogit v0.5.0/go.mod h1:cqoJhKXCmWuN2ezD/2ECUYwR8gR7svMRJoHRr9VyTQc=
github.com/fluxcd/pkg/git/libgit2 v0.4.1 h1:KAGFsLXYDI4SLq8mM2JzCM4A3Gf+B73f4LNpY7VA+dI=
github.com/fluxcd/pkg/git/libgit2 v0.4.1/go.mod h1:9T6fVR3BJLNhjHxpnKFAQ6BU1fRsx+8o4fT+JI8BgFI=
github.com/fluxcd/pkg/gittestserver v0.8.0 h1:YrYe63KScKlLxx0GAiQthx2XqHDx0vKitIIx4JnDtIo=
github.com/fluxcd/pkg/gittestserver v0.8.0/go.mod h1:/LI/xKMrnQbIsTDnTyABQ71iaYhFIZ8fb4cvY7WAlBU=
github.com/fluxcd/pkg/http/transport v0.1.0 h1:tzRprpCAUkPFlF/9VMLSbw95jcAKCbimDC//VULQXnY=
github.com/fluxcd/pkg/http/transport v0.1.0/go.mod h1:BNXQYy3ifMTc3DaOu3GlIR6j5DtTwMEyvTr2EA7XP8w=
github.com/fluxcd/pkg/ssh v0.7.0 h1:FX5ky8SU9dYwbM6zEIDR3TSveLF01iyS95CtB5Ykpno=
github.com/fluxcd/pkg/ssh v0.7.0/go.mod h1:tCVZJI8jPOL0XCInJOrYGKapWA/zZCzqPtpiYUSQxww=
github.com/fluxcd/pkg/version v0.2.0 h1:jG22c59Bsv6vL51N7Bqn8tjHArYOXrjbIkGArlIrv5w=
github.com/fluxcd/pkg/version v0.2.0/go.mod h1:umN1VAOV0sB1JDVwb8eXZzuuqIAEku+y+vcCVBBUIf0=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
Expand Down
12 changes: 1 addition & 11 deletions git/libgit2/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@ module github.com/fluxcd/pkg/git/libgit2

go 1.18

replace (
github.com/fluxcd/pkg/git => ../../git
// Enables the use of pkg/git/gogit/fs.
github.com/fluxcd/pkg/git/gogit => ../gogit
github.com/fluxcd/pkg/gittestserver => ../../gittestserver
github.com/fluxcd/pkg/http/transport => ../../http/transport
github.com/fluxcd/pkg/ssh => ../../ssh
github.com/fluxcd/pkg/version => ../../version
)

// Fix CVE-2022-1996 (for v2, Go Modules incompatible)
replace github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.16.0+incompatible

Expand All @@ -35,7 +25,7 @@ require (
github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819
github.com/fluxcd/gitkit v0.6.0
github.com/fluxcd/pkg/git v0.8.0
github.com/fluxcd/pkg/git/gogit v0.3.1
github.com/fluxcd/pkg/git/gogit v0.5.0
github.com/fluxcd/pkg/gittestserver v0.8.0
github.com/fluxcd/pkg/http/transport v0.1.0
github.com/fluxcd/pkg/ssh v0.7.0
Expand Down
12 changes: 12 additions & 0 deletions git/libgit2/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,18 @@ github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg=
github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo=
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df h1:2BHXJp1PwX7D47Q2oaKDekn+BZVZCmxeCWNi+FyownE=
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df/go.mod h1:raWgfUV7lDQVXp4QXUaeNNJkRVKz97UQuF+0kdY7Vmo=
github.com/fluxcd/pkg/git v0.8.0 h1:7mIbdqSf+qXwY17+A+Kge2yWIJCMJ1p1DiBDGnKRohg=
github.com/fluxcd/pkg/git v0.8.0/go.mod h1:3deiLPws4DSQ3hqwtQd7Dt66GXTN/4RcT/yHAljXaHo=
github.com/fluxcd/pkg/git/gogit v0.5.0 h1:3Fzx2W16K/37ZHT6WmLFuRYgs+CGvzka+dwY7ktoxJE=
github.com/fluxcd/pkg/git/gogit v0.5.0/go.mod h1:cqoJhKXCmWuN2ezD/2ECUYwR8gR7svMRJoHRr9VyTQc=
github.com/fluxcd/pkg/gittestserver v0.8.0 h1:YrYe63KScKlLxx0GAiQthx2XqHDx0vKitIIx4JnDtIo=
github.com/fluxcd/pkg/gittestserver v0.8.0/go.mod h1:/LI/xKMrnQbIsTDnTyABQ71iaYhFIZ8fb4cvY7WAlBU=
github.com/fluxcd/pkg/http/transport v0.1.0 h1:tzRprpCAUkPFlF/9VMLSbw95jcAKCbimDC//VULQXnY=
github.com/fluxcd/pkg/http/transport v0.1.0/go.mod h1:BNXQYy3ifMTc3DaOu3GlIR6j5DtTwMEyvTr2EA7XP8w=
github.com/fluxcd/pkg/ssh v0.7.0 h1:FX5ky8SU9dYwbM6zEIDR3TSveLF01iyS95CtB5Ykpno=
github.com/fluxcd/pkg/ssh v0.7.0/go.mod h1:tCVZJI8jPOL0XCInJOrYGKapWA/zZCzqPtpiYUSQxww=
github.com/fluxcd/pkg/version v0.2.0 h1:jG22c59Bsv6vL51N7Bqn8tjHArYOXrjbIkGArlIrv5w=
github.com/fluxcd/pkg/version v0.2.0/go.mod h1:umN1VAOV0sB1JDVwb8eXZzuuqIAEku+y+vcCVBBUIf0=
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
Expand Down
29 changes: 29 additions & 0 deletions go.work
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
go 1.18

use (
./apis/acl
./apis/event
./apis/kustomize
./apis/meta
./git
./git/gogit
./git/internal/e2e
./git/libgit2
./gittestserver
./helmtestserver
./http/fetch
./http/transport
./kustomize
./lockedfile
./masktoken
./oci
./oci/tests/integration
./runtime
./sourceignore
./ssa
./ssh
./tar
./testserver
./untar
./version
)
Loading

0 comments on commit 0c8c487

Please sign in to comment.