Skip to content

lint: fix headers #2366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
frelon wants to merge 1 commit into
base: v1.1.x
Choose a base branch
from
Draft

lint: fix headers #2366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/cli.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3.1.0
uses: actions/checkout@v6
with:
fetch-depth: 0 # Required for go-header check.
- name: Install Go
uses: actions/setup-go@v3.3.1
uses: actions/setup-go@v6
with:
go-version-file: go.mod
- name: Analysis
uses: golangci/golangci-lint-action@v3
with:
args: -v
args: -v --new-from-rev=${{GITHUB_BASE_REF}}
- name: Build
run: make build-cli
- name: Run tests
Expand Down
38 changes: 19 additions & 19 deletions pkg/action/build-iso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/rancher/elemental-toolkit/pkg/constants"
"github.com/rancher/elemental-toolkit/pkg/elemental"
elementalError "github.com/rancher/elemental-toolkit/pkg/error"
elerr "github.com/rancher/elemental-toolkit/pkg/error"
"github.com/rancher/elemental-toolkit/pkg/live"
v1 "github.com/rancher/elemental-toolkit/pkg/types/v1"
"github.com/rancher/elemental-toolkit/pkg/utils"
Expand Down Expand Up @@ -70,36 +70,36 @@ func (b *BuildISOAction) ISORun() error {

isoTmpDir, err := utils.TempDir(b.cfg.Fs, "", "elemental-iso")
if err != nil {
return elementalError.NewFromError(err, elementalError.CreateTempDir)
return elerr.NewFromError(err, elerr.CreateTempDir)
}
cleanup.Push(func() error { return b.cfg.Fs.RemoveAll(isoTmpDir) })

rootDir := filepath.Join(isoTmpDir, "rootfs")
err = utils.MkdirAll(b.cfg.Fs, rootDir, constants.DirPerm)
if err != nil {
b.cfg.Logger.Errorf("Failed creating rootfs dir: %s", rootDir)
return elementalError.NewFromError(err, elementalError.CreateDir)
return elerr.NewFromError(err, elerr.CreateDir)
}

uefiDir := filepath.Join(isoTmpDir, "uefi")
err = utils.MkdirAll(b.cfg.Fs, uefiDir, constants.DirPerm)
if err != nil {
b.cfg.Logger.Errorf("Failed creating uefi dir: %s", uefiDir)
return elementalError.NewFromError(err, elementalError.CreateDir)
return elerr.NewFromError(err, elerr.CreateDir)
}

isoDir := filepath.Join(isoTmpDir, "iso")
err = utils.MkdirAll(b.cfg.Fs, isoDir, constants.DirPerm)
if err != nil {
b.cfg.Logger.Errorf("Failed creating iso dir: %s", isoDir)
return elementalError.NewFromError(err, elementalError.CreateDir)
return elerr.NewFromError(err, elerr.CreateDir)
}

if b.cfg.OutDir != "" {
err = utils.MkdirAll(b.cfg.Fs, b.cfg.OutDir, constants.DirPerm)
if err != nil {
b.cfg.Logger.Errorf("Failed creating output dir: %s", b.cfg.OutDir)
return elementalError.NewFromError(err, elementalError.CreateDir)
return elerr.NewFromError(err, elerr.CreateDir)
}
}

Expand All @@ -112,7 +112,7 @@ func (b *BuildISOAction) ISORun() error {
err = utils.CreateDirStructure(b.cfg.Fs, rootDir)
if err != nil {
b.cfg.Logger.Errorf("Failed creating root directory structure: %v", err)
return elementalError.NewFromError(err, elementalError.CreateDir)
return elerr.NewFromError(err, elerr.CreateDir)
}

if b.spec.Firmware == v1.EFI {
Expand All @@ -121,7 +121,7 @@ func (b *BuildISOAction) ISORun() error {
err = b.liveBoot.PrepareEFI(rootDir, uefiDir)
if err != nil {
b.cfg.Logger.Errorf("Failed fetching EFI data: %v", err)
return elementalError.NewFromError(err, elementalError.CopyData)
return elerr.NewFromError(err, elerr.CopyData)
}
}
err = b.applySources(uefiDir, b.spec.UEFI...)
Expand All @@ -136,7 +136,7 @@ func (b *BuildISOAction) ISORun() error {
err = b.liveBoot.PrepareISO(rootDir, isoDir)
if err != nil {
b.cfg.Logger.Errorf("Failed fetching bootloader binaries: %v", err)
return elementalError.NewFromError(err, elementalError.CreateFile)
return elerr.NewFromError(err, elerr.CreateFile)
}
}
err = b.applySources(isoDir, b.spec.Image...)
Expand Down Expand Up @@ -173,29 +173,29 @@ func (b BuildISOAction) prepareISORoot(isoDir string, rootDir string) error {
kernel, initrd, err := b.e.FindKernelInitrd(rootDir)
if err != nil {
b.cfg.Logger.Error("Could not find kernel and/or initrd")
return elementalError.NewFromError(err, elementalError.StatFile)
return elerr.NewFromError(err, elerr.StatFile)
}
err = utils.MkdirAll(b.cfg.Fs, filepath.Join(isoDir, live.IsoLoaderPath), constants.DirPerm)
if err != nil {
return elementalError.NewFromError(err, elementalError.CreateDir)
return elerr.NewFromError(err, elerr.CreateDir)
}
//TODO document boot/kernel and boot/initrd expectation in bootloader config
b.cfg.Logger.Debugf("Copying Kernel file %s to iso root tree", kernel)
err = utils.CopyFile(b.cfg.Fs, kernel, filepath.Join(isoDir, constants.ISOKernelPath))
if err != nil {
return elementalError.NewFromError(err, elementalError.CopyFile)
return elerr.NewFromError(err, elerr.CopyFile)
}

b.cfg.Logger.Debugf("Copying initrd file %s to iso root tree", initrd)
err = utils.CopyFile(b.cfg.Fs, initrd, filepath.Join(isoDir, constants.ISOInitrdPath))
if err != nil {
return elementalError.NewFromError(err, elementalError.CopyFile)
return elerr.NewFromError(err, elerr.CopyFile)
}

b.cfg.Logger.Info("Creating squashfs...")
squashOptions := append(constants.GetDefaultSquashfsOptions(), b.cfg.SquashFsCompressionConfig...)
err = utils.CreateSquashFS(b.cfg.Runner, b.cfg.Logger, rootDir, filepath.Join(isoDir, constants.ISORootFile), squashOptions)
return elementalError.NewFromError(err, elementalError.MKFSCall)
return elerr.NewFromError(err, elerr.MKFSCall)
}

func (b BuildISOAction) createEFI(root string, img string) error {
Expand Down Expand Up @@ -254,7 +254,7 @@ func (b BuildISOAction) burnISO(root, efiImg string) error {
b.cfg.Logger.Warnf("Overwriting already existing %s", outputFile)
err := b.cfg.Fs.Remove(outputFile)
if err != nil {
return elementalError.NewFromError(err, elementalError.RemoveFile)
return elerr.NewFromError(err, elerr.RemoveFile)
}
}

Expand All @@ -267,18 +267,18 @@ func (b BuildISOAction) burnISO(root, efiImg string) error {
out, err := b.cfg.Runner.Run(cmd, args...)
b.cfg.Logger.Debugf("Xorriso: %s", string(out))
if err != nil {
return elementalError.NewFromError(err, elementalError.CommandRun)
return elerr.NewFromError(err, elerr.CommandRun)
}

checksum, err := utils.CalcFileChecksum(b.cfg.Fs, outputFile)
if err != nil {
b.cfg.Logger.Errorf("checksum computation failed: %v", err)
return elementalError.NewFromError(err, elementalError.CalculateChecksum)
return elerr.NewFromError(err, elerr.CalculateChecksum)
}
err = b.cfg.Fs.WriteFile(fmt.Sprintf("%s.sha256", outputFile), []byte(fmt.Sprintf("%s %s\n", checksum, isoFileName)), 0644)
if err != nil {
b.cfg.Logger.Errorf("cannot write checksum file: %v", err)
return elementalError.NewFromError(err, elementalError.CreateFile)
return elerr.NewFromError(err, elerr.CreateFile)
}

return nil
Expand All @@ -288,7 +288,7 @@ func (b BuildISOAction) applySources(target string, sources ...*v1.ImageSource)
for _, src := range sources {
_, err := b.e.DumpSource(target, src)
if err != nil {
return elementalError.NewFromError(err, elementalError.DumpSource)
return elerr.NewFromError(err, elerr.DumpSource)
}
}
return nil
Expand Down
Loading