fix-pkg-staticcheck and remove the repeat code

pkg/model/alimodel/convenience.go

@@ -23,16 +23,6 @@ func s(v string) *string {
 	return fi.String(v)
 }
 
-// i64 is a helper that builds a *int64 from an int64 value
-func i64(v int64) *int64 {
-	return fi.Int64(v)
-}
-
-// i32 is a helper that builds a *int32 from an int32 value
-func i32(v int32) *int32 {
-	return fi.Int32(v)
-}
-
 // i is a helper that builds a *int from an int value
 func i(v int) *int {
 	return fi.Int(v)

pkg/model/convenience.go

@@ -29,8 +29,3 @@ func s(v string) *string {
 func i64(v int64) *int64 {
 	return fi.Int64(v)
 }
-
-// i32 is a helper that builds a *int32 from an int32 value
-func i32(v int32) *int32 {
-	return fi.Int32(v)
-}

pkg/model/dns.go

@@ -56,7 +56,7 @@ func (b *DNSModelBuilder) ensureDNSZone(c *fi.ModelBuilderContext) error {
 			dnsZone.PrivateVPC = b.LinkToVPC()
 
 		default:
-			return fmt.Errorf("Unknown DNS type %q", topology.DNS.Type)
+			return fmt.Errorf("unknown DNS type %q", topology.DNS.Type)
 		}
 	}
 

pkg/model/openstackmodel/context.go

@@ -59,7 +59,7 @@ func (c *OpenstackModelContext) findSubnetClusterSpec(subnet string) (string, er
 			return name, nil
 		}
 	}
-	return "", fmt.Errorf("Could not find subnet %s from clusterSpec", subnet)
+	return "", fmt.Errorf("could not find subnet %s from clusterSpec", subnet)
 }
 
 func (c *OpenstackModelContext) findSubnetNameByID(subnetID string, subnetName string) (string, error) {

pkg/model/openstackmodel/convenience.go

@@ -23,11 +23,6 @@ func s(v string) *string {
 	return fi.String(v)
 }
 
-// i64 is a helper that builds a *int64 from an int64 value
-func i64(v int64) *int64 {
-	return fi.Int64(v)
-}
-
 // i32 is a helper that builds a *int32 from an int32 value
 func i32(v int32) *int32 {
 	return fi.Int32(v)

pkg/model/openstackmodel/servergroup.go

@@ -79,13 +79,13 @@ func (b *ServerGroupModelBuilder) buildInstances(c *fi.ModelBuilderContext, sg *
 
 	startupScript, err := b.BootstrapScript.ResourceNodeUp(ig, b.Cluster)
 	if err != nil {
-		return fmt.Errorf("Could not create startup script for instance group %s: %v", ig.Name, err)
+		return fmt.Errorf("could not create startup script for instance group %s: %v", ig.Name, err)
 	}
 	if startupScript != nil {
 		// var userData bytes.Buffer
 		startupStr, err := startupScript.AsString()
 		if err != nil {
-			return fmt.Errorf("Could not create startup script for instance group %s: %v", ig.Name, err)
+			return fmt.Errorf("could not create startup script for instance group %s: %v", ig.Name, err)
 		}
 		igUserData = fi.String(startupStr)
 	}

pkg/nodeidentity/openstack/identify.go

@@ -43,7 +43,7 @@ func New() (nodeidentity.Identifier, error) {
 
 	region := os.Getenv("OS_REGION_NAME")
 	if region == "" {
-		return nil, fmt.Errorf("Unable to find region")
+		return nil, fmt.Errorf("unable to find region")
 	}
 
 	provider, err := openstack.NewClient(env.IdentityEndpoint)
@@ -106,5 +106,5 @@ func (i *nodeIdentifier) getInstanceGroup(instanceID string) (string, error) {
 	if val, ok := instance.Metadata["KopsInstanceGroup"]; ok {
 		return val, nil
 	}
-	return "", fmt.Errorf("Could not find tag 'KopsInstanceGroup' from instance metadata")
+	return "", fmt.Errorf("could not find tag 'KopsInstanceGroup' from instance metadata")
 }

pkg/pki/sshkey.go

@@ -114,7 +114,7 @@ func toDER(pubkey ssh.PublicKey) ([]byte, error) {
 	//	cryptoKey = dsaPublicKey
 
 	default:
-		return nil, fmt.Errorf("Unexpected type of SSH key (%q); AWS can only import RSA keys", typeName)
+		return nil, fmt.Errorf("unexpected type of SSH key (%q); AWS can only import RSA keys", typeName)
 	}
 
 	der, err := x509.MarshalPKIXPublicKey(cryptoKey)