Merge pull request #8191 from Aresforchina/fix-staticcheck-pkg-resour…

…ces01 fix staticcheck failures in pkg/resources
kubernetes · Dec 25, 2019 · 22ddc3b · 22ddc3b
2 parents 5cb2d36 + 8ebcea0
commit 22ddc3b
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 36 deletions.
diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
@@ -2,11 +2,9 @@ cloudmock/aws/mockelbv2
 cmd/kops
 node-authorizer/pkg/authorizers/aws
 node-authorizer/pkg/server
-pkg/resources/ali
 pkg/resources/digitalocean
 pkg/resources/digitalocean/dns
 pkg/resources/openstack
-pkg/sshcredentials
 upup/pkg/fi
 upup/pkg/fi/cloudup
 upup/pkg/fi/cloudup/awstasks

diff --git a/pkg/resources/ali/ali.go b/pkg/resources/ali/ali.go
@@ -59,9 +59,6 @@ type clusterDiscoveryALI struct {
 }
 
 func ListResourcesALI(aliCloud aliup.ALICloud, clusterName string, region string) (map[string]*resources.Resource, error) {
-	if region == "" {
-		region = aliCloud.Region()
-	}
 
 	resources := make(map[string]*resources.Resource)
 
@@ -412,8 +409,6 @@ func (d *clusterDiscoveryALI) ListRam() ([]*resources.Resource, error) {
 		"bastions-" + clusterName,
 	}
 
-	roleToDelete := []string{}
-
 	response, err := d.aliCloud.RamClient().ListRoles()
 	if err != nil {
 		return nil, fmt.Errorf("err listing RamRole:%v", err)
@@ -424,7 +419,6 @@ func (d *clusterDiscoveryALI) ListRam() ([]*resources.Resource, error) {
 		for _, role := range response.Roles.Role {
 			for _, roleName := range names {
 				if role.RoleName == roleName {
-					roleToDelete = append(roleToDelete, role.RoleId)
 					resourceTracker := &resources.Resource{
 						Name:    role.RoleName,
 						ID:      role.RoleId,

diff --git a/pkg/sshcredentials/BUILD.bazel b/pkg/sshcredentials/BUILD.bazel
@@ -5,8 +5,5 @@ go_library(
     srcs = ["fingerprint.go"],
     importpath = "k8s.io/kops/pkg/sshcredentials",
     visibility = ["//visibility:public"],
-    deps = [
-        "//vendor/golang.org/x/crypto/ssh:go_default_library",
-        "//vendor/k8s.io/klog:go_default_library",
-    ],
+    deps = ["//vendor/golang.org/x/crypto/ssh:go_default_library"],
 )
diff --git a/pkg/sshcredentials/fingerprint.go b/pkg/sshcredentials/fingerprint.go
@@ -22,7 +22,6 @@ import (
 	"fmt"
 
 	"golang.org/x/crypto/ssh"
-	"k8s.io/klog"
 )
 
 func Fingerprint(pubkey string) (string, error) {
@@ -53,26 +52,3 @@ func formatFingerprint(data []byte) string {
 	}
 	return buf.String()
 }
-
-func insertFingerprintColons(id string) string {
-	remaining := id
-
-	var buf bytes.Buffer
-	for {
-		if remaining == "" {
-			break
-		}
-		if buf.Len() != 0 {
-			buf.WriteString(":")
-		}
-		if len(remaining) < 2 {
-			klog.Warningf("unexpected format for SSH public key id: %q", id)
-			buf.WriteString(remaining)
-			break
-		} else {
-			buf.WriteString(remaining[0:2])
-			remaining = remaining[2:]
-		}
-	}
-	return buf.String()
-}