Merge pull request #1986 from sonasingh46/ifshort_linter

chore(golangci-lint): add ifshort linter

Author: k8s-ci-robot

.golangci.yml

@@ -25,6 +25,7 @@ linters:
     - gosec
     - gosimple
     - govet
+    - ifshort
     - importas
     - ineffassign
     - misspell

api/v1beta1/azuremachine_default.go

@@ -28,16 +28,14 @@ import (
 
 // SetDefaultSSHPublicKey sets the default SSHPublicKey for an AzureMachine.
 func (s *AzureMachineSpec) SetDefaultSSHPublicKey() error {
-	sshKeyData := s.SSHPublicKey
-	if sshKeyData == "" {
+	if sshKeyData := s.SSHPublicKey; sshKeyData == "" {
 		_, publicRsaKey, err := utilSSH.GenerateSSHKey()
 		if err != nil {
 			return err
 		}
 
 		s.SSHPublicKey = base64.StdEncoding.EncodeToString(ssh.MarshalAuthorizedKey(publicRsaKey))
 	}
-
 	return nil
 }
 
@@ -86,8 +84,7 @@ func (s *AzureMachineSpec) SetIdentityDefaults() {
 
 // SetDefaults sets to the defaults for the AzureMachineSpec.
 func (s *AzureMachineSpec) SetDefaults() {
-	err := s.SetDefaultSSHPublicKey()
-	if err != nil {
+	if err := s.SetDefaultSSHPublicKey(); err != nil {
 		ctrl.Log.WithName("SetDefault").Error(err, "SetDefaultSshPublicKey failed")
 	}
 	s.SetDefaultCachingType()

azure/scope/identity.go

@@ -200,8 +200,8 @@ func (p *AzureCredentialsProvider) GetClientSecret(ctx context.Context) (string,
 		Name:      secretRef.Name,
 	}
 	secret := &corev1.Secret{}
-	err := p.Client.Get(ctx, key, secret)
-	if err != nil {
+
+	if err := p.Client.Get(ctx, key, secret); err != nil {
 		return "", errors.Wrap(err, "Unable to fetch ClientSecret")
 	}
 	return string(secret.Data[azureSecretKey]), nil

azure/services/agentpools/agentpools.go

@@ -94,8 +94,8 @@ func (s *Service) Reconcile(ctx context.Context) error {
 	// cluster, normalized to reflect the input we originally provided.
 	// AKS will populate defaults and read-only values, which we want
 	// to strip/clean to match what we expect.
-	isCreate := azure.ResourceNotFound(err)
-	if isCreate {
+
+	if isCreate := azure.ResourceNotFound(err); isCreate {
 		err = s.Client.CreateOrUpdate(ctx, agentPoolSpec.ResourceGroup, agentPoolSpec.Cluster, agentPoolSpec.Name, profile)
 		if err != nil && azure.ResourceNotFound(err) {
 			return azure.WithTransientError(errors.Wrap(err, "agent pool dependent resource does not exist yet"), 20*time.Second)

azure/services/availabilitysets/availabilitysets.go

@@ -65,9 +65,8 @@ func (s *Service) Reconcile(ctx context.Context) error {
 	ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultAzureServiceReconcileTimeout)
 	defer cancel()
 
-	setSpec := s.Scope.AvailabilitySetSpec()
 	var err error
-	if setSpec != nil {
+	if setSpec := s.Scope.AvailabilitySetSpec(); setSpec != nil {
 		_, err = s.CreateResource(ctx, setSpec, serviceName)
 	} else {
 		log.V(2).Info("skip creation when no availability set spec is found")
@@ -85,9 +84,8 @@ func (s *Service) Delete(ctx context.Context) error {
 	ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultAzureServiceReconcileTimeout)
 	defer cancel()
 
-	setSpec := s.Scope.AvailabilitySetSpec()
 	var resultingErr error
-	if setSpec == nil {
+	if setSpec := s.Scope.AvailabilitySetSpec(); setSpec == nil {
 		log.V(2).Info("skip deletion when no availability set spec is found")
 	} else {
 		existingSet, err := s.Client.Get(ctx, setSpec)

exp/api/v1beta1/azuremachinepool_default.go

@@ -28,16 +28,14 @@ import (
 
 // SetDefaultSSHPublicKey sets the default SSHPublicKey for an AzureMachinePool.
 func (amp *AzureMachinePool) SetDefaultSSHPublicKey() error {
-	sshKeyData := amp.Spec.Template.SSHPublicKey
-	if sshKeyData == "" {
+	if sshKeyData := amp.Spec.Template.SSHPublicKey; sshKeyData == "" {
 		_, publicRsaKey, err := utilSSH.GenerateSSHKey()
 		if err != nil {
 			return err
 		}
 
 		amp.Spec.Template.SSHPublicKey = base64.StdEncoding.EncodeToString(ssh.MarshalAuthorizedKey(publicRsaKey))
 	}
-
 	return nil
 }
 

exp/api/v1beta1/azuremachinepool_webhook.go

@@ -43,8 +43,7 @@ var _ webhook.Defaulter = &AzureMachinePool{}
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type.
 func (amp *AzureMachinePool) Default() {
-	err := amp.SetDefaultSSHPublicKey()
-	if err != nil {
+	if err := amp.SetDefaultSSHPublicKey(); err != nil {
 		ctrl.Log.WithName("AzureMachinePoolLogger").Error(err, "SetDefaultSshPublicKey failed")
 	}
 	amp.SetIdentityDefaults()

exp/api/v1beta1/azuremanagedcontrolplane_default.go

@@ -34,8 +34,7 @@ const (
 
 // setDefaultSSHPublicKey sets the default SSHPublicKey for an AzureManagedControlPlane.
 func (r *AzureManagedControlPlane) setDefaultSSHPublicKey() error {
-	sshKeyData := r.Spec.SSHPublicKey
-	if sshKeyData == "" {
+	if sshKeyData := r.Spec.SSHPublicKey; sshKeyData == "" {
 		_, publicRsaKey, err := utilSSH.GenerateSSHKey()
 		if err != nil {
 			return err

exp/api/v1beta1/azuremanagedcontrolplane_webhook.go

@@ -65,8 +65,7 @@ func (r *AzureManagedControlPlane) Default() {
 		r.Spec.Version = normalizedVersion
 	}
 
-	err := r.setDefaultSSHPublicKey()
-	if err != nil {
+	if err := r.setDefaultSSHPublicKey(); err != nil {
 		ctrl.Log.WithName("AzureManagedControlPlaneWebHookLogger").Error(err, "SetDefaultSshPublicKey failed")
 	}
 

util/tele/corr_id.go

@@ -50,8 +50,7 @@ type CorrID string
 //	fmt.Println("new corr ID: ", newCorrID)
 //	doSomething(ctx)
 func ctxWithCorrID(ctx context.Context) (context.Context, CorrID) {
-	currentCorrIDIface := ctx.Value(CorrIDKeyVal)
-	if currentCorrIDIface != nil {
+	if currentCorrIDIface := ctx.Value(CorrIDKeyVal); currentCorrIDIface != nil {
 		currentCorrID, ok := currentCorrIDIface.(CorrID)
 		if ok {
 			return ctx, currentCorrID