From bb7a6913145f1fae2cc5e906dc55b182279e2237 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Wed, 16 Feb 2022 16:20:55 -0500 Subject: [PATCH] Fix golint complaints --- data/data/agent/embed.go | 1 + pkg/agent/imagebuilder/content.go | 2 ++ pkg/agent/imagebuilder/embed_ignition.go | 2 ++ pkg/agent/isosource/download.go | 5 +++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/data/data/agent/embed.go b/data/data/agent/embed.go index 2e224bb74b7..099269c0b5f 100644 --- a/data/data/agent/embed.go +++ b/data/data/agent/embed.go @@ -2,5 +2,6 @@ package agent import "embed" +// IgnitionData contains the source data for building the ignition file //go:embed * var IgnitionData embed.FS diff --git a/pkg/agent/imagebuilder/content.go b/pkg/agent/imagebuilder/content.go index 87f963a6517..0ef744d761e 100644 --- a/pkg/agent/imagebuilder/content.go +++ b/pkg/agent/imagebuilder/content.go @@ -14,9 +14,11 @@ import ( data "github.com/openshift-agent-team/fleeting/data/data/agent" ) +// ConfigBuilder builds an Ignition config type ConfigBuilder struct { } +// Ignition builds an ignition file and returns the bytes func (c ConfigBuilder) Ignition() ([]byte, error) { var err error diff --git a/pkg/agent/imagebuilder/embed_ignition.go b/pkg/agent/imagebuilder/embed_ignition.go index bec20bbfd21..bc8d454a6b1 100644 --- a/pkg/agent/imagebuilder/embed_ignition.go +++ b/pkg/agent/imagebuilder/embed_ignition.go @@ -11,6 +11,8 @@ const ( outputImage = "output/fleeting.iso" ) +// BuildImage builds an ISO with ignition content from a base image, and writes +// the result to disk. func BuildImage(baseImage string) error { ignition, err := ConfigBuilder{}.Ignition() if err != nil { diff --git a/pkg/agent/isosource/download.go b/pkg/agent/isosource/download.go index d3ac8c9712f..c035dbd62c5 100644 --- a/pkg/agent/isosource/download.go +++ b/pkg/agent/isosource/download.go @@ -14,12 +14,12 @@ import ( const ( outputFile = "output/coreos.iso" - isoUrl = "https://rhcos-redirector.apps.art.xq1c.p1.openshiftapps.com/art/storage/releases/rhcos-4.10/410.84.202201251210-0/x86_64/rhcos-410.84.202201251210-0-live.x86_64.iso" + isoURL = "https://rhcos-redirector.apps.art.xq1c.p1.openshiftapps.com/art/storage/releases/rhcos-4.10/410.84.202201251210-0/x86_64/rhcos-410.84.202201251210-0-live.x86_64.iso" isoSha256 = "2905c1f0d85739e8600e8816c0d32711fb4002be4f845e0b20eeab35314e5b58" ) func downloadIso(dest string) error { - resp, err := http.Get(isoUrl) + resp, err := http.Get(isoURL) if err != nil { return err } @@ -59,6 +59,7 @@ func haveValidIso(location string) bool { return bytes.Equal(hash.Sum(nil), expectedChecksum) } +// EnsureIso downloads the ISO if it is not already present func EnsureIso() (string, error) { if !haveValidIso(outputFile) { if err := downloadIso(outputFile); err != nil {