Skip to content

Commit 7e88ce7

Browse files
GokceGKGokceGK
committed
Merge remote-tracking branch 'origin/feature/onboard-logs-service' into feature/onboard-logs-service
2 parents 69a36fc + ee6a7e8 commit 7e88ce7

File tree

21 files changed

+95
-102
lines changed

21 files changed

+95
-102
lines changed

‎.github/dependabot.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "daily"
7+
cooldown:
8+
default-days: 7
9+
exclude: ["github.com/stackitcloud*"]
710
- package-ecosystem: "github-actions"
811
directory: "/"
912
schedule:
1013
interval: "daily"
14+
cooldown:
15+
default-days: 7

‎.github/renovate.json‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎.github/workflows/renovate.yaml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎docs/stackit_config_profile_create.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The profile name can be provided via the STACKIT_CLI_PROFILE environment variabl
99
The environment variable takes precedence over the argument.
1010
If you do not want to set the profile as active, use the --no-set flag.
1111
If you want to create the new profile with the initial default configurations, use the --empty flag.
12+
If you want to create the new profile and ignore the error for an already existing profile, use the --ignore-existing flag.
1213

1314
```
1415
stackit config profile create PROFILE [flags]
@@ -27,9 +28,10 @@ stackit config profile create PROFILE [flags]
2728
### Options
2829

2930
```
30-
--empty Create the profile with the initial default configurations
31-
-h, --help Help for "stackit config profile create"
32-
--no-set Do not set the profile as the active profile
31+
--empty Create the profile with the initial default configurations
32+
-h, --help Help for "stackit config profile create"
33+
--ignore-existing Suppress the error if the profile exists already. An existing profile will not be modified or overwritten
34+
--no-set Do not set the profile as the active profile
3335
```
3436

3537
### Options inherited from parent commands

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/stackitcloud/stackit-sdk-go/services/alb v0.8.0
2020
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.11.0
2121
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.3
22-
github.com/stackitcloud/stackit-sdk-go/services/edge v0.2.0
22+
github.com/stackitcloud/stackit-sdk-go/services/edge v0.4.0
2323
github.com/stackitcloud/stackit-sdk-go/services/git v0.10.1
2424
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.0
2525
github.com/stackitcloud/stackit-sdk-go/services/intake v0.4.1
@@ -29,12 +29,12 @@ require (
2929
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.2
3030
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.18.2
3131
github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.3.3
32-
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.13.3
32+
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.14.0
3333
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.4
3434
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.2.3
3535
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.11.3
3636
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.4
37-
github.com/stackitcloud/stackit-sdk-go/services/ske v1.5.1
37+
github.com/stackitcloud/stackit-sdk-go/services/ske v1.6.0
3838
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.4.0
3939
github.com/zalando/go-keyring v0.2.6
4040
golang.org/x/mod v0.32.0

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,8 @@ github.com/stackitcloud/stackit-sdk-go/services/authorization v0.11.0 h1:4YFY5PG
608608
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.11.0/go.mod h1:v4xdRA5P8Vr+zLdHh+ODgspN0WJG04wLImIJoYjrPK4=
609609
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.3 h1:KD/FxU/cJIzfyMvwiOvTlSWq87ISENpHNmw/quznGnw=
610610
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.3/go.mod h1:BNiIZkDqwSV1LkWDjMKxVb9pxQ/HMIsXJ0AQ8pFoAo4=
611-
github.com/stackitcloud/stackit-sdk-go/services/edge v0.2.0 h1:ElmnEg3V4MisAgqqJFxl3nCmKraxbHtN+vv1DNiWYfM=
612-
github.com/stackitcloud/stackit-sdk-go/services/edge v0.2.0/go.mod h1:tFDkVkK+ESBTiH2XIcMPPR/pJJmeqT1VNDghg+ZxfMI=
611+
github.com/stackitcloud/stackit-sdk-go/services/edge v0.4.0 h1:+96JOe4oS9BhdH4kHfc5jcl9DVIZiHrMN0/PXn8uWoI=
612+
github.com/stackitcloud/stackit-sdk-go/services/edge v0.4.0/go.mod h1:tFDkVkK+ESBTiH2XIcMPPR/pJJmeqT1VNDghg+ZxfMI=
613613
github.com/stackitcloud/stackit-sdk-go/services/git v0.10.1 h1:3JKXfI5hdcXcRVBjUZg5qprXG5rDmPnM6dsvplMk/vg=
614614
github.com/stackitcloud/stackit-sdk-go/services/git v0.10.1/go.mod h1:3nTaj8IGjNNGYUD2CpuXkXwc5c4giTUmoPggFhjVFxo=
615615
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.0 h1:U/x0tc487X9msMS5yZYjrBAAKrCx87Trmt0kh8JiARA=
@@ -646,8 +646,8 @@ github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.18.2 h1:VDIXO
646646
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.18.2/go.mod h1:9zyEzPL4DnmU/SHq+SuMWTSO5BPxM1Z4g8Fp28n00ds=
647647
github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.3.3 h1:ShK5AFExNRAVUMsbeoVQhCxb7GpNSmzq15jJuaBUSFo=
648648
github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.3.3/go.mod h1:P1uhYJpSvhUXTnTGSEZqWf97J2+1Z6VuVwmUOlnhiwI=
649-
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.13.3 h1:9DZDISle23rdgWH8YBBujCWnEqUOQ9RAh6/G8wEHb3w=
650-
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.13.3/go.mod h1:dMBt/b/LXfXTDLQTCW6PRhBlbl41q7XS+5mAyBezSJk=
649+
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.14.0 h1:8cFo0UG2r9kWwUAHRBTAG5wEt4G80+wkWdjQW6DhU6Y=
650+
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.14.0/go.mod h1:dMBt/b/LXfXTDLQTCW6PRhBlbl41q7XS+5mAyBezSJk=
651651
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.4 h1:lOlg8zYL2nwMi1JxDYW2p8LL4cSB3eoOjlqPHioDWU0=
652652
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.4/go.mod h1:MBlzqmewliF1LKeOBdOuT+aQrtc3y7p1Kd1fWkjecKQ=
653653
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.2.3 h1:1gLKXD91qOYUpackMuu0PdRwrm2Z8vFK+k8H7SF0xbg=
@@ -658,8 +658,8 @@ github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.4 h1:h4aS
658658
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.4/go.mod h1:Iv+svIxk5baXnvrEdvVl5JZri6a3H/2OrQDlRWmUFMI=
659659
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.2.0 h1:DRp1p0Gb1YZSnFXgkiKTHQD9bFfqn6OC3PcsDjqGJiw=
660660
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.2.0/go.mod h1:XHOtGgBwwCqPSoQt2ojIRb/BeOd4kICwb9RuMXXFGt8=
661-
github.com/stackitcloud/stackit-sdk-go/services/ske v1.5.1 h1:HVlBylGwXVR3qDUGwUMqofAcLEawRaWSgeYXbyAcN1E=
662-
github.com/stackitcloud/stackit-sdk-go/services/ske v1.5.1/go.mod h1:NzcTU5GGlUF6Lys3Ra7ylRj4ZKxJr3f/29/yoE5tjPI=
661+
github.com/stackitcloud/stackit-sdk-go/services/ske v1.6.0 h1:Dab1jzN0u9c67lvELoWf1RuagjO3eUBRytoX8SYL8Zs=
662+
github.com/stackitcloud/stackit-sdk-go/services/ske v1.6.0/go.mod h1:NzcTU5GGlUF6Lys3Ra7ylRj4ZKxJr3f/29/yoE5tjPI=
663663
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.4.0 h1:KgIRTw4gpxx8qoiaLGLbXPVDcBgCxPl60gigw+tizYc=
664664
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.4.0/go.mod h1:fd13ANCU/Pye8uDd/6E0I605+6PYfHuVIQpPEK2Ph6c=
665665
github.com/stbenjam/no-sprintf-host-port v0.3.1 h1:AyX7+dxI4IdLBPtDbsGAyqiTSLpCP9hWRrXQDU4Cm/g=

‎internal/cmd/beta/edge/instance/create/create.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ type createRequestSpec struct {
124124
// Exported fields allow tests to inspect the request inputs
125125
ProjectID string
126126
Region string
127-
Payload edge.PostInstancesPayload
127+
Payload edge.CreateInstancePayload
128128

129129
// Execute is a closure that wraps the actual SDK call
130130
Execute func() (*edge.Instance, error)
@@ -191,15 +191,15 @@ func run(ctx context.Context, model *inputModel, apiClient client.APIClient) (*e
191191

192192
// buildRequest constructs the spec that can be tested.
193193
func buildRequest(ctx context.Context, model *inputModel, apiClient client.APIClient) (*createRequestSpec, error) {
194-
req := apiClient.PostInstances(ctx, model.ProjectId, model.Region)
194+
req := apiClient.CreateInstance(ctx, model.ProjectId, model.Region)
195195

196196
// Build request payload
197-
payload := edge.PostInstancesPayload{
197+
payload := edge.CreateInstancePayload{
198198
DisplayName: &model.DisplayName,
199199
Description: &model.Description,
200200
PlanId: &model.PlanId,
201201
}
202-
req = req.PostInstancesPayload(payload)
202+
req = req.CreateInstancePayload(payload)
203203

204204
return &createRequestSpec{
205205
ProjectID: model.ProjectId,

‎internal/cmd/beta/edge/instance/create/create_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type mockExecutable struct {
4141
resp *edge.Instance
4242
}
4343

44-
func (m *mockExecutable) PostInstancesPayload(_ edge.PostInstancesPayload) edge.ApiPostInstancesRequest {
44+
func (m *mockExecutable) CreateInstancePayload(_ edge.CreateInstancePayload) edge.ApiCreateInstanceRequest {
4545
// This method is needed to satisfy the interface. It allows chaining in buildRequest.
4646
return m
4747
}
@@ -57,12 +57,12 @@ func (m *mockExecutable) Execute() (*edge.Instance, error) {
5757

5858
// mockAPIClient is a mock for the client.APIClient interface
5959
type mockAPIClient struct {
60-
postInstancesMock edge.ApiPostInstancesRequest
60+
createInstanceMock edge.ApiCreateInstanceRequest
6161
}
6262

63-
func (m *mockAPIClient) PostInstances(_ context.Context, _, _ string) edge.ApiPostInstancesRequest {
64-
if m.postInstancesMock != nil {
65-
return m.postInstancesMock
63+
func (m *mockAPIClient) CreateInstance(_ context.Context, _, _ string) edge.ApiCreateInstanceRequest {
64+
if m.createInstanceMock != nil {
65+
return m.createInstanceMock
6666
}
6767
return &mockExecutable{}
6868
}
@@ -80,7 +80,7 @@ func (m *mockAPIClient) GetInstance(_ context.Context, _, _, _ string) edge.ApiG
8080
func (m *mockAPIClient) GetInstanceByName(_ context.Context, _, _, _ string) edge.ApiGetInstanceByNameRequest {
8181
return nil
8282
}
83-
func (m *mockAPIClient) GetInstances(_ context.Context, _, _ string) edge.ApiGetInstancesRequest {
83+
func (m *mockAPIClient) ListInstances(_ context.Context, _, _ string) edge.ApiListInstancesRequest {
8484
return nil
8585
}
8686
func (m *mockAPIClient) UpdateInstance(_ context.Context, _, _, _ string) edge.ApiUpdateInstanceRequest {
@@ -285,13 +285,13 @@ func TestBuildRequest(t *testing.T) {
285285
args: args{
286286
model: fixtureInputModel(),
287287
client: &mockAPIClient{
288-
postInstancesMock: &mockExecutable{},
288+
createInstanceMock: &mockExecutable{},
289289
},
290290
},
291291
want: &createRequestSpec{
292292
ProjectID: testProjectId,
293293
Region: testRegion,
294-
Payload: edge.PostInstancesPayload{
294+
Payload: edge.CreateInstancePayload{
295295
DisplayName: &testName,
296296
Description: &testDescription,
297297
PlanId: &testPlanId,
@@ -331,7 +331,7 @@ func TestRun(t *testing.T) {
331331
args: args{
332332
model: fixtureInputModel(),
333333
client: &mockAPIClient{
334-
postInstancesMock: &mockExecutable{
334+
createInstanceMock: &mockExecutable{
335335
resp: &edge.Instance{Id: &testInstanceId},
336336
},
337337
},
@@ -343,7 +343,7 @@ func TestRun(t *testing.T) {
343343
args: args{
344344
model: fixtureInputModel(),
345345
client: &mockAPIClient{
346-
postInstancesMock: &mockExecutable{
346+
createInstanceMock: &mockExecutable{
347347
executeFails: true,
348348
},
349349
},

‎internal/cmd/beta/edge/instance/delete/delete_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (m *mockAPIClient) DeleteInstanceByName(_ context.Context, _, _, _ string)
7474
}
7575

7676
// Unused methods to satisfy the client.APIClient interface.
77-
func (m *mockAPIClient) PostInstances(_ context.Context, _, _ string) edge.ApiPostInstancesRequest {
77+
func (m *mockAPIClient) CreateInstance(_ context.Context, _, _ string) edge.ApiCreateInstanceRequest {
7878
return nil
7979
}
8080
func (m *mockAPIClient) GetInstance(_ context.Context, _, _, _ string) edge.ApiGetInstanceRequest {
@@ -83,7 +83,7 @@ func (m *mockAPIClient) GetInstance(_ context.Context, _, _, _ string) edge.ApiG
8383
func (m *mockAPIClient) GetInstanceByName(_ context.Context, _, _, _ string) edge.ApiGetInstanceByNameRequest {
8484
return nil
8585
}
86-
func (m *mockAPIClient) GetInstances(_ context.Context, _, _ string) edge.ApiGetInstancesRequest {
86+
func (m *mockAPIClient) ListInstances(_ context.Context, _, _ string) edge.ApiListInstancesRequest {
8787
return nil
8888
}
8989
func (m *mockAPIClient) UpdateInstance(_ context.Context, _, _, _ string) edge.ApiUpdateInstanceRequest {

‎internal/cmd/beta/edge/instance/describe/describe_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ func (m *mockAPIClient) GetInstanceByName(_ context.Context, _, _, _ string) edg
7575
}
7676

7777
// Unused methods to satisfy the interface
78-
func (m *mockAPIClient) PostInstances(_ context.Context, _, _ string) edge.ApiPostInstancesRequest {
78+
func (m *mockAPIClient) CreateInstance(_ context.Context, _, _ string) edge.ApiCreateInstanceRequest {
7979
return nil
8080
}
81-
func (m *mockAPIClient) GetInstances(_ context.Context, _, _ string) edge.ApiGetInstancesRequest {
81+
func (m *mockAPIClient) ListInstances(_ context.Context, _, _ string) edge.ApiListInstancesRequest {
8282
return nil
8383
}
8484
func (m *mockAPIClient) UpdateInstance(_ context.Context, _, _, _ string) edge.ApiUpdateInstanceRequest {

0 commit comments

Comments
 (0)