Skip to content

Commit 6bc2e2e

Browse files
committed
lint: fix headers
Seems like golangci lint always complains about the current year on all files, instead of only new changes. Let's try to fix it. Signed-off-by: Fredrik Lönnegren <[email protected]>
1 parent af99ad9 commit 6bc2e2e

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

.github/workflows/cli.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout code
19-
uses: actions/[email protected]
19+
uses: actions/checkout@v6
20+
with:
21+
fetch-depth: 0 # Required for go-header check.
2022
- name: Install Go
21-
uses: actions/setup-go@v3.3.1
23+
uses: actions/setup-go@v6
2224
with:
2325
go-version-file: go.mod
2426
- name: Analysis
2527
uses: golangci/golangci-lint-action@v3
2628
with:
27-
args: -v
29+
args: -v --new
2830
- name: Build
2931
run: make build-cli
3032
- name: Run tests

pkg/action/build-iso.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/rancher/elemental-toolkit/pkg/constants"
2525
"github.com/rancher/elemental-toolkit/pkg/elemental"
26-
elementalError "github.com/rancher/elemental-toolkit/pkg/error"
26+
elerr "github.com/rancher/elemental-toolkit/pkg/error"
2727
"github.com/rancher/elemental-toolkit/pkg/live"
2828
v1 "github.com/rancher/elemental-toolkit/pkg/types/v1"
2929
"github.com/rancher/elemental-toolkit/pkg/utils"
@@ -70,36 +70,36 @@ func (b *BuildISOAction) ISORun() error {
7070

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

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

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

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

9898
if b.cfg.OutDir != "" {
9999
err = utils.MkdirAll(b.cfg.Fs, b.cfg.OutDir, constants.DirPerm)
100100
if err != nil {
101101
b.cfg.Logger.Errorf("Failed creating output dir: %s", b.cfg.OutDir)
102-
return elementalError.NewFromError(err, elementalError.CreateDir)
102+
return elerr.NewFromError(err, elerr.CreateDir)
103103
}
104104
}
105105

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

118118
if b.spec.Firmware == v1.EFI {
@@ -121,7 +121,7 @@ func (b *BuildISOAction) ISORun() error {
121121
err = b.liveBoot.PrepareEFI(rootDir, uefiDir)
122122
if err != nil {
123123
b.cfg.Logger.Errorf("Failed fetching EFI data: %v", err)
124-
return elementalError.NewFromError(err, elementalError.CopyData)
124+
return elerr.NewFromError(err, elerr.CopyData)
125125
}
126126
}
127127
err = b.applySources(uefiDir, b.spec.UEFI...)
@@ -136,7 +136,7 @@ func (b *BuildISOAction) ISORun() error {
136136
err = b.liveBoot.PrepareISO(rootDir, isoDir)
137137
if err != nil {
138138
b.cfg.Logger.Errorf("Failed fetching bootloader binaries: %v", err)
139-
return elementalError.NewFromError(err, elementalError.CreateFile)
139+
return elerr.NewFromError(err, elerr.CreateFile)
140140
}
141141
}
142142
err = b.applySources(isoDir, b.spec.Image...)
@@ -173,29 +173,29 @@ func (b BuildISOAction) prepareISORoot(isoDir string, rootDir string) error {
173173
kernel, initrd, err := b.e.FindKernelInitrd(rootDir)
174174
if err != nil {
175175
b.cfg.Logger.Error("Could not find kernel and/or initrd")
176-
return elementalError.NewFromError(err, elementalError.StatFile)
176+
return elerr.NewFromError(err, elerr.StatFile)
177177
}
178178
err = utils.MkdirAll(b.cfg.Fs, filepath.Join(isoDir, live.IsoLoaderPath), constants.DirPerm)
179179
if err != nil {
180-
return elementalError.NewFromError(err, elementalError.CreateDir)
180+
return elerr.NewFromError(err, elerr.CreateDir)
181181
}
182182
//TODO document boot/kernel and boot/initrd expectation in bootloader config
183183
b.cfg.Logger.Debugf("Copying Kernel file %s to iso root tree", kernel)
184184
err = utils.CopyFile(b.cfg.Fs, kernel, filepath.Join(isoDir, constants.ISOKernelPath))
185185
if err != nil {
186-
return elementalError.NewFromError(err, elementalError.CopyFile)
186+
return elerr.NewFromError(err, elerr.CopyFile)
187187
}
188188

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

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

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

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

273273
checksum, err := utils.CalcFileChecksum(b.cfg.Fs, outputFile)
274274
if err != nil {
275275
b.cfg.Logger.Errorf("checksum computation failed: %v", err)
276-
return elementalError.NewFromError(err, elementalError.CalculateChecksum)
276+
return elerr.NewFromError(err, elerr.CalculateChecksum)
277277
}
278278
err = b.cfg.Fs.WriteFile(fmt.Sprintf("%s.sha256", outputFile), []byte(fmt.Sprintf("%s %s\n", checksum, isoFileName)), 0644)
279279
if err != nil {
280280
b.cfg.Logger.Errorf("cannot write checksum file: %v", err)
281-
return elementalError.NewFromError(err, elementalError.CreateFile)
281+
return elerr.NewFromError(err, elerr.CreateFile)
282282
}
283283

284284
return nil
@@ -288,7 +288,7 @@ func (b BuildISOAction) applySources(target string, sources ...*v1.ImageSource)
288288
for _, src := range sources {
289289
_, err := b.e.DumpSource(target, src)
290290
if err != nil {
291-
return elementalError.NewFromError(err, elementalError.DumpSource)
291+
return elerr.NewFromError(err, elerr.DumpSource)
292292
}
293293
}
294294
return nil

0 commit comments

Comments
 (0)