bump kpt to go1.20 (#3926)

kptdev · Apr 25, 2023 · 8e101e6 · 8e101e6
1 parent 840b078
commit 8e101e6
Show file tree

Hide file tree

Showing 72 changed files with 131 additions and 150 deletions.
diff --git a/.github/workflows/checkLicenses.yml b/.github/workflows/checkLicenses.yml
@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Go 1.19
+      - name: Set up Go 1.20
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - run: |
           ./scripts/create-licenses.sh
       # Upload the licenses list so it's available if needed

diff --git a/.github/workflows/e2eEnvironment.yml b/.github/workflows/e2eEnvironment.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - uses: actions/checkout@v3
       # Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
       # If you upgrade this version confirm the changes match your expectations

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -45,10 +45,10 @@ jobs:
         run: |
           which podman
           podman version
-      - name: Set up Go 1.19
+      - name: Set up Go 1.20
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: '1.20'
         id: go
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
@@ -67,10 +67,10 @@ jobs:
   build-macos:
     runs-on: macos-latest
     steps:
-      - name: Set up Go 1.19
+      - name: Set up Go 1.20
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: '1.20'
         id: go
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
@@ -85,10 +85,10 @@ jobs:
 #  build-windows:
 #    runs-on: windows-2019
 #    steps:
-#      - name: Set up Go 1.19
+#      - name: Set up Go 1.20
 #        uses: actions/setup-go@v1
 #        with:
-#          go-version: 1.19
+#          go-version: '1.20'
 #        id: go
 #      - name: Check out code into the Go module directory
 #        uses: actions/checkout@v3

diff --git a/.github/workflows/live-e2e.yml b/.github/workflows/live-e2e.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - uses: actions/checkout@master
       # Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
       # If you upgrade this version confirm the changes match your expectations

diff --git a/.github/workflows/porch-e2e.yml b/.github/workflows/porch-e2e.yml
@@ -53,10 +53,10 @@ jobs:
           - "kindest/node:v1.23.4@sha256:0e34f0d0fd448aa2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9"
 
     steps:
-      - name: Set up Go 1.19
+      - name: Set up Go 1.20
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Checkout Porch
         uses: actions/checkout@v3
       - name: Build kpt

diff --git a/.github/workflows/porch.yml b/.github/workflows/porch.yml
@@ -29,10 +29,10 @@ jobs:
     name: Porch Unit Tests
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.19
+      - name: Set up Go 1.20
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Run Porch Unit Tests
         uses: actions/checkout@v3
       - name: Verify format / headers etc

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Checkout
         uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/verifyContent.yml b/.github/workflows/verifyContent.yml
@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - uses: actions/checkout@v3
       - run: |
           make build

diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-GOLANG_VERSION         := 1.19.5
+GOLANG_VERSION         := 1.20.3
 GORELEASER_CONFIG      = release/tag/goreleaser.yaml
 GORELEASER_IMAGE       := ghcr.io/goreleaser/goreleaser-cross:v$(GOLANG_VERSION)
 
@@ -59,7 +59,7 @@ install-kind:
 
 .PHONY: install-golangci-lint
 install-golangci-lint:
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.1
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2
 
 .PHONY: install-go-licenses
 install-go-licenses:

diff --git a/commands/alpha/alphacmd.go b/commands/alpha/alphacmd.go
@@ -30,7 +30,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func GetCommand(ctx context.Context, name, version string) *cobra.Command {
+func GetCommand(ctx context.Context, _, version string) *cobra.Command {
 	alpha := &cobra.Command{
 		Use:   "alpha",
 		Short: alphadocs.AlphaShort,

diff --git a/commands/alpha/license/command.go b/commands/alpha/license/command.go
@@ -22,7 +22,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func NewCommand(ctx context.Context, version string) *cobra.Command {
+func NewCommand(ctx context.Context, _ string) *cobra.Command {
 	licenseCmd := &cobra.Command{
 		Use:   "license",
 		Short: "[Alpha] " + licensedocs.LicenseShort,

diff --git a/commands/alpha/license/info/info.go b/commands/alpha/license/info/info.go
@@ -47,7 +47,7 @@ type runner struct {
 	Command *cobra.Command
 }
 
-func (r *runner) runE(cmd *cobra.Command, args []string) error {
+func (r *runner) runE(_ *cobra.Command, _ []string) error {
 	fmt.Println(licenses.AllOSSLicense)
 	return nil
 }
diff --git a/commands/alpha/live/plan/command.go b/commands/alpha/live/plan/command.go
@@ -86,7 +86,7 @@ type Runner struct {
 	output                string
 }
 
-func (r *Runner) PreRunE(c *cobra.Command, args []string) error {
+func (r *Runner) PreRunE(_ *cobra.Command, _ []string) error {
 	return r.validateOutputFormat()
 }
 

diff --git a/commands/alpha/repo/get/command.go b/commands/alpha/repo/get/command.go
@@ -72,7 +72,7 @@ type runner struct {
 	requestTable bool
 }
 
-func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
+func (r *runner) preRunE(cmd *cobra.Command, _ []string) error {
 	outputOption := cmd.Flags().Lookup("output").Value.String()
 	if strings.Contains(outputOption, "custom-columns") || outputOption == "yaml" || strings.Contains(outputOption, "json") {
 		r.requestTable = false

diff --git a/commands/alpha/repo/reg/command.go b/commands/alpha/repo/reg/command.go
@@ -86,7 +86,7 @@ type runner struct {
 	workloadIdentity bool
 }
 
-func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
+func (r *runner) preRunE(_ *cobra.Command, _ []string) error {
 	const op errors.Op = command + ".preRunE"
 	client, err := porch.CreateClientWithFlags(r.cfg)
 	if err != nil {
@@ -96,7 +96,7 @@ func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func (r *runner) runE(cmd *cobra.Command, args []string) error {
+func (r *runner) runE(_ *cobra.Command, args []string) error {
 	const op errors.Op = command + ".runE"
 
 	if len(args) == 0 {

diff --git a/commands/alpha/repo/unreg/command.go b/commands/alpha/repo/unreg/command.go
@@ -69,7 +69,7 @@ type runner struct {
 	keepSecret bool
 }
 
-func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
+func (r *runner) preRunE(_ *cobra.Command, _ []string) error {
 	const op errors.Op = command + ".preRunE"
 	client, err := porch.CreateClientWithFlags(r.cfg)
 	if err != nil {
@@ -79,7 +79,7 @@ func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func (r *runner) runE(cmd *cobra.Command, args []string) error {
+func (r *runner) runE(_ *cobra.Command, args []string) error {
 	const op errors.Op = command + ".runE"
 
 	if len(args) == 0 {

diff --git a/commands/alpha/rollouts/advance/advance.go b/commands/alpha/rollouts/advance/advance.go
@@ -50,7 +50,7 @@ type runner struct {
 	factory k8scmdutil.Factory
 }
 
-func (r *runner) runE(cmd *cobra.Command, args []string) error {
+func (r *runner) runE(_ *cobra.Command, args []string) error {
 	rlc, err := rolloutsclient.New()
 	if err != nil {
 		fmt.Printf("%s\n", err)

diff --git a/commands/alpha/rollouts/get/get.go b/commands/alpha/rollouts/get/get.go
@@ -51,7 +51,7 @@ type runner struct {
 	factory k8scmdutil.Factory
 }
 
-func (r *runner) runE(cmd *cobra.Command, args []string) error {
+func (r *runner) runE(cmd *cobra.Command, _ []string) error {
 	rlc, err := rolloutsclient.New()
 	if err != nil {
 		fmt.Printf("%s\n", err)

diff --git a/commands/alpha/rollouts/rolloutsclient/client.go b/commands/alpha/rollouts/rolloutsclient/client.go
@@ -99,11 +99,7 @@ func (rlc *Client) Get(ctx context.Context, ns, name string) (*rolloutsapi.Rollo
 }
 
 func (rlc *Client) Update(ctx context.Context, rollout *rolloutsapi.Rollout) error {
-	if err := rlc.client.Update(ctx, rollout); err != nil {
-		return err
-	}
-
-	return nil
+	return rlc.client.Update(ctx, rollout)
 }
 
 func useServerSideThrottling(config *rest.Config) *rest.Config {

diff --git a/commands/alpha/rpkg/approve/command.go b/commands/alpha/rpkg/approve/command.go
@@ -67,7 +67,7 @@ type runner struct {
 	// Flags
 }
 
-func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
+func (r *runner) preRunE(_ *cobra.Command, _ []string) error {
 	const op errors.Op = command + ".preRunE"
 
 	client, err := porch.CreateRESTClient(r.cfg)
@@ -78,7 +78,7 @@ func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func (r *runner) runE(cmd *cobra.Command, args []string) error {
+func (r *runner) runE(_ *cobra.Command, args []string) error {
 	const op errors.Op = command + ".runE"
 	var messages []string
 

diff --git a/commands/alpha/rpkg/clone/command.go b/commands/alpha/rpkg/clone/command.go
@@ -90,7 +90,7 @@ type runner struct {
 	target     string // Target package name
 }
 
-func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
+func (r *runner) preRunE(_ *cobra.Command, args []string) error {
 	const op errors.Op = command + ".preRunE"
 	client, err := porch.CreateClientWithFlags(r.cfg)
 	if err != nil {
@@ -183,7 +183,7 @@ func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func (r *runner) runE(cmd *cobra.Command, args []string) error {
+func (r *runner) runE(cmd *cobra.Command, _ []string) error {
 	const op errors.Op = command + ".runE"
 
 	pr := &porchapi.PackageRevision{

diff --git a/commands/alpha/rpkg/copy/command.go b/commands/alpha/rpkg/copy/command.go
@@ -69,7 +69,7 @@ type runner struct {
 	replayStrategy bool
 }
 
-func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
+func (r *runner) preRunE(_ *cobra.Command, args []string) error {
 	const op errors.Op = command + ".preRunE"
 	client, err := porch.CreateClientWithFlags(r.cfg)
 	if err != nil {
@@ -90,7 +90,7 @@ func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func (r *runner) runE(cmd *cobra.Command, args []string) error {
+func (r *runner) runE(cmd *cobra.Command, _ []string) error {
 	const op errors.Op = command + ".runE"
 
 	revisionSpec, err := r.getPackageRevisionSpec()

diff --git a/commands/alpha/rpkg/del/command.go b/commands/alpha/rpkg/del/command.go
@@ -68,7 +68,7 @@ type runner struct {
 	Command *cobra.Command
 }
 
-func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
+func (r *runner) preRunE(_ *cobra.Command, _ []string) error {
 	const op errors.Op = command + ".preRunE"
 
 	client, err := porch.CreateClientWithFlags(r.cfg)
@@ -79,7 +79,7 @@ func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func (r *runner) runE(cmd *cobra.Command, args []string) error {
+func (r *runner) runE(_ *cobra.Command, args []string) error {
 	const op errors.Op = command + ".runE"
 	var messages []string
 

diff --git a/commands/alpha/rpkg/get/command.go b/commands/alpha/rpkg/get/command.go
@@ -88,7 +88,7 @@ type runner struct {
 	requestTable bool
 }
 
-func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
+func (r *runner) preRunE(cmd *cobra.Command, _ []string) error {
 	// Print the namespace if we're spanning namespaces
 	if r.getFlags.AllNamespaces {
 		r.printFlags.HumanReadableFlags.WithNamespace = true

diff --git a/commands/alpha/rpkg/init/command.go b/commands/alpha/rpkg/init/command.go
@@ -77,7 +77,7 @@ type runner struct {
 	workspace   string // Target workspace name
 }
 
-func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
+func (r *runner) preRunE(_ *cobra.Command, args []string) error {
 	const op errors.Op = command + ".preRunE"
 
 	client, err := porch.CreateClientWithFlags(r.cfg)
@@ -110,7 +110,7 @@ func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func (r *runner) runE(cmd *cobra.Command, args []string) error {
+func (r *runner) runE(cmd *cobra.Command, _ []string) error {
 	const op errors.Op = command + ".runE"
 
 	pr := &porchapi.PackageRevision{

diff --git a/commands/alpha/rpkg/propose/command.go b/commands/alpha/rpkg/propose/command.go
@@ -66,7 +66,7 @@ type runner struct {
 	// Flags
 }
 
-func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
+func (r *runner) preRunE(_ *cobra.Command, _ []string) error {
 	const op errors.Op = command + ".preRunE"
 
 	client, err := porch.CreateClientWithFlags(r.cfg)
@@ -77,7 +77,7 @@ func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func (r *runner) runE(cmd *cobra.Command, args []string) error {
+func (r *runner) runE(_ *cobra.Command, args []string) error {
 	const op errors.Op = command + ".runE"
 	var messages []string
 	namespace := *r.cfg.Namespace

diff --git a/commands/alpha/rpkg/proposedelete/command.go b/commands/alpha/rpkg/proposedelete/command.go
@@ -66,7 +66,7 @@ type runner struct {
 	Command *cobra.Command
 }
 
-func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
+func (r *runner) preRunE(_ *cobra.Command, _ []string) error {
 	const op errors.Op = command + ".preRunE"
 
 	client, err := porch.CreateClientWithFlags(r.cfg)

diff --git a/commands/alpha/rpkg/pull/command.go b/commands/alpha/rpkg/pull/command.go
@@ -73,7 +73,7 @@ type runner struct {
 	printer printer.Printer
 }
 
-func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
+func (r *runner) preRunE(_ *cobra.Command, _ []string) error {
 	const op errors.Op = command + ".preRunE"
 	config, err := r.cfg.ToRESTConfig()
 	if err != nil {
@@ -95,7 +95,7 @@ func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func (r *runner) runE(cmd *cobra.Command, args []string) error {
+func (r *runner) runE(_ *cobra.Command, args []string) error {
 	const op errors.Op = command + ".runE"
 
 	if len(args) == 0 {

diff --git a/commands/alpha/rpkg/push/command.go b/commands/alpha/rpkg/push/command.go
@@ -77,7 +77,7 @@ type runner struct {
 	printer printer.Printer
 }
 
-func (r *runner) preRunE(cmd *cobra.Command, args []string) error {
+func (r *runner) preRunE(_ *cobra.Command, _ []string) error {
 	const op errors.Op = command + ".preRunE"
 	config, err := r.cfg.ToRESTConfig()
 	if err != nil {