Upgrade to GO 1.19 (#1747)

gailazar300 · web-flow · commit f1f6d3b9e3f8 · 2022-11-07T14:34:05.000+02:00
diff --git a/.github/workflows/accessTests.yml b/.github/workflows/accessTests.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Go Cache
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Checkout code
         uses: actions/checkout@v3
         with:
@@ -37,7 +37,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Static Code Analysis
         uses: dominikh/staticcheck-action@v1
         with:
@@ -51,7 +51,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Install gosec
         run: curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $(go env GOPATH)/bin
       - name: Run gosec
diff --git a/.github/workflows/artifactoryTests.yml b/.github/workflows/artifactoryTests.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Checkout code
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/distributionTests.yml b/.github/workflows/distributionTests.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Go Cache
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/dockerTests.yml b/.github/workflows/dockerTests.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Checkout code
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/frogbot-scan-and-fix.yml b/.github/workflows/frogbot-scan-and-fix.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
 
       - uses: jfrog/frogbot@v2
         env:
diff --git a/.github/workflows/frogbot-scan-pr.yml b/.github/workflows/frogbot-scan-pr.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
 
       - uses: jfrog/frogbot@v2
         env:
diff --git a/.github/workflows/goTests.yml b/.github/workflows/goTests.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Checkout code
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/gradleTests.yml b/.github/workflows/gradleTests.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Checkout code
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/mavenTests.yml b/.github/workflows/mavenTests.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Checkout code
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/npmTests.yml b/.github/workflows/npmTests.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Install npm
         uses: actions/setup-node@v3
         with:
diff --git a/.github/workflows/nugetTests.yml b/.github/workflows/nugetTests.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Install NuGet
         uses: nuget/setup-nuget@v1
         with:
diff --git a/.github/workflows/pluginsTests.yml b/.github/workflows/pluginsTests.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Checkout code
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/pythonTests.yml b/.github/workflows/pythonTests.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Setup Python3
         uses: actions/setup-python@v4
         with:
diff --git a/.github/workflows/transferTests.yml b/.github/workflows/transferTests.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Go Cache
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/xrayTests.yml b/.github/workflows/xrayTests.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.19.x
       - name: Install npm
         uses: actions/setup-node@v3
         with:
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -25,7 +25,7 @@ node("docker") {
     repo = 'jfrog-cli'
     sh 'rm -rf temp'
     sh 'mkdir temp'
-    def goRoot = tool 'go-1.18.5'
+    def goRoot = tool 'go-1.19.2'
     env.GOROOT="$goRoot"
     env.PATH+=":${goRoot}/bin"
     env.GO111MODULE="on"
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 [![Go Report Card](https://goreportcard.com/badge/github.com/jfrog/jfrog-cli)](https://goreportcard.com/report/github.com/jfrog/jfrog-cli)
 [![license](https://img.shields.io/badge/License-Apache_2.0-blue.svg?style=flat)](https://raw.githubusercontent.com/jfrog/jfrog-cli/v2/LICENSE) [![](https://img.shields.io/badge/Docs-%F0%9F%93%96-blue)](https://www.jfrog.com/confluence/display/CLI/JFrog+CLI)
-
+[![Go version](https://img.shields.io/github/go-mod/go-version/jfrog/jfrog-cli)](https://tip.golang.org/doc/go1.19)
 </div>
 
 <details>
diff --git a/artifactory/cli.go b/artifactory/cli.go
@@ -3,7 +3,6 @@ package artifactory
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strconv"
 	"strings"
@@ -2189,7 +2188,7 @@ func usersDeleteCmd(c *cli.Context) error {
 
 func parseCSVToUsersList(csvFilePath string) ([]services.User, error) {
 	var usersList []services.User
-	csvInput, err := ioutil.ReadFile(csvFilePath)
+	csvInput, err := os.ReadFile(csvFilePath)
 	if err != nil {
 		return usersList, errorutils.CheckError(err)
 	}
diff --git a/artifactory_test.go b/artifactory_test.go
@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/url"
@@ -1900,7 +1899,7 @@ func createFileInHomeDir(t *testing.T, fileName string) (testFileRelPath string,
 	testFileRelPath = filepath.Join("~", fileName)
 	testFileAbsPath = filepath.Join(fileutils.GetHomeDir(), fileName)
 	d1 := []byte("test file")
-	err := ioutil.WriteFile(testFileAbsPath, d1, 0644)
+	err := os.WriteFile(testFileAbsPath, d1, 0644)
 	assert.NoError(t, err, "Couldn't create file")
 	return
 }
@@ -1935,9 +1934,9 @@ func TestArtifactoryUploadExcludeByCli2Wildcard(t *testing.T) {
 
 	// Create temp files
 	d1 := []byte("test file")
-	err := ioutil.WriteFile(filepath.Join(absDirPath, "cliTestFile1.in"), d1, 0644)
+	err := os.WriteFile(filepath.Join(absDirPath, "cliTestFile1.in"), d1, 0644)
 	assert.NoError(t, err, "Couldn't create file")
-	err = ioutil.WriteFile(filepath.Join(absDirPath, "cliTestFile2.in"), d1, 0644)
+	err = os.WriteFile(filepath.Join(absDirPath, "cliTestFile2.in"), d1, 0644)
 	assert.NoError(t, err, "Couldn't create file")
 
 	// Upload files
@@ -1962,9 +1961,9 @@ func TestArtifactoryUploadExcludeByCli2Regex(t *testing.T) {
 
 	// Create temp files
 	d1 := []byte("test file")
-	err := ioutil.WriteFile(filepath.Join(absDirPath, "cliTestFile1.in"), d1, 0644)
+	err := os.WriteFile(filepath.Join(absDirPath, "cliTestFile1.in"), d1, 0644)
 	assert.NoError(t, err, "Couldn't create file")
-	err = ioutil.WriteFile(filepath.Join(absDirPath, "cliTestFile2.in"), d1, 0644)
+	err = os.WriteFile(filepath.Join(absDirPath, "cliTestFile2.in"), d1, 0644)
 	assert.NoError(t, err, "Couldn't create file")
 
 	// Upload files
@@ -2105,7 +2104,7 @@ func TestValidateBrokenSymlink(t *testing.T) {
 	}
 	initArtifactoryTest(t, "")
 	// Create temporary file in resourcesPath/a/
-	tmpFile, err := ioutil.TempFile(tests.GetTestResourcesPath()+"a/", "a.in.")
+	tmpFile, err := os.CreateTemp(tests.GetTestResourcesPath()+"a/", "a.in.")
 	if assert.NoError(t, err) {
 		assert.NoError(t, tmpFile.Close())
 	}
@@ -4560,7 +4559,7 @@ func execListBuildNamesRest() ([]string, error) {
 }
 
 func execCreateRepoRest(repoConfig, repoName string) {
-	output, err := ioutil.ReadFile(repoConfig)
+	output, err := os.ReadFile(repoConfig)
 	if err != nil {
 		log.Error(err)
 		os.Exit(1)
diff --git a/build/docker/full/Dockerfile b/build/docker/full/Dockerfile
@@ -1,6 +1,6 @@
 ARG repo_name_21
 # Remove ${repo_name_21} to pull from Docker Hub.
-FROM ${repo_name_21}/jfrog-docker/golang:1.18.5 as builder
+FROM ${repo_name_21}/jfrog-docker/golang:1.19.2 as builder
 ARG image_name=jfrog-cli-full
 ARG cli_executable_name
 WORKDIR /${image_name}
diff --git a/build/docker/slim/Dockerfile b/build/docker/slim/Dockerfile
@@ -1,6 +1,6 @@
 ARG repo_name_21
 # Remove ${repo_name_21} to pull from Docker Hub.
-FROM ${repo_name_21}/jfrog-docker/golang:1.18.5-alpine as builder
+FROM ${repo_name_21}/jfrog-docker/golang:1.19.2-alpine as builder
 ARG image_name=jfrog-cli
 ARG cli_executable_name
 WORKDIR /${image_name}
diff --git a/buildinfo_test.go b/buildinfo_test.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -167,7 +166,7 @@ func TestBuildAddDependenciesDryRun(t *testing.T) {
 	buildDir, err := utils.GetBuildDir(tests.RtBuildName1, "1", "")
 	assert.NoError(t, err)
 
-	files, _ := ioutil.ReadDir(buildDir)
+	files, _ := os.ReadDir(buildDir)
 	assert.Zero(t, len(files), "'rt bad' command with dry-run failed. The dry-run option has no effect.")
 
 	// Execute the bad command on remote Artifactory
@@ -180,7 +179,7 @@ func TestBuildAddDependenciesDryRun(t *testing.T) {
 	buildDir, err = utils.GetBuildDir(tests.RtBuildName1, "2", "")
 	assert.NoError(t, err)
 
-	files, _ = ioutil.ReadDir(buildDir)
+	files, _ = os.ReadDir(buildDir)
 	assert.Zero(t, len(files), "'rt bad' command on remote with dry-run failed. The dry-run option has no effect.")
 
 	chdirCallback()
@@ -283,11 +282,11 @@ func verifyBuildPublishOutput(t *testing.T, buffer *bytes.Buffer, dryRun bool) {
 	}
 }
 
-func getFilesFromBuildDir(t *testing.T, buildName, buildNumber, projectKey string) []os.FileInfo {
+func getFilesFromBuildDir(t *testing.T, buildName, buildNumber, projectKey string) []os.DirEntry {
 	buildDir, err := utils.GetBuildDir(buildName, buildNumber, "")
 	assert.NoError(t, err)
 
-	files, err := ioutil.ReadDir(buildDir)
+	files, err := os.ReadDir(buildDir)
 	assert.NoError(t, err)
 	return files
 }
diff --git a/completion/shells/bash/bash.go b/completion/shells/bash/bash.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 )
 
@@ -34,7 +34,7 @@ func WriteBashCompletionScript(install bool) {
 		return
 	}
 	completionPath := filepath.Join(homeDir, "jfrog_bash_completion")
-	if err = ioutil.WriteFile(completionPath, []byte(BashAutocomplete), 0600); err != nil {
+	if err = os.WriteFile(completionPath, []byte(BashAutocomplete), 0600); err != nil {
 		log.Error(err)
 		return
 	}
diff --git a/completion/shells/fish/fish.go b/completion/shells/fish/fish.go
@@ -2,7 +2,6 @@ package fish
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -27,7 +26,7 @@ func WriteFishCompletionScript(c *cli.Context, install bool) {
 		return
 	}
 	completionPath := filepath.Join(homeDir, ".config", "fish", "completions", jfApp.Name+".fish")
-	err = ioutil.WriteFile(completionPath, []byte(fishAutocomplete), 0600)
+	err = os.WriteFile(completionPath, []byte(fishAutocomplete), 0600)
 	if err != nil {
 		log.Error(err)
 	}
diff --git a/completion/shells/generate_scripts_test.go b/completion/shells/generate_scripts_test.go
@@ -5,7 +5,7 @@ import (
 	"github.com/jfrog/jfrog-cli/completion/shells/zsh"
 	clientTestUtils "github.com/jfrog/jfrog-client-go/utils/tests"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -43,7 +43,7 @@ func TestGenerateScripts(t *testing.T) {
 		assert.NoError(t, bashFile.Close())
 	}()
 	assert.NoError(t, err)
-	b, err := ioutil.ReadAll(bashFile)
+	b, err := io.ReadAll(bashFile)
 	assert.NoError(t, err)
 	assert.Equal(t, bash.BashAutocomplete, string(b))
 
@@ -53,7 +53,7 @@ func TestGenerateScripts(t *testing.T) {
 		assert.NoError(t, zshFile.Close())
 	}()
 	assert.NoError(t, err)
-	b, err = ioutil.ReadAll(zshFile)
+	b, err = io.ReadAll(zshFile)
 	assert.NoError(t, err)
 	assert.Equal(t, zsh.ZshAutocomplete, string(b))
 }
diff --git a/completion/shells/zsh/zsh.go b/completion/shells/zsh/zsh.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 )
 
@@ -35,7 +35,7 @@ func WriteZshCompletionScript(install bool) {
 		return
 	}
 	completionPath := filepath.Join(homeDir, "jfrog_zsh_completion")
-	if err = ioutil.WriteFile(completionPath, []byte(ZshAutocomplete), 0600); err != nil {
+	if err = os.WriteFile(completionPath, []byte(ZshAutocomplete), 0600); err != nil {
 		log.Error(err)
 		return
 	}
diff --git a/distribution/cli.go b/distribution/cli.go
diff --git a/distribution_test.go b/distribution_test.go
diff --git a/docker_test.go b/docker_test.go
diff --git a/general/cisetup/cisetup.go b/general/cisetup/cisetup.go
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/inttestutils/distribution.go b/inttestutils/distribution.go
diff --git a/maven_test.go b/maven_test.go
diff --git a/nuget_test.go b/nuget_test.go
diff --git a/schema/filespecschema_test.go b/schema/filespecschema_test.go
diff --git a/utils/progressbar/readerprogressbar.go b/utils/progressbar/readerprogressbar.go
diff --git a/utils/tests/container.go b/utils/tests/container.go
diff --git a/utils/tests/utils.go b/utils/tests/utils.go

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`	`"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"`
`8`	`8`	`"github.com/jfrog/jfrog-client-go/utils/log"`
`9`		`- "io/ioutil"`
	`9`	`+ "os"`
`10`	`10`	`"path/filepath"`
`11`	`11`	`)`
`12`	`12`
`@@ -34,7 +34,7 @@ func WriteBashCompletionScript(install bool) {`
`34`	`34`	`return`
`35`	`35`	`}`
`36`	`36`	`completionPath := filepath.Join(homeDir, "jfrog_bash_completion")`
`37`		`- if err = ioutil.WriteFile(completionPath, []byte(BashAutocomplete), 0600); err != nil {`
	`37`	`+ if err = os.WriteFile(completionPath, []byte(BashAutocomplete), 0600); err != nil {`
`38`	`38`	`log.Error(err)`
`39`	`39`	`return`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package fish`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`		`- "io/ioutil"`
`6`	`5`	`"os"`
`7`	`6`	`"path/filepath"`
`8`	`7`
`@@ -27,7 +26,7 @@ func WriteFishCompletionScript(c *cli.Context, install bool) {`
`27`	`26`	`return`
`28`	`27`	`}`
`29`	`28`	`completionPath := filepath.Join(homeDir, ".config", "fish", "completions", jfApp.Name+".fish")`
`30`		`- err = ioutil.WriteFile(completionPath, []byte(fishAutocomplete), 0600)`
	`29`	`+ err = os.WriteFile(completionPath, []byte(fishAutocomplete), 0600)`
`31`	`30`	`if err != nil {`
`32`	`31`	`log.Error(err)`
`33`	`32`	`}`