diff --git a/.github/workflows/kind_e2e.yaml b/.github/workflows/kind_e2e.yaml index 216f5a6ff..6a8e8c609 100644 --- a/.github/workflows/kind_e2e.yaml +++ b/.github/workflows/kind_e2e.yaml @@ -51,7 +51,7 @@ jobs: runs-on: ubuntu-latest env: GOVER: 1.18 - DAPR_RUNTIME_VERSION: 1.8.0-rc.2 + DAPR_RUNTIME_VERSION: 1.8.0-rc.3 DAPR_DASHBOARD_VERSION: 0.10.0 DAPR_TGZ: dapr-1.7.0.tgz strategy: diff --git a/.github/workflows/self_hosted_e2e.yaml b/.github/workflows/self_hosted_e2e.yaml index 61ab6a47c..0300c53e4 100644 --- a/.github/workflows/self_hosted_e2e.yaml +++ b/.github/workflows/self_hosted_e2e.yaml @@ -40,7 +40,7 @@ jobs: GOARCH: ${{ matrix.target_arch }} GOPROXY: https://proxy.golang.org ARCHIVE_OUTDIR: dist/archives - DAPR_RUNTIME_VERSION: "1.8.0-rc.2" + DAPR_RUNTIME_VERSION: "1.8.0-rc.3" DAPR_DASHBOARD_VERSION: 0.10.0 DAPR_TGZ: dapr-1.7.0.tgz strategy: diff --git a/cmd/dapr.go b/cmd/dapr.go index d9cd82725..834ec88af 100644 --- a/cmd/dapr.go +++ b/cmd/dapr.go @@ -72,7 +72,7 @@ func Execute(version, apiVersion string) { } func setVersion() { - template := fmt.Sprintf("CLI version: %s \nRuntime version: %s", daprVer.CliVersion, daprVer.RuntimeVersion) + template := fmt.Sprintf(cliVersionTemplateString, daprVer.CliVersion, daprVer.RuntimeVersion) RootCmd.SetVersionTemplate(template) } diff --git a/cmd/version.go b/cmd/version.go index df035aca5..6c5116b67 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -23,6 +23,8 @@ import ( "github.com/dapr/cli/pkg/print" ) +const cliVersionTemplateString = "CLI version: %s \nRuntime version: %s\n" + var output string var VersionCmd = &cobra.Command{ @@ -40,7 +42,7 @@ dapr version --output json switch output { case "": // normal output. - fmt.Printf("CLI version: %s \nRuntime version: %s", daprVer.CliVersion, daprVer.RuntimeVersion) + fmt.Printf(cliVersionTemplateString, daprVer.CliVersion, daprVer.RuntimeVersion) case "json": // json output. b, err := json.Marshal(daprVer) @@ -48,7 +50,7 @@ dapr version --output json print.FailureStatusEvent(os.Stderr, err.Error()) os.Exit(1) } - fmt.Printf("%s", string(b)) + fmt.Printf("%s\n", string(b)) default: // fail and exit. os.Exit(1) diff --git a/go.mod b/go.mod index 26b92d982..baf33c847 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect github.com/Pallinder/sillyname-go v0.0.0-20130730142914-97aeae9e6ba1 github.com/briandowns/spinner v1.6.1 - github.com/dapr/dapr v1.8.0-rc.2 + github.com/dapr/dapr v1.8.0-rc.3 github.com/dapr/go-sdk v1.0.0 github.com/docker/docker v20.10.12+incompatible github.com/fatih/color v1.13.0 diff --git a/go.sum b/go.sum index 0a99aa4c3..1152953ba 100644 --- a/go.sum +++ b/go.sum @@ -351,8 +351,8 @@ github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg= -github.com/dapr/dapr v1.8.0-rc.2 h1:l5ed+u4PvaM0124nCP/TdTZbhtxlGU4abR2DvQoVRvo= -github.com/dapr/dapr v1.8.0-rc.2/go.mod h1:fCL5XYOGgrkmpl1GfCN9W0k/dMULHLBeMq73M4JxvTc= +github.com/dapr/dapr v1.8.0-rc.3 h1:9Lzmy7f0aGlg/NJGQxGPUfpYbsjPtzhHhMXgZ/96Ikc= +github.com/dapr/dapr v1.8.0-rc.3/go.mod h1:FEV1TqoQoIgJiOUvMD19ScwjEPaVBtZL4iK7EHDNbwA= github.com/dapr/go-sdk v1.0.0 h1:3nOmFzsPaHzzgINQQD9AFofVX6LV8QYJtpogaBfwkUg= github.com/dapr/go-sdk v1.0.0/go.mod h1:zyhsocIKv4pqQ2VtvWvf2CK1UhP7Z2OAOXgEpVxMgIs= github.com/dapr/kit v0.0.2-0.20210614175626-b9074b64d233 h1:M0dWIG8kUxEFU57IqTWeqptNqlBsfosFgsA5Ov7rJ8g= diff --git a/tests/e2e/upgrade/upgrade_test.go b/tests/e2e/upgrade/upgrade_test.go index 2b12df7f6..a60131524 100644 --- a/tests/e2e/upgrade/upgrade_test.go +++ b/tests/e2e/upgrade/upgrade_test.go @@ -38,7 +38,7 @@ var supportedUpgradePaths = []upgradePath{ CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io", "resiliencies.dapr.io"}, }, next: common.VersionDetails{ - RuntimeVersion: "1.8.0-rc.2", + RuntimeVersion: "1.8.0-rc.3", DashboardVersion: "0.10.0", ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"}, ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"}, @@ -64,7 +64,7 @@ var supportedUpgradePaths = []upgradePath{ // test downgrade { previous: common.VersionDetails{ - RuntimeVersion: "1.8.0-rc.2", + RuntimeVersion: "1.8.0-rc.3", DashboardVersion: "0.10.0", ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"}, ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"},