Skip to content

Commit f6e409f

Browse files
author
Sara El-Zayat
authored
Upgrade to WG 0.4.1 (#276)
* Upgrade to WG 0.4.1 * go mod tidy * run go mod tidy * Add fake fetcher * Add fake fetcher to ui inegration tests
1 parent 29a1909 commit f6e409f

File tree

8 files changed

+39
-36
lines changed

8 files changed

+39
-36
lines changed

‎cmd/clusters-service/app/server_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"github.com/weaveworks/weave-gitops/pkg/kube"
1818
"github.com/weaveworks/weave-gitops/pkg/kube/kubefakes"
1919
wego_server "github.com/weaveworks/weave-gitops/pkg/server"
20+
"github.com/weaveworks/weave-gitops/pkg/services/applicationv2/applicationv2fakes"
2021
"github.com/weaveworks/weave-gitops/pkg/services/auth"
2122
"github.com/weaveworks/weave-gitops/pkg/services/auth/authfakes"
2223
corev1 "k8s.io/api/core/v1"
@@ -100,11 +101,13 @@ func fakeAppsConfig(c client.Client) *wego_server.ApplicationsConfig {
100101
appFactory.GetKubeServiceStub = func() (kube.Kube, error) {
101102
return kubeClient, nil
102103
}
104+
fetcher := &applicationv2fakes.FakeFetcher{}
103105
return &wego_server.ApplicationsConfig{
104106
AppFactory: appFactory,
105107
KubeClient: c,
106108
Logger: logr.Discard(),
107109
JwtClient: jwtClient,
110+
Fetcher: fetcher,
108111
}
109112
}
110113

‎cmd/clusters-service/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/spf13/viper v1.9.0
2020
github.com/stretchr/testify v1.7.0
2121
github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab
22-
github.com/weaveworks/weave-gitops v0.4.0
22+
github.com/weaveworks/weave-gitops v0.4.1
2323
github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.1
2424
github.com/weaveworks/weave-gitops-enterprise/common v0.0.0-00010101000000-000000000000
2525
github.com/xanzy/go-gitlab v0.43.0
@@ -67,6 +67,7 @@ require (
6767
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
6868
github.com/acomagu/bufpipe v1.0.3 // indirect
6969
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
70+
github.com/benbjohnson/clock v1.1.0 // indirect
7071
github.com/beorn7/perks v1.0.1 // indirect
7172
github.com/cespare/xxhash/v2 v2.1.1 // indirect
7273
github.com/containerd/containerd v1.5.7 // indirect

‎cmd/clusters-service/go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@ github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoD
508508
github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
509509
github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
510510
github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
511+
github.com/freshautomations/stoml v0.7.0/go.mod h1:j9GKA+OhFx+h5ajLNLqz2sSQViZzeAt3GV4MfmkpcsU=
511512
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
512513
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
513514
github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
@@ -1429,6 +1430,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
14291430
github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
14301431
github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
14311432
github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
1433+
github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
14321434
github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
14331435
github.com/spf13/viper v1.9.0 h1:yR6EXjTp0y0cLN8OZg1CRZmOBdI88UcGkhgyJhu6nZk=
14341436
github.com/spf13/viper v1.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4=
@@ -1489,8 +1491,8 @@ github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab/go.mod h1
14891491
github.com/weaveworks/pctl v0.8.0/go.mod h1:eDRbIJD3OdNmcJdTjXrZez6EoS7J/a69hbN16Pd8pik=
14901492
github.com/weaveworks/profiles v0.2.0/go.mod h1:BmQOw7tpOxGJWSoz9tpHEo6rRAaLPASljidFdYSsRUs=
14911493
github.com/weaveworks/schemer v0.0.0-20210802122110-338b258ad2ca/go.mod h1:y8Luzq6JDsYVoIV0QAlnvIiq8bSaap0myMjWKyzVFTY=
1492-
github.com/weaveworks/weave-gitops v0.4.0 h1:DUhYl6X2uH4B36fZ/3KwORYywYfoU2q68C+PdhpFrwU=
1493-
github.com/weaveworks/weave-gitops v0.4.0/go.mod h1:mLrIw8iOqKwaGcFxLOXFwPXEvHvxgrDvsYjPkvx7MxY=
1494+
github.com/weaveworks/weave-gitops v0.4.1 h1:9Q/dlNPDC90VBDC9+rSxxS53HmDon9GKgjdfvXp9TYk=
1495+
github.com/weaveworks/weave-gitops v0.4.1/go.mod h1:NTRcDjl3gIu5w82w+sQsQeh2Rb2nogCyfqt6yuPvlrg=
14941496
github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.1 h1:R5+xSXgaKiTGLMzpNmkf9W5PsX9mCtMTgWUbJ7MwO70=
14951497
github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.1/go.mod h1:xWxoy/Ff1R3VnKWacRlbmBnVSu066ykpZIkk+T/g1Vw=
14961498
github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=

‎go.mod

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ require (
2929
github.com/tebeka/selenium v0.9.9
3030
github.com/weaveworks/cluster-api-provider-existinginfra v0.2.5
3131
github.com/weaveworks/libgitops v0.0.3
32-
github.com/weaveworks/pctl v0.8.0
33-
github.com/weaveworks/weave-gitops v0.4.0
32+
github.com/weaveworks/weave-gitops v0.4.1
3433
github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.1
3534
github.com/weaveworks/weave-gitops-enterprise/cmd/clusters-service v0.0.0-00010101000000-000000000000
3635
github.com/weaveworks/weave-gitops-enterprise/common v0.0.0
@@ -43,7 +42,7 @@ require (
4342
gorm.io/gorm v1.21.11
4443
k8s.io/api v0.22.2
4544
k8s.io/apimachinery v0.22.2
46-
k8s.io/cli-runtime v0.22.1
45+
k8s.io/cli-runtime v0.22.1 // indirect
4746
k8s.io/client-go v0.22.2
4847
k8s.io/kubernetes v1.21.1 // indirect
4948
sigs.k8s.io/cluster-api v0.3.16
@@ -53,7 +52,6 @@ require (
5352

5453
require (
5554
cloud.google.com/go v0.93.3 // indirect
56-
code.gitea.io/sdk/gitea v0.14.0 // indirect
5755
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
5856
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
5957
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
@@ -74,10 +72,10 @@ require (
7472
github.com/acomagu/bufpipe v1.0.3 // indirect
7573
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
7674
github.com/aws/eks-distro-build-tooling/release v0.0.0-20201211225747-07f05a470de8 // indirect
75+
github.com/benbjohnson/clock v1.1.0 // indirect
7776
github.com/beorn7/perks v1.0.1 // indirect
7877
github.com/bitnami-labs/sealed-secrets v0.12.5 // indirect
7978
github.com/blang/semver v3.5.1+incompatible // indirect
80-
github.com/bluekeyes/go-gitdiff v0.4.0 // indirect
8179
github.com/cavaliercoder/go-rpm v0.0.0-20200122174316-8cb9fd9c31a8 // indirect
8280
github.com/cespare/xxhash/v2 v2.1.1 // indirect
8381
github.com/chanwit/plandiff v1.0.0 // indirect
@@ -140,7 +138,6 @@ require (
140138
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0 // indirect
141139
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
142140
github.com/hashicorp/go-retryablehttp v0.6.8 // indirect
143-
github.com/hashicorp/go-version v1.3.0 // indirect
144141
github.com/hashicorp/golang-lru v0.5.4 // indirect
145142
github.com/hashicorp/hcl v1.0.0 // indirect
146143
github.com/huandu/xstrings v1.3.2 // indirect
@@ -155,7 +152,6 @@ require (
155152
github.com/jackc/pgtype v1.5.0 // indirect
156153
github.com/jackc/pgx/v4 v4.9.0 // indirect
157154
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
158-
github.com/jenkins-x/go-scm v1.10.10 // indirect
159155
github.com/jinzhu/inflection v1.0.0 // indirect
160156
github.com/jinzhu/now v1.1.2 // indirect
161157
github.com/jmoiron/sqlx v1.3.1 // indirect
@@ -196,7 +192,6 @@ require (
196192
github.com/olekukonko/tablewriter v0.0.5 // indirect
197193
github.com/opencontainers/go-digest v1.0.0 // indirect
198194
github.com/opencontainers/image-spec v1.0.1 // indirect
199-
github.com/otiai10/copy v1.6.0 // indirect
200195
github.com/pelletier/go-toml v1.9.4 // indirect
201196
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
202197
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -208,8 +203,6 @@ require (
208203
github.com/russross/blackfriday v1.5.2 // indirect
209204
github.com/sergi/go-diff v1.1.0 // indirect
210205
github.com/shopspring/decimal v1.2.0 // indirect
211-
github.com/shurcooL/githubv4 v0.0.0-20190718010115-4ba037080260 // indirect
212-
github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
213206
github.com/spf13/afero v1.6.0 // indirect
214207
github.com/spf13/cast v1.4.1 // indirect
215208
github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -218,7 +211,6 @@ require (
218211
github.com/src-d/gcfg v1.4.0 // indirect
219212
github.com/subosito/gotenv v1.2.0 // indirect
220213
github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab // indirect
221-
github.com/weaveworks/profiles v0.2.0 // indirect
222214
github.com/xanzy/go-gitlab v0.43.0 // indirect
223215
github.com/xanzy/ssh-agent v0.3.0 // indirect
224216
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
@@ -263,7 +255,6 @@ require (
263255
k8s.io/kube-proxy v0.0.0 // indirect
264256
k8s.io/kubectl v0.22.1 // indirect
265257
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
266-
knative.dev/pkg v0.0.0-20210412173742-b51994e3b312 // indirect
267258
oras.land/oras-go v0.4.0 // indirect
268259
sigs.k8s.io/cli-utils v0.26.0 // indirect
269260
sigs.k8s.io/kustomize/api v0.10.0 // indirect

0 commit comments

Comments
 (0)