Skip to content

Commit 31f3caf

Browse files
andikerajandikeraj
authored
Merge branch 'main' into main
2 parents 3765bb5 + 92c48cb commit 31f3caf

22 files changed

+1922
-49
lines changed

‎docs/stackit_ske_options.md‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,18 @@ Lists SKE provider options
44

55
### Synopsis
66

7+
Command "options" is deprecated, use the subcommands instead.
78
Lists STACKIT Kubernetes Engine (SKE) provider options (availability zones, Kubernetes versions, machine images and types, volume types).
89
Pass one or more flags to filter what categories are shown.
910

1011
```
1112
stackit ske options [flags]
1213
```
1314

14-
### Examples
15-
16-
```
17-
List SKE options for all categories
18-
$ stackit ske options
19-
20-
List SKE options regarding Kubernetes versions only
21-
$ stackit ske options --kubernetes-versions
22-
23-
List SKE options regarding Kubernetes versions and machine images
24-
$ stackit ske options --kubernetes-versions --machine-images
25-
```
26-
2715
### Options
2816

2917
```
30-
--availability-zones Lists availability zones
31-
-h, --help Help for "stackit ske options"
32-
--kubernetes-versions Lists supported kubernetes versions
33-
--machine-images Lists supported machine images
34-
--machine-types Lists supported machine types
35-
--volume-types Lists supported volume types
18+
-h, --help Help for "stackit ske options"
3619
```
3720

3821
### Options inherited from parent commands
@@ -49,4 +32,9 @@ stackit ske options [flags]
4932
### SEE ALSO
5033

5134
* [stackit ske](./stackit_ske.md) - Provides functionality for SKE
35+
* [stackit ske options availability-zones](./stackit_ske_options_availability-zones.md) - Lists SKE provider options for availability-zones
36+
* [stackit ske options kubernetes-versions](./stackit_ske_options_kubernetes-versions.md) - Lists SKE provider options for kubernetes-versions
37+
* [stackit ske options machine-images](./stackit_ske_options_machine-images.md) - Lists SKE provider options for machine-images
38+
* [stackit ske options machine-types](./stackit_ske_options_machine-types.md) - Lists SKE provider options for machine-types
39+
* [stackit ske options volume-types](./stackit_ske_options_volume-types.md) - Lists SKE provider options for volume-types
5240

‎docs/stackit_ske_options_availability-zones.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
## stackit ske options availability-zones
2+
3+
Lists SKE provider options for availability-zones
4+
5+
### Synopsis
6+
7+
Lists STACKIT Kubernetes Engine (SKE) provider options for availability-zones.
8+
9+
```
10+
stackit ske options availability-zones [flags]
11+
```
12+
13+
### Examples
14+
15+
```
16+
List SKE options for availability-zones
17+
$ stackit ske options availability-zones
18+
```
19+
20+
### Options
21+
22+
```
23+
-h, --help Help for "stackit ske options availability-zones"
24+
```
25+
26+
### Options inherited from parent commands
27+
28+
```
29+
-y, --assume-yes If set, skips all confirmation prompts
30+
--async If set, runs the command asynchronously
31+
-o, --output-format string Output format, one of ["json" "pretty" "none" "yaml"]
32+
-p, --project-id string Project ID
33+
--region string Target region for region-specific requests
34+
--verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info")
35+
```
36+
37+
### SEE ALSO
38+
39+
* [stackit ske options](./stackit_ske_options.md) - Lists SKE provider options
40+

‎docs/stackit_ske_options_kubernetes-versions.md‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
## stackit ske options kubernetes-versions
2+
3+
Lists SKE provider options for kubernetes-versions
4+
5+
### Synopsis
6+
7+
Lists STACKIT Kubernetes Engine (SKE) provider options for kubernetes-versions.
8+
9+
```
10+
stackit ske options kubernetes-versions [flags]
11+
```
12+
13+
### Examples
14+
15+
```
16+
List SKE options for kubernetes-versions
17+
$ stackit ske options kubernetes-versions
18+
19+
List SKE options for supported kubernetes-versions
20+
$ stackit ske options kubernetes-versions --supported
21+
```
22+
23+
### Options
24+
25+
```
26+
-h, --help Help for "stackit ske options kubernetes-versions"
27+
--supported List supported versions only
28+
```
29+
30+
### Options inherited from parent commands
31+
32+
```
33+
-y, --assume-yes If set, skips all confirmation prompts
34+
--async If set, runs the command asynchronously
35+
-o, --output-format string Output format, one of ["json" "pretty" "none" "yaml"]
36+
-p, --project-id string Project ID
37+
--region string Target region for region-specific requests
38+
--verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info")
39+
```
40+
41+
### SEE ALSO
42+
43+
* [stackit ske options](./stackit_ske_options.md) - Lists SKE provider options
44+

‎docs/stackit_ske_options_machine-images.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
## stackit ske options machine-images
2+
3+
Lists SKE provider options for machine-images
4+
5+
### Synopsis
6+
7+
Lists STACKIT Kubernetes Engine (SKE) provider options for machine-images.
8+
9+
```
10+
stackit ske options machine-images [flags]
11+
```
12+
13+
### Examples
14+
15+
```
16+
List SKE options for machine-images
17+
$ stackit ske options machine-images
18+
```
19+
20+
### Options
21+
22+
```
23+
-h, --help Help for "stackit ske options machine-images"
24+
```
25+
26+
### Options inherited from parent commands
27+
28+
```
29+
-y, --assume-yes If set, skips all confirmation prompts
30+
--async If set, runs the command asynchronously
31+
-o, --output-format string Output format, one of ["json" "pretty" "none" "yaml"]
32+
-p, --project-id string Project ID
33+
--region string Target region for region-specific requests
34+
--verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info")
35+
```
36+
37+
### SEE ALSO
38+
39+
* [stackit ske options](./stackit_ske_options.md) - Lists SKE provider options
40+

‎docs/stackit_ske_options_machine-types.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
## stackit ske options machine-types
2+
3+
Lists SKE provider options for machine-types
4+
5+
### Synopsis
6+
7+
Lists STACKIT Kubernetes Engine (SKE) provider options for machine-types.
8+
9+
```
10+
stackit ske options machine-types [flags]
11+
```
12+
13+
### Examples
14+
15+
```
16+
List SKE options for machine-types
17+
$ stackit ske options machine-types
18+
```
19+
20+
### Options
21+
22+
```
23+
-h, --help Help for "stackit ske options machine-types"
24+
```
25+
26+
### Options inherited from parent commands
27+
28+
```
29+
-y, --assume-yes If set, skips all confirmation prompts
30+
--async If set, runs the command asynchronously
31+
-o, --output-format string Output format, one of ["json" "pretty" "none" "yaml"]
32+
-p, --project-id string Project ID
33+
--region string Target region for region-specific requests
34+
--verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info")
35+
```
36+
37+
### SEE ALSO
38+
39+
* [stackit ske options](./stackit_ske_options.md) - Lists SKE provider options
40+

‎docs/stackit_ske_options_volume-types.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
## stackit ske options volume-types
2+
3+
Lists SKE provider options for volume-types
4+
5+
### Synopsis
6+
7+
Lists STACKIT Kubernetes Engine (SKE) provider options for volume-types.
8+
9+
```
10+
stackit ske options volume-types [flags]
11+
```
12+
13+
### Examples
14+
15+
```
16+
List SKE options for volume-types
17+
$ stackit ske options volume-types
18+
```
19+
20+
### Options
21+
22+
```
23+
-h, --help Help for "stackit ske options volume-types"
24+
```
25+
26+
### Options inherited from parent commands
27+
28+
```
29+
-y, --assume-yes If set, skips all confirmation prompts
30+
--async If set, runs the command asynchronously
31+
-o, --output-format string Output format, one of ["json" "pretty" "none" "yaml"]
32+
-p, --project-id string Project ID
33+
--region string Target region for region-specific requests
34+
--verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info")
35+
```
36+
37+
### SEE ALSO
38+
39+
* [stackit ske options](./stackit_ske_options.md) - Lists SKE provider options
40+

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/spf13/cobra v1.10.2
1616
github.com/spf13/pflag v1.0.10
1717
github.com/spf13/viper v1.21.0
18-
github.com/stackitcloud/stackit-sdk-go/core v0.21.1
18+
github.com/stackitcloud/stackit-sdk-go/core v0.22.0
1919
github.com/stackitcloud/stackit-sdk-go/services/alb v0.10.0
2020
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.12.0
2121
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.10.0
@@ -42,7 +42,7 @@ require (
4242
golang.org/x/oauth2 v0.35.0
4343
golang.org/x/term v0.40.0
4444
golang.org/x/text v0.34.0
45-
k8s.io/apimachinery v0.35.1
45+
k8s.io/apimachinery v0.35.2
4646
k8s.io/client-go v0.35.1
4747
)
4848

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,8 @@ github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=
596596
github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY=
597597
github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0=
598598
github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I=
599-
github.com/stackitcloud/stackit-sdk-go/core v0.21.1 h1:Y/PcAgM7DPYMNqum0MLv4n1mF9ieuevzcCIZYQfm3Ts=
600-
github.com/stackitcloud/stackit-sdk-go/core v0.21.1/go.mod h1:osMglDby4csGZ5sIfhNyYq1bS1TxIdPY88+skE/kkmI=
599+
github.com/stackitcloud/stackit-sdk-go/core v0.22.0 h1:6rViz7GnNwXSh51Lur5xuDzO8EWSZfN9J0HvEkBKq6c=
600+
github.com/stackitcloud/stackit-sdk-go/core v0.22.0/go.mod h1:osMglDby4csGZ5sIfhNyYq1bS1TxIdPY88+skE/kkmI=
601601
github.com/stackitcloud/stackit-sdk-go/services/alb v0.10.0 h1:V9+885qkSv621rZZatg1YE5ENM1ElALxQDJsh+hDIUg=
602602
github.com/stackitcloud/stackit-sdk-go/services/alb v0.10.0/go.mod h1:V6+MolxM/M2FWyWZA+FRFKEzzUe10MU9eEVfMvxHGi8=
603603
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.12.0 h1:HxPgBu04j5tj6nfZ2r0l6v4VXC0/tYOGe4sA5Addra8=
@@ -1110,8 +1110,8 @@ honnef.co/go/tools v0.6.1 h1:R094WgE8K4JirYjBaOpz/AvTyUu/3wbmAoskKN/pxTI=
11101110
honnef.co/go/tools v0.6.1/go.mod h1:3puzxxljPCe8RGJX7BIy1plGbxEOZni5mR2aXe3/uk4=
11111111
k8s.io/api v0.35.1 h1:0PO/1FhlK/EQNVK5+txc4FuhQibV25VLSdLMmGpDE/Q=
11121112
k8s.io/api v0.35.1/go.mod h1:28uR9xlXWml9eT0uaGo6y71xK86JBELShLy4wR1XtxM=
1113-
k8s.io/apimachinery v0.35.1 h1:yxO6gV555P1YV0SANtnTjXYfiivaTPvCTKX6w6qdDsU=
1114-
k8s.io/apimachinery v0.35.1/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
1113+
k8s.io/apimachinery v0.35.2 h1:NqsM/mmZA7sHW02JZ9RTtk3wInRgbVxL8MPfzSANAK8=
1114+
k8s.io/apimachinery v0.35.2/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
11151115
k8s.io/client-go v0.35.1 h1:+eSfZHwuo/I19PaSxqumjqZ9l5XiTEKbIaJ+j1wLcLM=
11161116
k8s.io/client-go v0.35.1/go.mod h1:1p1KxDt3a0ruRfc/pG4qT/3oHmUj1AhSHEcxNSGg+OA=
11171117
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

‎internal/cmd/image/describe/describe.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,16 @@ func outputResult(p *print.Printer, outputFormat string, resp *iaas.Image) error
9696
table := tables.NewTable()
9797
if id := resp.Id; id != nil {
9898
table.AddRow("ID", *id)
99+
table.AddSeparator()
99100
}
100-
table.AddSeparator()
101-
102101
if name := resp.Name; name != nil {
103102
table.AddRow("NAME", *name)
104103
table.AddSeparator()
105104
}
105+
if status := resp.Status; status != nil {
106+
table.AddRow("STATUS", *status)
107+
table.AddSeparator()
108+
}
106109
if format := resp.DiskFormat; format != nil {
107110
table.AddRow("FORMAT", *format)
108111
table.AddSeparator()

‎internal/cmd/image/describe/describe_test.go‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"testing"
66

77
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
8+
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
89

910
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1011
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
@@ -225,6 +226,33 @@ func TestOutputResult(t *testing.T) {
225226
args: args{},
226227
wantErr: true,
227228
},
229+
{
230+
name: "valid value",
231+
args: args{
232+
resp: &iaas.Image{
233+
Id: utils.Ptr(uuid.NewString()),
234+
Name: utils.Ptr("Image"),
235+
Status: utils.Ptr("STATUS"),
236+
DiskFormat: utils.Ptr("format"),
237+
MinDiskSize: utils.Ptr(int64(0)),
238+
MinRam: utils.Ptr(int64(0)),
239+
Config: &iaas.ImageConfig{
240+
Architecture: utils.Ptr("architecture"),
241+
OperatingSystem: utils.Ptr("os"),
242+
OperatingSystemDistro: iaas.NewNullableString(utils.Ptr("os distro")),
243+
OperatingSystemVersion: iaas.NewNullableString(utils.Ptr("0.00.0")),
244+
Uefi: utils.Ptr(true),
245+
},
246+
Labels: utils.Ptr(map[string]any{
247+
"label1": true,
248+
"label2": false,
249+
"label3": 42,
250+
"foo": "bar",
251+
}),
252+
},
253+
},
254+
wantErr: false,
255+
},
228256
}
229257
p := print.NewPrinter()
230258
p.Cmd = NewCmd(&types.CmdParams{Printer: p})

0 commit comments

Comments
 (0)