Satisfy golangci-lint and fix tests

(cherry picked from commit 5b63815)
rancher · Feb 9, 2024 · 55a860e · 55a860e
1 parent b61a859
commit 55a860e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/controller/eks-cluster-config-handler.go b/controller/eks-cluster-config-handler.go
@@ -634,16 +634,16 @@ func (h *Handler) generateAndSetNetworking(config *eksv1.EKSClusterConfig, awsSV
 		}
 
 		virtualNetworkString := getParameterValueFromOutput("VpcId", stack.Stacks[0].Outputs)
-		subnetIdsString := getParameterValueFromOutput("SubnetIds", stack.Stacks[0].Outputs)
+		subnetIDsString := getParameterValueFromOutput("SubnetIds", stack.Stacks[0].Outputs)
 
-		if subnetIdsString == "" {
+		if subnetIDsString == "" {
 			return config, fmt.Errorf("no subnet ids were returned")
 		}
 
 		config = config.DeepCopy()
 		// copy generated field to status
 		config.Status.VirtualNetwork = virtualNetworkString
-		config.Status.Subnets = strings.Split(subnetIdsString, ",")
+		config.Status.Subnets = strings.Split(subnetIDsString, ",")
 		config.Status.NetworkFieldsSource = "generated"
 	}
 

diff --git a/test/e2e/config/config.go b/test/e2e/config/config.go
@@ -119,15 +119,15 @@ func ReadE2EConfig(configPath string) (*E2EConfig, error) { //nolint:gocyclo
 }
 
 func substituteVersions(config *E2EConfig) error {
-	certManagerURL, err := envsubst.Eval(config.CertManagerChartURL, func(s string) string {
+	certManagerURL, err := envsubst.Eval(config.CertManagerChartURL, func(_ string) string {
 		return config.CertManagerVersion
 	})
 	if err != nil {
 		return fmt.Errorf("failed to substitute cert manager chart url: %w", err)
 	}
 	config.CertManagerChartURL = certManagerURL
 
-	rancherURL, err := envsubst.Eval(config.RancherChartURL, func(s string) string {
+	rancherURL, err := envsubst.Eval(config.RancherChartURL, func(_ string) string {
 		return config.RancherVersion
 	})
 	if err != nil {