cleanup code to cancel some staticcheck warnings

correct versionWithoutV without re-assign to variable

Signed-off-by: Guangming Wang <[email protected]>

upup/pkg/fi/cloudup/apply_cluster.go

@@ -273,9 +273,7 @@ func (c *ApplyClusterCmd) Run() error {
 
 	// Normalize k8s version
 	versionWithoutV := strings.TrimSpace(cluster.Spec.KubernetesVersion)
-	if strings.HasPrefix(versionWithoutV, "v") {
-		versionWithoutV = versionWithoutV[1:]
-	}
+	versionWithoutV = strings.TrimPrefix(versionWithoutV, "v")
 	if cluster.Spec.KubernetesVersion != versionWithoutV {
 		klog.Warningf("Normalizing kubernetes version: %q -> %q", cluster.Spec.KubernetesVersion, versionWithoutV)
 		cluster.Spec.KubernetesVersion = versionWithoutV
@@ -1271,9 +1269,7 @@ func (c *ApplyClusterCmd) BuildNodeUpConfig(assetBuilder *assets.AssetBuilder, i
 	}
 
 	config := &nodeup.Config{}
-	for _, tag := range nodeUpTags.List() {
-		config.Tags = append(config.Tags, tag)
-	}
+	config.Tags = append(config.Tags, nodeUpTags.List()...)
 
 	for _, a := range c.Assets {
 		config.Assets = append(config.Assets, a.CompactString())

upup/pkg/fi/cloudup/awstasks/instance.go

@@ -88,9 +88,7 @@ func (e *Instance) Find(c *fi.Context) (*Instance, error) {
 	instances := []*ec2.Instance{}
 	if response != nil {
 		for _, reservation := range response.Reservations {
-			for _, instance := range reservation.Instances {
-				instances = append(instances, instance)
-			}
+			instances = append(instances, reservation.Instances...)
 		}
 	}