Merge branch 'master' into proof-of-upgrade-failure

.github/workflows/dapr_cli.yaml

@@ -29,7 +29,7 @@ jobs:
     name: Build ${{ matrix.target_os }}_${{ matrix.target_arch }} binaries
     runs-on: ${{ matrix.os }}
     env:
-      GOLANG_CI_LINT_VER: v1.51.2
+      GOLANG_CI_LINT_VER: v1.55.2
       GOOS: ${{ matrix.target_os }}
       GOARCH: ${{ matrix.target_arch }}
       GOPROXY: https://proxy.golang.org
@@ -132,14 +132,14 @@ jobs:
         if: matrix.target_arch == 'amd64' && matrix.target_os == 'linux'
         run: |
           [ ! -z "${{ env.REL_VERSION }}" ] && echo "${{ env.REL_VERSION }}" > "${{ env.ARCHIVE_OUTDIR }}/release_version.txt"
-      - name: upload artifacts
-        uses: actions/upload-artifact@master
+      - name: upload artifacts  ## Following migration guide in https://github.com/actions/upload-artifact/blob/main/docs/MIGRATION.md
+        uses: actions/upload-artifact@v4
         with:
-          name: cli_drop
+          name: cli_drop-${{ matrix.target_os }}_${{ matrix.target_arch }}
           path: ${{ env.ARCHIVE_OUTDIR }}
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.target_os }}_${{ matrix.target_arch }}_test_unit.json
           path: ${{ env.TEST_OUTPUT_FILE }}
@@ -152,9 +152,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: download artifacts
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v4
         with:
-          name: cli_drop
+          pattern: cli_drop-*
+          merge-multiple: true
           path: ${{ env.ARTIFACT_DIR }}
       - name: Set Release Version
         run: |

.github/workflows/kind_e2e.yaml

@@ -195,7 +195,7 @@ jobs:
       shell: bash
     - name: Upload test results
       if: always()
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.k8s-version }}_${{ matrix.mode }}_e2e_k8s.json
         path: ${{ env.TEST_OUTPUT_FILE }}

.github/workflows/self_hosted_e2e.yaml

@@ -40,8 +40,8 @@ jobs:
       ARCHIVE_OUTDIR: dist/archives
       DAPR_RUNTIME_PINNED_VERSION: "1.12.0"
       DAPR_DASHBOARD_PINNED_VERSION: 0.14.0
-      DAPR_RUNTIME_LATEST_STABLE_VERSION:
-      DAPR_DASHBOARD_LATEST_STABLE_VERSION:
+      DAPR_RUNTIME_LATEST_STABLE_VERSION: ""
+      DAPR_DASHBOARD_LATEST_STABLE_VERSION: ""
       GOLANG_PROTOBUF_REGISTRATION_CONFLICT: warn
       PODMAN_VERSION: 4.4.4
     strategy:
@@ -179,7 +179,7 @@ jobs:
         shell: bash
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.target_os }}_${{ matrix.target_arch }}_e2e_standalone.json
+          name: ${{ matrix.target_os }}_${{ matrix.target_arch }}_${{ matrix.dapr_install_mode }}_e2e_standalone.json
           path: ${{ env.TEST_OUTPUT_FILE }}

.github/workflows/upgrade_e2e.yaml

@@ -158,7 +158,7 @@ jobs:
 
     - name: Upload test results
       if: always()
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.k8s-version }}_${{ matrix.mode }}_e2e_upgrade_k8s.json
         path: ${{ env.TEST_OUTPUT_FILE }}

.golangci.yml

@@ -118,13 +118,11 @@ linters-settings:
     # minimal occurrences count to trigger, 3 by default
     min-occurrences: 5
   depguard:
-    list-type: blacklist
-    include-go-root: false
-    packages:
-      - github.com/Sirupsen/logrus
-    packages-with-error-messages:
-      # specify an error message to output when a blacklisted package is used
-      github.com/Sirupsen/logrus: "must use github.com/sirupsen/logrus"
+    rules:
+      main:
+        deny:
+          - pkg: "github.com/Sirupsen/logrus"
+            desc: "must use github.com/sirupsen/logrus"
   misspell:
     # Correct spellings using locale preferences for US or UK.
     # Default is to use a neutral variety of English.
@@ -216,7 +214,6 @@ linters-settings:
     # Allow multiline assignments to be cuddled. Default is true.
     allow-multiline-assign: true
     # Allow case blocks to end with a whitespace.
-    allow-case-traling-whitespace: true
     # Allow declarations (var) to be cuddled.
     allow-cuddle-declarations: false
 
@@ -262,4 +259,10 @@ linters:
     - forcetypeassert
     - ireturn
     - golint
-    - nosnakecase
+    - nosnakecase
+    - tagalign
+    - varcheck
+    - deadcode
+    - structcheck
+    - ifshort
+    - testifylint

Makefile

@@ -207,7 +207,7 @@ e2e-build-run-sh: build test-e2e-sh
 ################################################################################
 .PHONY: modtidy
 modtidy:
-	go mod tidy -compat=1.20
+	go mod tidy -compat=1.21
 
 ################################################################################
 # Target: check-diff                                                           #

README.md

@@ -351,6 +351,8 @@ dapr upgrade -k --runtime-version=1.0.0
 
 The example above shows how to upgrade from your current version to version `1.0.0`.
 
+*Note: `dapr upgrade` will retry up to 5 times upon failure*
+
 #### Supplying Helm values
 
 All available [Helm Chart values](https://github.com/dapr/dapr/tree/master/charts/dapr#configuration) can be set by using the `--set` flag:

cmd/dashboard.go

@@ -180,7 +180,7 @@ dapr dashboard -k -p 0
 			}()
 
 			// url for dashboard after port forwarding.
-			webURL := fmt.Sprintf("http://%s", net.JoinHostPort(dashboardHost, fmt.Sprint(portForward.LocalPort)))
+			webURL := fmt.Sprintf("http://%s", net.JoinHostPort(dashboardHost, fmt.Sprint(portForward.LocalPort))) //nolint: perfsprint
 
 			print.InfoStatusEvent(os.Stdout, fmt.Sprintf("Dapr dashboard found in namespace:\t%s", foundNamespace))
 			print.InfoStatusEvent(os.Stdout, fmt.Sprintf("Dapr dashboard available at:\t%s\n", webURL))

docs/development/development.md

@@ -7,7 +7,7 @@ This document helps you get started developing Dapr CLI. If you find any problem
 
 ### Linux and MacOS
 
-1. The Go language environment `1.20` [(instructions)](https://golang.org/doc/install#tarball).
+1. The Go language environment `1.21` [(instructions)](https://golang.org/doc/install#tarball).
    * Make sure that your GOPATH and PATH are configured correctly
    ```bash
    export GOPATH=~/go

go.mod

@@ -1,6 +1,6 @@
 module github.com/dapr/cli
 
-go 1.20
+go 1.21
 
 require (
 	github.com/Azure/go-autorest/autorest v0.11.28 // indirect