Skip to content

Commit 3453dc5

Browse files
committed
Merge remote-tracking branch 'origin/chore/STACKITCLI-355-alb-sdk-migration' into chore/STACKITCLI-355-alb-sdk-migration
2 parents 4262a52 + b7e1216 commit 3453dc5

4 files changed

Lines changed: 23 additions & 4 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/google/go-cmp v0.7.0
1010
github.com/google/uuid v1.6.0
1111
github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf
12-
github.com/jedib0t/go-pretty/v6 v6.7.8
12+
github.com/jedib0t/go-pretty/v6 v6.7.10
1313
github.com/lmittmann/tint v1.1.3
1414
github.com/mattn/go-colorable v0.1.14
1515
github.com/spf13/cobra v1.10.2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
371371
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
372372
github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf h1:FtEj8sfIcaaBfAKrE1Cwb61YDtYq9JxChK1c7AKce7s=
373373
github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf/go.mod h1:yrqSXGoD/4EKfF26AOGzscPOgTTJcyAwM2rpixWT+t4=
374-
github.com/jedib0t/go-pretty/v6 v6.7.8 h1:BVYrDy5DPBA3Qn9ICT+PokP9cvCv1KaHv2i+Hc8sr5o=
375-
github.com/jedib0t/go-pretty/v6 v6.7.8/go.mod h1:YwC5CE4fJ1HFUDeivSV1r//AmANFHyqczZk+U6BDALU=
374+
github.com/jedib0t/go-pretty/v6 v6.7.10 h1:B/2qW2Bkv2L6n14PP8o1kx75kWzHOQ3YTluWzg9icac=
375+
github.com/jedib0t/go-pretty/v6 v6.7.10/go.mod h1:YwC5CE4fJ1HFUDeivSV1r//AmANFHyqczZk+U6BDALU=
376376
github.com/jgautheron/goconst v1.8.2 h1:y0XF7X8CikZ93fSNT6WBTb/NElBu9IjaY7CCYQrCMX4=
377377
github.com/jgautheron/goconst v1.8.2/go.mod h1:A0oxgBCHy55NQn6sYpO7UdnA9p+h7cPtoOZUmvNIako=
378378
github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjzq7gFzUs=

internal/pkg/utils/os_fs.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package utils
2+
3+
import (
4+
"io/fs"
5+
"os"
6+
)
7+
8+
var _ fs.ReadFileFS = OsFS{}
9+
10+
type OsFS struct{}
11+
12+
func (o OsFS) Open(name string) (fs.File, error) {
13+
return os.Open(name)
14+
}
15+
16+
func (o OsFS) ReadFile(name string) ([]byte, error) {
17+
return os.ReadFile(name)
18+
}

main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/stackitcloud/stackit-cli/internal/pkg/config"
88
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
99
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
10+
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1011
)
1112

1213
// These values are overwritten by GoReleaser at build time
@@ -28,7 +29,7 @@ func main() {
2829
Printer: printer,
2930
CliVersion: version,
3031
Date: date,
31-
Fs: os.DirFS("/"),
32+
Fs: utils.OsFS{},
3233
Args: os.Args[1:],
3334
}
3435
if !cmd.Execute(&params) {

0 commit comments

Comments
 (0)