Merge pull request #8529 from barbacbd/minor-changes-for-linter

no-jira: Minor updates to fix linting issues.

Author: openshift-merge-bot[bot]

pkg/agent/cluster.go

@@ -281,7 +281,6 @@ func (czero *Cluster) MonitorStatusFromAssistedService() (bool, error) {
 	validationsErr := checkValidations(clusterMetadata, czero.installHistory.ValidationResults, logrus.StandardLogger(), logPrefix)
 	if validationsErr != nil {
 		return false, errors.Wrap(validationsErr, "host validations failed")
-
 	}
 
 	// Print most recent event associated with the clusterInfraEnvID

pkg/asset/agent/image/ignition_test.go

@@ -91,7 +91,7 @@ func TestIgnition_getTemplateData(t *testing.T) {
 	clusterName := "test-agent-cluster-install.test"
 
 	privateKey := "-----BEGIN EC PUBLIC KEY-----\nMFkwEwYHKoAiDHV4tg==\n-----END EC PUBLIC KEY-----\n"
-	publicKey := "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIOSCfDNmx0qe6dncV4tg==\n-----END EC PRIVATE KEY-----\n"
+	publicKey := "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIOSCfDNmx0qe6dncV4tg==\n-----END EC PRIVATE KEY-----\n" //nolint:gosec
 
 	templateData := getTemplateData(clusterName, pullSecret, releaseImageList, releaseImage, releaseImageMirror, haveMirrorConfig, publicContainerRegistries, agentClusterInstall.Spec.ProvisionRequirements.ControlPlaneAgents, agentClusterInstall.Spec.ProvisionRequirements.WorkerAgents, infraEnvID, osImage, proxy, "minimal-iso", privateKey, publicKey, "")
 	assert.Equal(t, clusterName, templateData.ClusterName)

pkg/asset/manifests/aws/zones_test.go

@@ -87,15 +87,15 @@ func stubInstallConfigPoolControl() *types.MachinePool {
 }
 
 func tSortCapaSubnetsByID(in capa.Subnets) capa.Subnets {
-	subnetIds := []string{}
+	subnetIDs := []string{}
 	subnetsMap := make(map[string]capa.SubnetSpec, len(in))
 	for _, subnet := range in {
 		subnetsMap[subnet.ID] = subnet
-		subnetIds = append(subnetIds, subnet.ID)
+		subnetIDs = append(subnetIDs, subnet.ID)
 	}
-	sort.Strings(subnetIds)
+	sort.Strings(subnetIDs)
 	out := capa.Subnets{}
-	for _, sid := range subnetIds {
+	for _, sid := range subnetIDs {
 		out = append(out, subnetsMap[sid])
 	}
 	return out