Skip to content

Commit 08cda35

Browse files
footfoot
authored
Upgrade to weave-gitops v0.17.0 (#2401)
* Upgrade to weave-gitops v0.17.0 * clustersmngr.NewClient now takes a logr
1 parent 276559b commit 08cda35

File tree

9 files changed

+22
-18
lines changed

9 files changed

+22
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ func fakeCoreConfig(t *testing.T, log logr.Logger) core_core.CoreServerConfig {
235235
clientsPool := &clustersmngrfakes.FakeClientsPool{}
236236
clientsPool.ClientsReturns(map[string]client.Client{})
237237

238-
client := clustersmngr.NewClient(clientsPool, map[string][]corev1.Namespace{})
238+
client := clustersmngr.NewClient(clientsPool, map[string][]corev1.Namespace{}, logr.Discard())
239239
clustersManager.GetImpersonatedClientReturns(client, nil)
240240
clustersManager.GetServerClientReturns(client, nil)
241241

‎cmd/clusters-service/pkg/server/common_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"time"
77

88
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
9+
"github.com/go-logr/logr"
910
"github.com/go-logr/logr/testr"
1011
corev1 "k8s.io/api/core/v1"
1112
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -94,7 +95,7 @@ func getServer(t *testing.T, clients map[string]client.Client, namespaces map[st
9495
}
9596
return nil, fmt.Errorf("cluster %s not found", name)
9697
}
97-
clustersClient := clustersmngr.NewClient(clientsPool, namespaces)
98+
clustersClient := clustersmngr.NewClient(clientsPool, namespaces, logr.Discard())
9899
fakeFactory := &clustersmngrfakes.FakeClustersManager{}
99100
fakeFactory.GetImpersonatedClientForClusterReturns(clustersClient, nil)
100101
fakeFactory.GetImpersonatedClientReturns(clustersClient, nil)
@@ -179,7 +180,7 @@ func makeTestClustersManager(t *testing.T, clusterState ...runtime.Object) *clus
179180
}
180181
return nil, fmt.Errorf("cluster %s not found", name)
181182
}
182-
clustersClient := clustersmngr.NewClient(clientsPool, map[string][]corev1.Namespace{})
183+
clustersClient := clustersmngr.NewClient(clientsPool, map[string][]corev1.Namespace{}, logr.Discard())
183184
fakeFactory := &clustersmngrfakes.FakeClustersManager{}
184185
fakeFactory.GetImpersonatedClientReturns(clustersClient, nil)
185186
fakeFactory.GetImpersonatedClientForClusterReturns(clustersClient, nil)

‎cmd/clusters-service/pkg/server/policies_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"fmt"
88
"testing"
99

10+
"github.com/go-logr/logr"
1011
"github.com/google/go-cmp/cmp"
1112
"github.com/hashicorp/go-multierror"
1213
pacv2beta2 "github.com/weaveworks/policy-agent/api/v2beta2"
@@ -310,7 +311,7 @@ func TestListPolicies(t *testing.T) {
310311

311312
return nil, fmt.Errorf("cluster %s not found", name)
312313
}
313-
clustersClient := clustersmngr.NewClient(clientsPool, map[string][]v1.Namespace{})
314+
clustersClient := clustersmngr.NewClient(clientsPool, map[string][]v1.Namespace{}, logr.Discard())
314315

315316
fakeFactory := &clustersmngrfakes.FakeClustersManager{}
316317
fakeFactory.GetImpersonatedClientReturns(clustersClient, nil)
@@ -341,7 +342,7 @@ func TestPartialPoliciesConnectionErrors(t *testing.T) {
341342
clientsPool.ClientsReturns(clients)
342343
clientsPool.ClientReturns(fakeCl, nil)
343344

344-
clustersClient := clustersmngr.NewClient(clientsPool, map[string][]v1.Namespace{})
345+
clustersClient := clustersmngr.NewClient(clientsPool, map[string][]v1.Namespace{}, logr.Discard())
345346
clusterErr := clustersmngr.ClientError{ClusterName: "demo", Err: errors.New("failed adding cluster client to pool: connection refused")}
346347
fakeFactory := &clustersmngrfakes.FakeClustersManager{}
347348
fakeFactory.GetImpersonatedClientStub = func(ctx context.Context, user *auth.UserPrincipal) (clustersmngr.Client, error) {
@@ -478,7 +479,7 @@ func TestGetPolicy(t *testing.T) {
478479
fakeCl := createClient(t, tt.clusterState...)
479480
clientsPool.ClientsReturns(map[string]client.Client{tt.clusterName: fakeCl})
480481
clientsPool.ClientReturns(fakeCl, nil)
481-
clustersClient := clustersmngr.NewClient(clientsPool, map[string][]v1.Namespace{})
482+
clustersClient := clustersmngr.NewClient(clientsPool, map[string][]v1.Namespace{}, logr.Discard())
482483

483484
fakeFactory := &clustersmngrfakes.FakeClustersManager{}
484485
fakeFactory.GetImpersonatedClientForClusterReturns(clustersClient, nil)

‎cmd/clusters-service/pkg/server/policy_violations_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"errors"
66
"testing"
77

8+
"github.com/go-logr/logr"
89
"github.com/google/go-cmp/cmp"
910
"github.com/hashicorp/go-multierror"
1011
capiv1_proto "github.com/weaveworks/weave-gitops-enterprise/cmd/clusters-service/pkg/protos"
@@ -86,7 +87,7 @@ func TestGetPolicyViolation(t *testing.T) {
8687
clientsPool.ClientReturns(fakeCl, nil)
8788
clustersClient := clustersmngr.NewClient(clientsPool, map[string][]corev1.Namespace{"Default": {
8889
corev1.Namespace{},
89-
}})
90+
}}, logr.Discard())
9091

9192
fakeFactory := &clustersmngrfakes.FakeClustersManager{}
9293
fakeFactory.GetImpersonatedClientForClusterReturns(clustersClient, nil)
@@ -187,7 +188,7 @@ func TestListPolicyValidations(t *testing.T) {
187188
clientsPool.ClientReturns(fakeCl, nil)
188189
clustersClient := clustersmngr.NewClient(clientsPool, map[string][]corev1.Namespace{"Default": {
189190
corev1.Namespace{},
190-
}})
191+
}}, logr.Discard())
191192

192193
fakeFactory := &clustersmngrfakes.FakeClustersManager{}
193194
fakeFactory.GetImpersonatedClientReturns(clustersClient, nil)
@@ -224,7 +225,7 @@ func TestPartialPolicyValidationsConnectionErrors(t *testing.T) {
224225
clientsPool.ClientReturns(fakeCl, nil)
225226
clustersClient := clustersmngr.NewClient(clientsPool, map[string][]corev1.Namespace{"Default": {
226227
corev1.Namespace{},
227-
}})
228+
}}, logr.Discard())
228229

229230
clusterErr := clustersmngr.ClientError{ClusterName: "demo", Err: errors.New("failed adding cluster client to pool: connection refused")}
230231
fakeFactory := &clustersmngrfakes.FakeClustersManager{}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/sirupsen/logrus v1.9.0
1818
github.com/spf13/cobra v1.6.1
1919
github.com/stretchr/testify v1.8.1
20-
github.com/weaveworks/weave-gitops v0.16.1-0.20230209164609-4d04b4d69a42
20+
github.com/weaveworks/weave-gitops v0.17.0
2121
github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.2
2222
github.com/weaveworks/weave-gitops-enterprise/common v0.0.0
2323
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,8 +1389,8 @@ github.com/weaveworks/templates-controller v0.1.2 h1:PVPePP8NUnB2OqCsNvHvp8zm2vk
13891389
github.com/weaveworks/templates-controller v0.1.2/go.mod h1:iLs/20GkUY94KzDhRvmctwun7yX3SGJWs8q0gbTu53I=
13901390
github.com/weaveworks/tf-controller/api v0.0.0-20221220150320-3d0f3743ccb4 h1:RRpzQlhbEC5WjL0jaMEvGUSZ8EsxzdqSSzginwSBTyc=
13911391
github.com/weaveworks/tf-controller/api v0.0.0-20221220150320-3d0f3743ccb4/go.mod h1:VK60b9WR7XEK1DvQNOpKEOlIQ56Qcy5KlAIFksQmUxI=
1392-
github.com/weaveworks/weave-gitops v0.16.1-0.20230209164609-4d04b4d69a42 h1:H5F/UdLf2pCNjcbjHggDvth1OvXvXAZGrrwR/GNaTyk=
1393-
github.com/weaveworks/weave-gitops v0.16.1-0.20230209164609-4d04b4d69a42/go.mod h1:cUnWoB/os7EQY8yxKn9fr+f3Ny8wCXnnF74PPd0l+PU=
1392+
github.com/weaveworks/weave-gitops v0.17.0 h1:RZiUuQiqr/ODcEUpx5kfYr64oFHn3z1uukvzhEGr07s=
1393+
github.com/weaveworks/weave-gitops v0.17.0/go.mod h1:cUnWoB/os7EQY8yxKn9fr+f3Ny8wCXnnF74PPd0l+PU=
13941394
github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.2 h1:7jeiQehqmI4ds6YIq8TW1Vqhlb6V7G2BVRJ8VM3r99I=
13951395
github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.2/go.mod h1:6PMYg+VtSNePnP7EXyNG+/hNRNZ3r0mQtolIZU4s/J0=
13961396
github.com/xanzy/go-gitlab v0.78.0 h1:8jUHfQVAprG04Av5g0PxVd3CNsZ5hCbojIax7Hba1mE=

‎internal/grpctesting/grpctesting.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"testing"
77

88
helm "github.com/fluxcd/helm-controller/api/v2beta1"
9+
"github.com/go-logr/logr"
910
ctrl "github.com/weaveworks/pipeline-controller/api/v1alpha1"
1011
tfctrl "github.com/weaveworks/tf-controller/api/v1alpha1"
1112
"github.com/weaveworks/weave-gitops/core/clustersmngr"
@@ -60,7 +61,7 @@ func MakeClustersManager(k8s client.Client, clusters ...string) *clustersmngrfak
6061
}
6162

6263
nsMap := map[string][]v1.Namespace{"Default": {}}
63-
clustersClient := clustersmngr.NewClient(clientsPool, nsMap)
64+
clustersClient := clustersmngr.NewClient(clientsPool, nsMap, logr.Discard())
6465

6566
factory := &clustersmngrfakes.FakeClustersManager{}
6667
factory.GetImpersonatedClientReturns(clustersClient, nil)

‎ui-cra/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@types/react-syntax-highlighter": "^13.5.2",
2525
"@types/styled-components": "^5.1.9",
2626
"@weaveworks/progressive-delivery": "0.0.0-rc13",
27-
"@weaveworks/weave-gitops": "npm:@weaveworks/weave-gitops-main@",
27+
"@weaveworks/weave-gitops": "0.17.0",
2828
"classnames": "^2.3.1",
2929
"d3-scale": "4.0.0",
3030
"d3-time": "^3.0.0",

‎ui-cra/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2335,10 +2335,10 @@
23352335
resolved "https://npm.pkg.github.com/download/@weaveworks/progressive-delivery/0.0.0-rc13/2628159001f4812b90e068e64fae8de6b4e3f2b4#2628159001f4812b90e068e64fae8de6b4e3f2b4"
23362336
integrity sha512-51ET/FrGwKcBUSqRTtaWTTuWQi/y51JQAFYMT6ctOLaiIXSopCyi3alf4aYDZ5TPFAIdOQapJMYiq2HVj5XxOQ==
23372337

2338-
"@weaveworks/weave-gitops@npm:@weaveworks/weave-gitops-main@":
2339-
version "0.16.0-32-g3f675703"
2340-
resolved "https://npm.pkg.github.com/download/@weaveworks/weave-gitops-main/0.16.0-32-g3f675703/1602eacd93fe6917d0eb9ece36bc36715f22d9c8#1602eacd93fe6917d0eb9ece36bc36715f22d9c8"
2341-
integrity sha512-+ZRD/K9sN7xrR/MEB2Uu4Totrh5QRWOcnwHRzO8f8I4X5WX27U8oD6J4U3wlbyaN7stw3MlkAw4ip20wnqNqWQ==
2338+
"@weaveworks/weave-gitops@0.17.0":
2339+
version "0.17.0"
2340+
resolved "https://npm.pkg.github.com/download/@weaveworks/weave-gitops/0.17.0/43bd2396569d68571b98c5901180e40871d46958#43bd2396569d68571b98c5901180e40871d46958"
2341+
integrity sha512-m4ONFgpjaQNAl6jWyvG5fVEqefMSpwiZyipDYHC4PBtx0MIynJ9OLuIeO+pBuS0+/l/YR9DUdoOq8/7nE4G/oA==
23422342
dependencies:
23432343
"@material-ui/core" "^4.12.3"
23442344
"@material-ui/icons" "^4.11.2"

0 commit comments

Comments
 (0)