Merge pull request #487 from IBM-Cloud/dev

Prepare for 1.10.3 release

Author: Aerex

CONTRIBUTING.md

@@ -8,9 +8,13 @@ The following is a set of guidelines for` contributing to IBM Cloud CLI SDK. If
 
 ### Before You Submit PR
 
+#### Base branch
+
+This repository's default branch is master as that is from where we release. However, we develop in the **dev** branch. Make sure to create your feature branch from **dev** and also choose this as base for opening pull requests.
+
 #### Code Style
 
-We follow the offical [CodeReviewComments](https://github.com/golang/go/wiki/CodeReviewComments). Make sure you run [gofmt](https://golang.org/cmd/gofmt/) and [go vet](https://golang.org/cmd/vet/) to fix any major changes.
+We follow the official [CodeReviewComments](https://github.com/golang/go/wiki/CodeReviewComments). Make sure you run [gofmt](https://golang.org/cmd/gofmt/) and [go vet](https://golang.org/cmd/vet/) to fix any major changes.
 
 #### Unit Test
 

bluemix/configuration/config_helpers/helpers_test.go

@@ -2,7 +2,6 @@ package config_helpers
 
 import (
 	"encoding/base64"
-	"io/ioutil"
 	gourl "net/url"
 	"os"
 	"path/filepath"
@@ -15,7 +14,7 @@ import (
 func captureAndPrepareEnv(a *assert.Assertions) ([]string, string) {
 	env := os.Environ()
 
-	userHome, err := ioutil.TempDir("", "config_dir_test")
+	userHome, err := os.MkdirTemp("", "config_dir_test")
 	a.NoError(err)
 
 	os.Unsetenv("IBMCLOUD_CONFIG_HOME")

bluemix/configuration/core_config/bx_config_test.go

@@ -2,7 +2,6 @@ package core_config_test
 
 import (
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -555,7 +554,7 @@ func checkUsageStats(enabled bool, timeStampExist bool, config core_config.Repos
 }
 
 func prepareConfigForCLI(cliConfigContent string, t *testing.T) core_config.Repository {
-	ioutil.WriteFile("config.json", []byte(cliConfigContent), 0644)
+	os.WriteFile("config.json", []byte(cliConfigContent), 0644)
 	return core_config.NewCoreConfigFromPath("config.json", func(err error) {
 		t.Fatal(err.Error())
 	})

bluemix/configuration/persistor.go

@@ -2,7 +2,6 @@ package configuration
 
 import (
 	"context"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -137,7 +136,7 @@ func (dp DiskPersistor) read(data DataInterface) error {
 		return err
 	}
 
-	bytes, err := ioutil.ReadFile(dp.filePath)
+	bytes, err := os.ReadFile(dp.filePath)
 	if err != nil {
 		return err
 	}
@@ -152,6 +151,6 @@ func (dp DiskPersistor) write(data DataInterface) error {
 		return err
 	}
 
-	err = ioutil.WriteFile(dp.filePath, bytes, filePermissions)
+	err = os.WriteFile(dp.filePath, bytes, filePermissions)
 	return err
 }

bluemix/trace/trace_test.go

@@ -3,7 +3,6 @@ package trace_test
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -100,7 +99,7 @@ func TestStdLogger(t *testing.T) {
 }
 
 func TestFileLogger(t *testing.T) {
-	f, err := ioutil.TempFile("", "")
+	f, err := os.CreateTemp("", "")
 	assert.NoError(t, err)
 
 	defer f.Close()
@@ -111,14 +110,14 @@ func TestFileLogger(t *testing.T) {
 	logger.Printf("test %d", 100)
 	logger.Println("testln")
 
-	buf, err := ioutil.ReadAll(f)
+	buf, err := io.ReadAll(f)
 	assert.NoError(t, err)
 
 	assert.Equal(t, "test\ntest 100\ntestln\n", string(buf))
 }
 
 func TestPrinterCloser(t *testing.T) {
-	f, err := ioutil.TempFile("", "")
+	f, err := os.CreateTemp("", "")
 	assert.NoError(t, err)
 
 	defer os.RemoveAll(f.Name())
@@ -128,7 +127,7 @@ func TestPrinterCloser(t *testing.T) {
 	logger.Printf("test %d", 100)
 	logger.Println("testln")
 
-	buf, err := ioutil.ReadAll(f)
+	buf, err := io.ReadAll(f)
 	assert.NoError(t, err)
 
 	assert.Equal(t, "test\ntest 100\ntestln\n", string(buf))

bluemix/version.go

@@ -3,7 +3,7 @@ package bluemix
 import "fmt"
 
 // Version is the SDK version
-var Version = VersionType{Major: 1, Minor: 10, Build: 2}
+var Version = VersionType{Major: 1, Minor: 10, Build: 3}
 
 // VersionType describe version info
 type VersionType struct {

common/downloader/file_downloader_test.go

@@ -2,7 +2,6 @@ package downloader
 
 import (
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -25,7 +24,7 @@ func TestDownloadTestSuite(t *testing.T) {
 }
 
 func (suite *DownloadTestSuite) SetupTest() {
-	tmpDir, err := ioutil.TempDir("", "testfiledownload")
+	tmpDir, err := os.MkdirTemp("", "testfiledownload")
 	suite.NoError(err)
 	suite.downloader = New(tmpDir)
 }

common/file_helpers/file.go

@@ -4,7 +4,6 @@ package file_helpers
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 )
@@ -90,7 +89,7 @@ func CopyDir(src string, dest string) (err error) {
 		return
 	}
 
-	entries, err := ioutil.ReadDir(src)
+	entries, err := os.ReadDir(src)
 	if err != nil {
 		return
 	}
@@ -99,7 +98,7 @@ func CopyDir(src string, dest string) (err error) {
 		srcPath := filepath.Join(src, entry.Name())
 		destPath := filepath.Join(dest, entry.Name())
 
-		if entry.Mode().IsDir() {
+		if entry.IsDir() {
 			err = CopyDir(srcPath, destPath)
 		} else {
 			err = CopyFile(srcPath, destPath)

common/rest/client.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 
 	"gopkg.in/yaml.v2"
@@ -76,7 +75,7 @@ func (c *Client) DoWithContext(ctx context.Context, r *Request, respV interface{
 	}()
 
 	if resp.StatusCode < 200 || resp.StatusCode > 299 {
-		raw, err := ioutil.ReadAll(resp.Body)
+		raw, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return resp, fmt.Errorf("Error reading response: %v", err)
 		}

common/rest/client_test.go

@@ -3,9 +3,9 @@ package rest
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -205,12 +205,12 @@ func TestDownloadFile(t *testing.T) {
 	ts := httptest.NewServer(serveHandler(200, "abcedefg"))
 	defer ts.Close()
 
-	f, err := ioutil.TempFile("", "BluemixCliRestTest")
+	f, err := os.CreateTemp("", "BluemixCliRestTest")
 	assert.NoError(err)
 	defer f.Close()
 
 	_, err = NewClient().Do(GetRequest(ts.URL), f, nil)
 	assert.NoError(err)
-	bytes, _ := ioutil.ReadFile(f.Name())
+	bytes, _ := os.ReadFile(f.Name())
 	assert.Equal("abcedefg", string(bytes))
 }