Skip to content

Commit f0cf7e9

Browse files
Merge branch 'main' into feat/STACKITCLI-384-vpn-connection
2 parents 39f5822 + f7592e8 commit f0cf7e9

286 files changed

Lines changed: 2539 additions & 2670 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v6.0.2
20+
uses: actions/checkout@v6.0.3
2121

2222
- name: Install go
2323
uses: actions/setup-go@v6
@@ -47,7 +47,7 @@ jobs:
4747
runs-on: ubuntu-latest
4848
steps:
4949
- name: Checkout
50-
uses: actions/checkout@v6.0.2
50+
uses: actions/checkout@v6.0.3
5151

5252
- name: Check GoReleaser
5353
uses: goreleaser/goreleaser-action@v7.2.2

.github/workflows/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v6.0.2
26+
uses: actions/checkout@v6.0.3
2727
with:
2828
# Allow goreleaser to access older tag information.
2929
fetch-depth: 0
@@ -106,7 +106,7 @@ jobs:
106106
AWS_SECRET_ACCESS_KEY: ${{ secrets.OBJECT_STORAGE_SECRET_ACCESS_KEY }}
107107
steps:
108108
- name: Checkout
109-
uses: actions/checkout@v6.0.2
109+
uses: actions/checkout@v6.0.3
110110

111111
# use the artifacts from the "goreleaser" job
112112
- name: Download artifacts from workflow
@@ -144,7 +144,7 @@ jobs:
144144
AWS_ENDPOINT_URL: https://object.storage.eu01.onstackit.cloud
145145
steps:
146146
- name: Checkout
147-
uses: actions/checkout@v6.0.2
147+
uses: actions/checkout@v6.0.3
148148

149149
- name: Download artifacts from workflow
150150
uses: actions/download-artifact@v8

docs/stackit_git_instance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ stackit git instance [flags]
3333
* [stackit git instance create](./stackit_git_instance_create.md) - Creates STACKIT Git instance
3434
* [stackit git instance delete](./stackit_git_instance_delete.md) - Deletes STACKIT Git instance
3535
* [stackit git instance describe](./stackit_git_instance_describe.md) - Describes STACKIT Git instance
36-
* [stackit git instance list](./stackit_git_instance_list.md) - Lists all instances of STACKIT Git.
36+
* [stackit git instance list](./stackit_git_instance_list.md) - Lists all instances of STACKIT Git
3737

docs/stackit_git_instance_list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## stackit git instance list
22

3-
Lists all instances of STACKIT Git.
3+
Lists all instances of STACKIT Git
44

55
### Synopsis
66

docs/stackit_server_service-account_attach.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,22 @@ Attach a service account to a server
77
Attach a service account to a server
88

99
```
10-
stackit server service-account attach SERVICE_ACCOUNT_EMAIL [flags]
10+
stackit server service-account attach [flags]
1111
```
1212

1313
### Examples
1414

1515
```
1616
Attach a service account with mail "xxx@sa.stackit.cloud" to a server with ID "yyy"
17-
$ stackit server service-account attach xxx@sa.stackit.cloud --server-id yyy
17+
$ stackit server service-account attach --service-account-email xxx@sa.stackit.cloud --server-id yyy
1818
```
1919

2020
### Options
2121

2222
```
23-
-h, --help Help for "stackit server service-account attach"
24-
-s, --server-id string Server ID
23+
-h, --help Help for "stackit server service-account attach"
24+
-s, --server-id string Server ID
25+
-a, --service-account-email string Service Account Email
2526
```
2627

2728
### Options inherited from parent commands

docs/stackit_server_service-account_detach.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,22 @@ Detach a service account from a server
77
Detach a service account from a server
88

99
```
10-
stackit server service-account detach SERVICE_ACCOUNT_EMAIL [flags]
10+
stackit server service-account detach [flags]
1111
```
1212

1313
### Examples
1414

1515
```
1616
Detach a service account with mail "xxx@sa.stackit.cloud" from a server "yyy"
17-
$ stackit server service-account detach xxx@sa.stackit.cloud --server-id yyy
17+
$ stackit server service-account detach --service-account-email xxx@sa.stackit.cloud --server-id yyy
1818
```
1919

2020
### Options
2121

2222
```
23-
-h, --help Help for "stackit server service-account detach"
24-
-s, --server-id string Server id
23+
-h, --help Help for "stackit server service-account detach"
24+
-s, --server-id string Server id
25+
-a, --service-account-email string Service Account Email
2526
```
2627

2728
### Options inherited from parent commands

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ require (
2121
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.16.0
2222
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.6
2323
github.com/stackitcloud/stackit-sdk-go/services/edge v0.4.3
24-
github.com/stackitcloud/stackit-sdk-go/services/git v0.10.3
25-
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5
24+
github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0
25+
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.12.0
2626
github.com/stackitcloud/stackit-sdk-go/services/intake v0.7.1
2727
github.com/stackitcloud/stackit-sdk-go/services/logs v0.5.2
2828
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.8

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -606,10 +606,10 @@ github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.6 h1:GBRb49x5Nax/oQQaa
606606
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.6/go.mod h1:IX9iL3MigDZUmzwswTJMfYvyi118KAHrFMfjJUy5NYk=
607607
github.com/stackitcloud/stackit-sdk-go/services/edge v0.4.3 h1:TxChb2qbO82JiQEBYClSSD5HZxqKeKJ6dIvkEUCJmbs=
608608
github.com/stackitcloud/stackit-sdk-go/services/edge v0.4.3/go.mod h1:KVWvQHb7CQLD9DzA4Np3WmakiCCsrHaCXvFEnOQ7nPk=
609-
github.com/stackitcloud/stackit-sdk-go/services/git v0.10.3 h1:VIjkSofZz9utOOkBdNZCIb07P/JdKc1kHV1P8Rq9dLc=
610-
github.com/stackitcloud/stackit-sdk-go/services/git v0.10.3/go.mod h1:EJk1Ss9GTel2NPIu/w3+x9XcQcEd2k3ibea5aQDzVhQ=
611-
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5 h1:W57+XRa8wTLsi5CV9Tqa7mGgt/PvlRM//RurXSmvII8=
612-
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5/go.mod h1:lTWjW57eAq1bwfM6nsNinhoBr3MHFW/GaFasdAsYfDM=
609+
github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0 h1:VZBneGprCmHqckcSMPs3puBlK8rBpLMtYKmBktwdoVE=
610+
github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0/go.mod h1:YZEL+gaK+ELn5E9VtK8yvz5RcmCBH+JkRpf6YbNVSbM=
611+
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.12.0 h1:H4V3H8qSKOaOalIrf4nAPDHhXnHYGs6SDGuK8Zj41Zo=
612+
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.12.0/go.mod h1:Ts06id0KejUlQWbpR+/rm+tKng6QkTuFV1VQTPJ4dA4=
613613
github.com/stackitcloud/stackit-sdk-go/services/intake v0.7.1 h1:7ZSrwps/zI41rl+xYkG4osld8cyAwssyl/UZ/Iu/F2g=
614614
github.com/stackitcloud/stackit-sdk-go/services/intake v0.7.1/go.mod h1:ZIvwBZwEMFO+YfJLCNXqabslI0Fp9zxV7ZBwlZjk7uE=
615615
github.com/stackitcloud/stackit-sdk-go/services/kms v1.3.2 h1:2ulSL2IkIAKND59eAjbEhVkOoBMyvm48ojwz1a3t0U0=

internal/cmd/affinity-groups/create/create.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
88

99
"github.com/spf13/cobra"
10-
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
10+
iaas "github.com/stackitcloud/stackit-sdk-go/services/iaas/v2api"
1111

1212
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1313
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -88,11 +88,11 @@ func configureFlags(cmd *cobra.Command) {
8888
}
8989

9090
func buildRequest(ctx context.Context, model inputModel, apiClient *iaas.APIClient) iaas.ApiCreateAffinityGroupRequest {
91-
req := apiClient.CreateAffinityGroup(ctx, model.ProjectId, model.Region)
91+
req := apiClient.DefaultAPI.CreateAffinityGroup(ctx, model.ProjectId, model.Region)
9292
req = req.CreateAffinityGroupPayload(
9393
iaas.CreateAffinityGroupPayload{
94-
Name: utils.Ptr(model.Name),
95-
Policy: utils.Ptr(model.Policy),
94+
Name: model.Name,
95+
Policy: model.Policy,
9696
},
9797
)
9898
return req

internal/cmd/affinity-groups/create/create_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/google/go-cmp/cmp"
88
"github.com/google/go-cmp/cmp/cmpopts"
99
"github.com/google/uuid"
10-
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
10+
iaas "github.com/stackitcloud/stackit-sdk-go/services/iaas/v2api"
1111

1212
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
1313

@@ -26,7 +26,7 @@ type testCtxKey struct{}
2626

2727
var (
2828
testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
29-
testClient = &iaas.APIClient{}
29+
testClient = &iaas.APIClient{DefaultAPI: &iaas.DefaultAPIService{}}
3030
testProjectId = uuid.NewString()
3131
)
3232

@@ -61,7 +61,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6161
}
6262

6363
func fixtureRequest(mods ...func(request *iaas.ApiCreateAffinityGroupRequest)) iaas.ApiCreateAffinityGroupRequest {
64-
request := testClient.CreateAffinityGroup(testCtx, testProjectId, testRegion)
64+
request := testClient.DefaultAPI.CreateAffinityGroup(testCtx, testProjectId, testRegion)
6565
request = request.CreateAffinityGroupPayload(fixturePayload())
6666
for _, mod := range mods {
6767
mod(&request)
@@ -71,8 +71,8 @@ func fixtureRequest(mods ...func(request *iaas.ApiCreateAffinityGroupRequest)) i
7171

7272
func fixturePayload(mods ...func(payload *iaas.CreateAffinityGroupPayload)) iaas.CreateAffinityGroupPayload {
7373
payload := iaas.CreateAffinityGroupPayload{
74-
Name: utils.Ptr(testName),
75-
Policy: utils.Ptr(testPolicy),
74+
Name: testName,
75+
Policy: testPolicy,
7676
}
7777
for _, mod := range mods {
7878
mod(&payload)
@@ -147,7 +147,7 @@ func TestBuildRequest(t *testing.T) {
147147
request := buildRequest(testCtx, tt.model, testClient)
148148
diff := cmp.Diff(request, tt.expectedRequest,
149149
cmp.AllowUnexported(tt.expectedRequest),
150-
cmpopts.EquateComparable(testCtx))
150+
cmpopts.EquateComparable(testCtx, iaas.DefaultAPIService{}))
151151
if diff != "" {
152152
t.Fatalf("Request does not match: %s", diff)
153153
}
@@ -173,9 +173,9 @@ func TestOutputResult(t *testing.T) {
173173
model: *fixtureInputModel(),
174174
response: iaas.AffinityGroup{
175175
Id: utils.Ptr(testProjectId),
176-
Members: utils.Ptr([]string{uuid.NewString(), uuid.NewString()}),
177-
Name: utils.Ptr("test-project"),
178-
Policy: utils.Ptr("hard-affinity"),
176+
Members: []string{uuid.NewString(), uuid.NewString()},
177+
Name: "test-project",
178+
Policy: "hard-affinity",
179179
},
180180
isValid: true,
181181
},

0 commit comments

Comments
 (0)