Merge branch 'v2.9' into feat/add-username-flag

Author: Billy

.github/workflows/ci.yml

@@ -0,0 +1,50 @@
+name: CI
+
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v3
+
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.22'
+        cache: false
+
+    - name: Lint
+      uses: golangci/golangci-lint-action@v4
+
+    - name: Test
+      run: go test -v ./...
+
+    - name: Build
+      run: make build
+
+  fossa:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write # needed for the Vault authentication
+
+    steps:
+      - name: Load Secrets from Vault
+        uses: rancher-eio/read-vault-secrets@main
+        with:
+          secrets: |
+            secret/data/github/repo/${{ github.repository }}/fossa/credentials token | FOSSA
+
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+
+      - name: Check FOSSA compliance
+        uses: fossas/fossa-action@main
+        with:
+          api-key: ${{ env.FOSSA }}

.github/workflows/release.yml

@@ -0,0 +1,31 @@
+name: Release
+
+on:
+  workflow_dispatch:
+  push:
+    tags:        
+      - v*
+
+jobs:
+  release:
+    permissions:
+      contents: read
+      id-token: write # needed for the Vault authentication
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Load Secrets from Vault
+      uses: rancher-eio/read-vault-secrets@main
+      with:
+        secrets: |
+          secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials username | DOCKER_USERNAME ;
+          secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials password | DOCKER_PASSWORD ;
+
+    - name: Checkout Repo
+      uses: actions/checkout@v3
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ env.DOCKER_USERNAME }}
+        password: ${{ env.DOCKER_PASSWORD }}

.golangci.json

@@ -1,12 +1,4 @@
 {
-    "linters": {
-        "disable-all": true,
-        "enable": [
-            "govet",
-            "golint",
-            "goimports"
-        ]
-    },
     "run": {
         "timeout": "10m"
     }

Dockerfile.dapper

@@ -1,8 +1,8 @@
-FROM registry.suse.com/bci/golang:1.20
+FROM registry.suse.com/bci/golang:1.22
 
 RUN zypper -n install docker rsync xz zip
 
-ENV GOLANGCI_LINT v1.53.3
+ENV GOLANGCI_LINT v1.57.1
 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin "$GOLANGCI_LINT"
 
 ENV DAPPER_SOURCE /go/src/github.com/rancher/cli

cmd/app.go

@@ -5,7 +5,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@@ -799,7 +798,7 @@ func walkTemplateDirectory(templatePath string) (string, map[string]string, erro
 			return nil
 		}
 		version := &chartVersion{}
-		content, err := ioutil.ReadFile(path)
+		content, err := os.ReadFile(path)
 		if err != nil {
 			return err
 		}
@@ -816,7 +815,7 @@ func walkTemplateDirectory(templatePath string) (string, map[string]string, erro
 			if info.IsDir() {
 				return nil
 			}
-			content, err := ioutil.ReadFile(path)
+			content, err := os.ReadFile(path)
 			if err != nil {
 				return err
 			}
@@ -1254,7 +1253,7 @@ func parseAnswersFile(location string, answers map[string]string) error {
 }
 
 func parseFile(location string) (map[string]interface{}, error) {
-	bytes, err := ioutil.ReadFile(location)
+	bytes, err := os.ReadFile(location)
 	if err != nil {
 		return nil, err
 	}

cmd/cluster.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -255,9 +256,14 @@ func clusterCreate(ctx *cli.Context) error {
 		return err
 	}
 
-	if ctx.String("k8s-version") != "" {
-		k8sVersions := getClusterK8sOptions(c)
-		if ok := findStringInArray(ctx.String("k8s-version"), k8sVersions); !ok {
+	k8sVersion := ctx.String("k8s-version")
+	if k8sVersion != "" {
+		k8sVersions, err := getClusterK8sOptions(c)
+		if err != nil {
+			return err
+		}
+
+		if slices.Contains(k8sVersions, k8sVersion) {
 			fmt.Println("Available Kubernetes versions:")
 			for _, val := range k8sVersions {
 				fmt.Println(val)
@@ -742,16 +748,24 @@ func getClusterPods(cluster managementClient.Cluster) string {
 	return cluster.Requested["pods"] + "/" + cluster.Allocatable["pods"]
 }
 
-func getClusterK8sOptions(c *cliclient.MasterClient) []string {
+func getClusterK8sOptions(c *cliclient.MasterClient) ([]string, error) {
 	var options []string
-	setting, _ := c.ManagementClient.Setting.ByID("k8s-version-to-images")
+
+	setting, err := c.ManagementClient.Setting.ByID("k8s-version-to-images")
+	if err != nil {
+		return nil, err
+	}
+
 	var objmap map[string]*json.RawMessage
+	err = json.Unmarshal([]byte(setting.Value), &objmap)
+	if err != nil {
+		return nil, err
+	}
 
-	json.Unmarshal([]byte(setting.Value), &objmap)
 	for key := range objmap {
 		options = append(options, key)
 	}
-	return options
+	return options, nil
 }
 
 func getClusterConfig(ctx *cli.Context) (*managementClient.Cluster, error) {

cmd/common.go

@@ -3,12 +3,10 @@ package cmd
 import (
 	"bufio"
 	"bytes"
-	"context"
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"net/url"
 	"os"
@@ -22,7 +20,6 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/docker/docker/pkg/namesgenerator"
 	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
 	"github.com/rancher/cli/cliclient"
@@ -33,6 +30,8 @@ import (
 	managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 	"k8s.io/client-go/tools/clientcmd/api"
 )
 
@@ -43,7 +42,6 @@ const (
 )
 
 var (
-	errNoURL = errors.New("RANCHER_URL environment or --Url is not set, run `login`")
 	// ManagementResourceTypes lists the types we use the management client for
 	ManagementResourceTypes = []string{"cluster", "node", "project"}
 	// ProjectResourceTypes lists the types we use the cluster client for
@@ -151,7 +149,7 @@ func getKubeConfigForUser(ctx *cli.Context, user string) (*api.Config, error) {
 	}
 
 	focusedServer := cf.FocusedServer()
-	kubeConfig, _ := focusedServer.KubeConfigs[fmt.Sprintf(kubeConfigKeyFormat, user, focusedServer.FocusedCluster())]
+	kubeConfig := focusedServer.KubeConfigs[fmt.Sprintf(kubeConfigKeyFormat, user, focusedServer.FocusedCluster())]
 	return kubeConfig, nil
 }
 
@@ -230,7 +228,7 @@ func getRancherServerVersion(c *cliclient.MasterClient) (string, error) {
 }
 
 func loadAndVerifyCert(path string) (string, error) {
-	caCert, err := ioutil.ReadFile(path)
+	caCert, err := os.ReadFile(path)
 	if err != nil {
 		return "", err
 	}
@@ -301,21 +299,21 @@ func GetClient(ctx *cli.Context) (*cliclient.MasterClient, error) {
 func GetResourceType(c *cliclient.MasterClient, resource string) (string, error) {
 	if c.ManagementClient != nil {
 		for key := range c.ManagementClient.APIBaseClient.Types {
-			if strings.ToLower(key) == strings.ToLower(resource) {
+			if strings.EqualFold(key, resource) {
 				return key, nil
 			}
 		}
 	}
 	if c.ProjectClient != nil {
 		for key := range c.ProjectClient.APIBaseClient.Types {
-			if strings.ToLower(key) == strings.ToLower(resource) {
+			if strings.EqualFold(key, resource) {
 				return key, nil
 			}
 		}
 	}
 	if c.ClusterClient != nil {
 		for key := range c.ClusterClient.APIBaseClient.Types {
-			if strings.ToLower(key) == strings.ToLower(resource) {
+			if strings.EqualFold(key, resource) {
 				return key, nil
 			}
 		}
@@ -417,13 +415,8 @@ func Lookup(c *cliclient.MasterClient, name string, types ...string) (*ntypes.Re
 	return byName, nil
 }
 
-func RandomName() string {
-	return strings.Replace(namesgenerator.GetRandomName(0), "_", "-", -1)
-}
-
 // RandomLetters returns a string with random letters of length n
 func RandomLetters(n int) string {
-	rand.Seed(time.Now().UnixNano())
 	b := make([]byte, n)
 	for i := range b {
 		b[i] = letters[rand.Intn(len(letters))]
@@ -461,8 +454,7 @@ func SimpleFormat(values [][]string) (string, string) {
 func defaultAction(fn func(ctx *cli.Context) error) func(ctx *cli.Context) error {
 	return func(ctx *cli.Context) error {
 		if ctx.Bool("help") {
-			cli.ShowAppHelp(ctx)
-			return nil
+			return cli.ShowAppHelp(ctx)
 		}
 		return fn(ctx)
 	}
@@ -519,14 +511,6 @@ func SplitOnColon(s string) []string {
 	return strings.Split(s, ":")
 }
 
-func parseClusterAndProjectName(name string) (string, string, error) {
-	parts := strings.SplitN(name, "/", 2)
-	if len(parts) == 2 {
-		return parts[0], parts[1], nil
-	}
-	return "", "", fmt.Errorf("Unable to extract clustername and projectname from [%s]", name)
-}
-
 func parseClusterAndProjectID(id string) (string, string, error) {
 	// Validate id
 	// Examples:
@@ -543,7 +527,7 @@ func parseClusterAndProjectID(id string) (string, string, error) {
 
 // Return a JSON blob of the file at path
 func readFileReturnJSON(path string) ([]byte, error) {
-	file, err := ioutil.ReadFile(path)
+	file, err := os.ReadFile(path)
 	if err != nil {
 		return []byte{}, err
 	}
@@ -577,21 +561,6 @@ func hasPrefix(buf []byte, prefix []byte) bool {
 	return bytes.HasPrefix(trim, prefix)
 }
 
-func settingsToMap(client *cliclient.MasterClient) (map[string]string, error) {
-	configMap := make(map[string]string)
-
-	settings, err := client.ManagementClient.Setting.List(baseListOpts())
-	if err != nil {
-		return nil, err
-	}
-
-	for _, setting := range settings.Data {
-		configMap[setting.Name] = setting.Value
-	}
-
-	return configMap, nil
-}
-
 // getClusterNames maps cluster ID to name and defaults to ID if name is blank
 func getClusterNames(ctx *cli.Context, c *cliclient.MasterClient) (map[string]string, error) {
 	clusterNames := make(map[string]string)
@@ -617,15 +586,6 @@ func getClusterName(cluster *managementClient.Cluster) string {
 	return cluster.ID
 }
 
-func findStringInArray(s string, a []string) bool {
-	for _, val := range a {
-		if s == val {
-			return true
-		}
-	}
-	return false
-}
-
 func createdTimetoHuman(t string) (string, error) {
 	parsedTime, err := time.Parse(time.RFC3339, t)
 	if err != nil {
@@ -652,9 +612,11 @@ func outputMembers(ctx *cli.Context, c *cliclient.MasterClient, members []manage
 		if err != nil {
 			return err
 		}
+
+		memberType := fmt.Sprintf("%s %s", principal.Provider, principal.PrincipalType)
 		writer.Write(&MemberData{
 			Name:       principal.Name,
-			MemberType: strings.Title(fmt.Sprintf("%s %s", principal.Provider, principal.PrincipalType)),
+			MemberType: cases.Title(language.Und).String(memberType),
 			AccessType: m.AccessType,
 		})
 	}
@@ -699,15 +661,6 @@ func deleteMembersByNames(ctx *cli.Context, c *cliclient.MasterClient, members [
 	return members, nil
 }
 
-func tickerContext(ctx context.Context, duration time.Duration) <-chan time.Time {
-	ticker := time.NewTicker(duration)
-	go func() {
-		<-ctx.Done()
-		ticker.Stop()
-	}()
-	return ticker.C
-}
-
 func ConfigDir() (string, error) {
 	homeDir, err := os.UserHomeDir()
 	if err != nil {