From 66ad6f34831dce11ff49e884f6cc05f690f2605e Mon Sep 17 00:00:00 2001 From: Wilken Rivera Date: Wed, 11 Mar 2020 05:29:22 -0400 Subject: [PATCH] builders: Fix gosimple S1007 linting issue (#8871) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Results before change ``` ⇶ golangci-lint run ./... --disable-all --enable=gosimple | grep 1007 builder/alicloud/ecs/image_config.go:208:9: S1007: should use raw string post-processor/vsphere-template/step_mark_as_template.go:130:8: S1007: shape twice (gosimple) builder/azure/arm/config.go:58:27: S1007: should use raw string (`...`) builder/azure/arm/config.go:59:27: S1007: should use raw string (`...`) builder/qemu/driver.go:192:15: S1007: should use raw string (`...`) ``` Results after change ``` ⇶ golangci-lint run ./... --disable-all --enable=gosimple | grep 1007 ``` --- builder/alicloud/ecs/image_config.go | 2 +- builder/azure/arm/config.go | 8 ++++---- builder/qemu/driver.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/builder/alicloud/ecs/image_config.go b/builder/alicloud/ecs/image_config.go index 517d345de..a7e5f008c 100644 --- a/builder/alicloud/ecs/image_config.go +++ b/builder/alicloud/ecs/image_config.go @@ -205,7 +205,7 @@ func (c *AlicloudImageConfig) Prepare(ctx *interpolate.Context) []error { strings.HasPrefix(c.AlicloudImageName, "https://") { errs = append(errs, fmt.Errorf("image_name can't start with 'http://' or 'https://'")) } - reg := regexp.MustCompile("\\s+") + reg := regexp.MustCompile(`\s+`) if reg.FindString(c.AlicloudImageName) != "" { errs = append(errs, fmt.Errorf("image_name can't include spaces")) } diff --git a/builder/azure/arm/config.go b/builder/azure/arm/config.go index 4a8e80cfb..85b4b0290 100644 --- a/builder/azure/arm/config.go +++ b/builder/azure/arm/config.go @@ -55,12 +55,12 @@ const ( ) var ( - reCaptureContainerName = regexp.MustCompile("^[a-z0-9][a-z0-9\\-]{2,62}$") - reCaptureNamePrefix = regexp.MustCompile("^[A-Za-z0-9][A-Za-z0-9_\\-\\.]{0,23}$") + reCaptureContainerName = regexp.MustCompile(`^[a-z0-9][a-z0-9\-]{2,62}$`) + reCaptureNamePrefix = regexp.MustCompile(`^[A-Za-z0-9][A-Za-z0-9_\-\.]{0,23}$`) reManagedDiskName = regexp.MustCompile(validManagedDiskName) reResourceGroupName = regexp.MustCompile(validResourceGroupNameRe) - reSnapshotName = regexp.MustCompile("^[A-Za-z0-9_]{1,79}$") - reSnapshotPrefix = regexp.MustCompile("^[A-Za-z0-9_]{1,59}$") + reSnapshotName = regexp.MustCompile(`^[A-Za-z0-9_]{1,79}$`) + reSnapshotPrefix = regexp.MustCompile(`^[A-Za-z0-9_]{1,59}$`) ) type PlanInformation struct { diff --git a/builder/qemu/driver.go b/builder/qemu/driver.go index eb1992ba6..000c0b915 100644 --- a/builder/qemu/driver.go +++ b/builder/qemu/driver.go @@ -189,7 +189,7 @@ func (d *QemuDriver) Version() (string, error) { versionOutput := strings.TrimSpace(stdout.String()) log.Printf("Qemu --version output: %s", versionOutput) - versionRe := regexp.MustCompile("[\\.[0-9]+]*") + versionRe := regexp.MustCompile(`[\.[0-9]+]*`) matches := versionRe.FindStringSubmatch(versionOutput) if len(matches) == 0 { return "", fmt.Errorf("No version found: %s", versionOutput)