Merge pull request #3355 from weaveworks/track-released-oss

Bump weave-gitops to latest v0.32.0

Makefile

@@ -152,8 +152,7 @@ cmd/gitops/gitops: cmd/gitops/main.go $(shell find cmd/gitops -name "*.go")
 
 update-weave-gitops:
 	$(eval SHORTHASH := $(shell curl -q 'https://api.github.com/repos/weaveworks/weave-gitops/branches/$(BRANCH)' | jq -r '.commit.sha[:8]'))
-	go get -d github.com/weaveworks/weave-gitops@$(SHORTHASH)
-	go mod tidy
+	GOPRIVATE=github.com/weaveworks go get -d github.com/weaveworks/weave-gitops@$(SHORTHASH) && go mod tidy
 	$(eval NPM_VERSION := $(shell yarn info @weaveworks/weave-gitops-main time --json | jq -r '.data | keys | .[] | select(contains("$(SHORTHASH)"))'))
 	yarn add @weaveworks/weave-gitops@npm:@weaveworks/weave-gitops-main@$(NPM_VERSION)
 

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/cobra v1.7.0
 	github.com/stretchr/testify v1.8.2
-	github.com/weaveworks/weave-gitops v0.31.2
+	github.com/weaveworks/weave-gitops v0.32.0
 	github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.2
 	github.com/weaveworks/weave-gitops-enterprise/common v0.0.0
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -1275,8 +1275,8 @@ github.com/weaveworks/templates-controller v0.2.0 h1:7pWLCoHasLyk1qgDH6N9XVgozZv
 github.com/weaveworks/templates-controller v0.2.0/go.mod h1:qO/4Eeqas5kjLCacboFKcisszFMjCjIUMxhtqxYlMUw=
 github.com/weaveworks/tf-controller/api v0.0.0-20230416092146-4a7dfa5b6cc4 h1:+IkLtnXzCkhJzojbadPd+UxwaTa6K/Eb2grY6LcYfeo=
 github.com/weaveworks/tf-controller/api v0.0.0-20230416092146-4a7dfa5b6cc4/go.mod h1:LUBkwqS7FHz/QTNuYzvWj6svehhh1djnV0Gj3OTc87E=
-github.com/weaveworks/weave-gitops v0.31.2 h1:U/yqSePWSml+rXDqguV4jkRI2R8SpcW7OLesun+jwVE=
-github.com/weaveworks/weave-gitops v0.31.2/go.mod h1:2YgGGQJAs2JA/MCD4/toPKBxSBWbVvLzBMcVX3M3Wm4=
+github.com/weaveworks/weave-gitops v0.32.0 h1:SWvJRPd2/bAfA7ERnTx7lIqb0Zqo/fA6vxZ2PVV51fM=
+github.com/weaveworks/weave-gitops v0.32.0/go.mod h1:2YgGGQJAs2JA/MCD4/toPKBxSBWbVvLzBMcVX3M3Wm4=
 github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.2 h1:7jeiQehqmI4ds6YIq8TW1Vqhlb6V7G2BVRJ8VM3r99I=
 github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.2/go.mod h1:6PMYg+VtSNePnP7EXyNG+/hNRNZ3r0mQtolIZU4s/J0=
 github.com/xanzy/go-gitlab v0.83.0 h1:37p0MpTPNbsTMKX/JnmJtY8Ch1sFiJzVF342+RvZEGw=

package.json

@@ -28,7 +28,7 @@
     "@types/styled-components": "^5.1.9",
     "@types/urijs": "^1.19.19",
     "@weaveworks/progressive-delivery": "0.0.0-rc13",
-    "@weaveworks/weave-gitops": "0.31.2",
+    "@weaveworks/weave-gitops": "0.32.0",
     "babel-jest": "^27.4.2",
     "babel-loader": "^8.2.3",
     "babel-plugin-named-asset-import": "^0.3.8",

test/acceptance/test/pages/clusters_page.go

@@ -106,8 +106,8 @@ func GetClusterStatus(webDriver *agouti.Page) *ClusterStatus {
 
 func GetClusterInfrastructure(webDriver *agouti.Page) *ClusterInfrastructure {
 	return &ClusterInfrastructure{
-		Kind:       webDriver.FindByXPath(`//tr/td[.="Kind:"]/following-sibling::td`),
-		ApiVersion: webDriver.FindByButton(`//tr/td[.="APIVersion:"]/following-sibling::td`),
+		Kind:       webDriver.Find(`[data-testid="Kind"] :last-child`),
+		ApiVersion: webDriver.Find(`[data-testid="APIVersion"] :last-child`),
 	}
 }
 

ui/src/components/Applications/__tests__/__snapshots__/index.test.tsx.snap

@@ -495,7 +495,7 @@ exports[`Applications index test snapshots success 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  gap: 8px;
+  gap: 12px;
   -webkit-box-pack: start;
   -webkit-justify-content: flex-start;
   -ms-flex-pack: start;
@@ -908,7 +908,7 @@ exports[`Applications index test snapshots success 1`] = `
   border-right: none;
 }
 
-.c28.MuiButton-outlined.Mui-disabled {
+.c28.MuiButton-outlined.MuiButton-outlined.Mui-disabled {
   border-right: none;
 }
 

ui/src/components/Terraform/__tests__/TerraformObjectDetail.test.tsx

@@ -100,9 +100,9 @@ describe('TerraformObjectDetail', () => {
 
     const info = await screen.findByText('Suspended:');
 
-    const suspendedValue = info?.parentNode?.nextSibling?.textContent;
+    const suspendedValue = info?.parentNode?.textContent;
 
-    expect(suspendedValue).toEqual('False');
+    expect(suspendedValue).toEqual('Suspended:False');
 
     const button = await screen.findByText('Suspend');
 

yarn.lock

@@ -2406,10 +2406,10 @@
   resolved "https://npm.pkg.github.com/download/@weaveworks/progressive-delivery/0.0.0-rc13/2628159001f4812b90e068e64fae8de6b4e3f2b4"
   integrity sha512-51ET/FrGwKcBUSqRTtaWTTuWQi/y51JQAFYMT6ctOLaiIXSopCyi3alf4aYDZ5TPFAIdOQapJMYiq2HVj5XxOQ==
 
-"@weaveworks/weave-gitops@0.31.2":
-  version "0.31.2"
-  resolved "https://npm.pkg.github.com/download/@weaveworks/weave-gitops/0.31.2/25567b7e0c1bc1692029d4af8a3dd635b3aee593#25567b7e0c1bc1692029d4af8a3dd635b3aee593"
-  integrity sha512-pGVtaX1LwMYV6N5rysLZdocSblU6m6UJyhX05CXC0xLO4fmD0mscQd2V5OoGQ8JBT4cWt87OnDPrL6gjmbJguA==
+"@weaveworks/weave-gitops@0.32.0":
+  version "0.32.0"
+  resolved "https://npm.pkg.github.com/download/@weaveworks/weave-gitops/0.32.0/ac7b9187029241d34eef4191abc580c7e52a5b48#ac7b9187029241d34eef4191abc580c7e52a5b48"
+  integrity sha512-O3GcgD0obT0krqLvaw7P20ySWXvEopEG4UsBbeh/ux50lpl0avT8u2nnA4EV+LbPnTMq1wqZzMrjoZQ2gjU3JA==
   dependencies:
     "@material-ui/core" "^4.12.4"
     "@material-ui/icons" "^4.11.2"