From 3ff88c336f9907e1ffa0b3d38bbbb1afb9e80a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Fri, 14 Feb 2020 10:19:28 +0100 Subject: [PATCH] fix ineffectual assignments found by golangci-lint --- internal/distro/fedora30/distro.go | 2 +- internal/distro/rhel82/distro.go | 3 +-- internal/upload/awsupload/awsupload.go | 3 +++ internal/upload/awsupload/awsupload_test.go | 6 +++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/internal/distro/fedora30/distro.go b/internal/distro/fedora30/distro.go index d72e26b61..062d4b878 100644 --- a/internal/distro/fedora30/distro.go +++ b/internal/distro/fedora30/distro.go @@ -549,7 +549,7 @@ func (r *Fedora30) firewallStageOptions(firewall *blueprint.FirewallCustomizatio func (r *Fedora30) systemdStageOptions(enabledServices, disabledServices []string, s *blueprint.ServicesCustomization) *pipeline.SystemdStageOptions { if s != nil { enabledServices = append(enabledServices, s.Enabled...) - enabledServices = append(disabledServices, s.Disabled...) + disabledServices = append(disabledServices, s.Disabled...) } return &pipeline.SystemdStageOptions{ EnabledServices: enabledServices, diff --git a/internal/distro/rhel82/distro.go b/internal/distro/rhel82/distro.go index 031b05551..77662ba68 100644 --- a/internal/distro/rhel82/distro.go +++ b/internal/distro/rhel82/distro.go @@ -441,7 +441,6 @@ func (r *RHEL82) Name() string { return name } - func (r *RHEL82) Distribution() common.Distribution { return Distro } @@ -692,7 +691,7 @@ func (r *RHEL82) firewallStageOptions(firewall *blueprint.FirewallCustomization) func (r *RHEL82) systemdStageOptions(enabledServices, disabledServices []string, s *blueprint.ServicesCustomization, target string) *pipeline.SystemdStageOptions { if s != nil { enabledServices = append(enabledServices, s.Enabled...) - enabledServices = append(disabledServices, s.Disabled...) + disabledServices = append(disabledServices, s.Disabled...) } return &pipeline.SystemdStageOptions{ EnabledServices: enabledServices, diff --git a/internal/upload/awsupload/awsupload.go b/internal/upload/awsupload/awsupload.go index 429ca886b..255307adf 100644 --- a/internal/upload/awsupload/awsupload.go +++ b/internal/upload/awsupload/awsupload.go @@ -132,6 +132,9 @@ func (a *AWS) Register(name, bucket, key string) (*string, error) { }, }, ) + if err != nil { + return nil, err + } snapshotId := importOutput.ImportSnapshotTasks[0].SnapshotTaskDetail.SnapshotId diff --git a/internal/upload/awsupload/awsupload_test.go b/internal/upload/awsupload/awsupload_test.go index 111e9f5bb..548eed6e9 100644 --- a/internal/upload/awsupload/awsupload_test.go +++ b/internal/upload/awsupload/awsupload_test.go @@ -43,13 +43,17 @@ func generateRandomFile(pattern string, length int) (string, []byte, error) { cmd := exec.Command("dd", "bs=1", countArg, "if=/dev/urandom", fmt.Sprintf("of=%s", fileName)) err = cmd.Run() + if err != nil { + return "", []byte{}, err + } + contents, err := ioutil.ReadAll(f) if err != nil { return "", []byte{}, err } if err := f.Close(); err != nil { - return ",", []byte{}, err + return "", []byte{}, err } return fileName, contents, err