Merge pull request #565 from atombrella/feature/switch_case

Staticcheck/QF1003: Replace if-else with switch-case for OSType checks.

Author: tanmay-hc

builder/azure/arm/config.go

@@ -1575,15 +1575,16 @@ func assertRequiredParametersSet(c *Config, errs *packersdk.MultiError) {
 	if c.LicenseType != "" {
 		// Assumes OS is case-sensitive match as it has already been
 		// normalized earlier in function
-		if c.OSType == constants.Target_Linux {
+		switch c.OSType {
+		case constants.Target_Linux:
 			if strings.EqualFold(c.LicenseType, constants.License_RHEL) {
 				c.LicenseType = constants.License_RHEL
 			} else if strings.EqualFold(c.LicenseType, constants.License_SUSE) {
 				c.LicenseType = constants.License_SUSE
 			} else {
 				errs = packersdk.MultiErrorAppend(errs, fmt.Errorf("The license_type %q is invalid for Linux, only RHEL_BYOS or SLES_BYOS are supported", c.LicenseType))
 			}
-		} else if c.OSType == constants.Target_Windows {
+		case constants.Target_Windows:
 			if strings.EqualFold(c.LicenseType, constants.License_Windows_Client) {
 				c.LicenseType = constants.License_Windows_Client
 			} else if strings.EqualFold(c.LicenseType, constants.License_Windows_Server) {
@@ -1774,7 +1775,6 @@ func (c *Config) validateLocationZoneResiliency(say func(s string)) {
 	zones["switzerlandnorth"] = struct{}{}
 	zones["uksouth"] = struct{}{}
 	zones["usgovvirginia"] = struct{}{}
-	zones["westeurope"] = struct{}{}
 	zones["westus2"] = struct{}{}
 	zones["westus3"] = struct{}{}
 

builder/azure/chroot/step_verify_shared_image_source_test.go

@@ -130,8 +130,8 @@ func TestStepVerifySharedImageSource_Run(t *testing.T) {
 					if !tt.shouldCallGetVersion {
 						t.Fatalf("Expected test to not call getVersion but it did")
 					}
-					switch {
-					case id.VersionName == "1.2.3":
+					switch id.VersionName {
+					case "1.2.3":
 						return &galleryimageversions.GalleryImageVersion{
 							Id: common.StringPtr("image-version-id"),
 							Properties: &galleryimageversions.GalleryImageVersionProperties{

builder/azure/dtl/builder.go

@@ -194,7 +194,8 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 		ui.Say(fmt.Sprintf("No lab network information provided. Using %s Virtual network and %s subnet for Virtual Machine creation", b.config.LabVirtualNetworkName, b.config.LabSubnetName))
 	}
 
-	if b.config.OSType == constants.Target_Linux {
+	switch b.config.OSType {
+	case constants.Target_Linux:
 		steps = []multistep.Step{
 			NewStepDeployTemplate(azureClient, ui, &b.config, deploymentName, GetVirtualMachineDeployment),
 			&communicator.StepConnectSSH{
@@ -208,7 +209,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 			},
 			NewStepPowerOffCompute(azureClient, ui, &b.config),
 		}
-	} else if b.config.OSType == constants.Target_Windows {
+	case constants.Target_Windows:
 		steps = []multistep.Step{
 			NewStepDeployTemplate(azureClient, ui, &b.config, deploymentName, GetVirtualMachineDeployment),
 			&StepSaveWinRMPassword{
@@ -230,7 +231,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 			&commonsteps.StepProvision{},
 			NewStepPowerOffCompute(azureClient, ui, &b.config),
 		}
-	} else {
+	default:
 		return nil, fmt.Errorf("Builder does not support the os_type '%s'", b.config.OSType)
 	}
 

builder/azure/dtl/step_capture_image.go

@@ -48,7 +48,8 @@ func (s *StepCaptureImage) captureImageFromVM(ctx context.Context) error {
 
 	customImageProperties := customimages.CustomImageProperties{}
 
-	if s.config.OSType == constants.Target_Linux {
+	switch s.config.OSType {
+	case constants.Target_Linux:
 		deprovision := customimages.LinuxOsStateDeprovisionRequested
 		if s.config.SkipSysprep {
 			deprovision = customimages.LinuxOsStateDeprovisionApplied
@@ -61,7 +62,7 @@ func (s *StepCaptureImage) captureImageFromVM(ctx context.Context) error {
 				SourceVMId: &imageID,
 			},
 		}
-	} else if s.config.OSType == constants.Target_Windows {
+	case constants.Target_Windows:
 		deprovision := customimages.WindowsOsStateSysprepRequested
 		if s.config.SkipSysprep {
 			deprovision = customimages.WindowsOsStateSysprepApplied