Skip to content

Commit 4c0c56b

Browse files
GokceGKGokceGK
authored
Merge branch 'main' into feat/region-adjustment-redis
2 parents 74cbbd3 + 8f27014 commit 4c0c56b

52 files changed

Lines changed: 624 additions & 669 deletions

Some content is hidden

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

‎docs/stackit_logme_instance_create.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ stackit logme instance create [flags]
3030
--enable-monitoring Enable monitoring
3131
--graphite string Graphite host
3232
-h, --help Help for "stackit logme instance create"
33-
--metrics-frequency int Metrics frequency
33+
--metrics-frequency int32 Metrics frequency
3434
--metrics-prefix string Metrics prefix
3535
--monitoring-instance-id string Monitoring instance ID
3636
-n, --name string Instance name

‎docs/stackit_logme_instance_update.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ stackit logme instance update INSTANCE_ID [flags]
2727
--enable-monitoring Enable monitoring
2828
--graphite string Graphite host
2929
-h, --help Help for "stackit logme instance update"
30-
--metrics-frequency int Metrics frequency
30+
--metrics-frequency int32 Metrics frequency
3131
--metrics-prefix string Metrics prefix
3232
--monitoring-instance-id string Monitoring instance ID
33+
-n, --name string Instance name
3334
--plan-id string Plan ID
3435
--plan-name string Plan name
3536
--syslog strings Syslog

‎docs/stackit_rabbitmq_instance_create.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ stackit rabbitmq instance create [flags]
3030
--enable-monitoring Enable monitoring
3131
--graphite string Graphite host
3232
-h, --help Help for "stackit rabbitmq instance create"
33-
--metrics-frequency int Metrics frequency
33+
--metrics-frequency int32 Metrics frequency
3434
--metrics-prefix string Metrics prefix
3535
--monitoring-instance-id string Monitoring instance ID
3636
-n, --name string Instance name
3737
--plan-id string Plan ID
3838
--plan-name string Plan name
39-
--plugin strings Plugin
39+
--plugin strings Plugins (multiple of: [rabbitmq_consistent_hash_exchange, rabbitmq_federation, rabbitmq_federation_management, rabbitmq_mqtt, rabbitmq_sharding, rabbitmq_shovel, rabbitmq_shovel_management, rabbitmq_stomp, rabbitmq_tracing, rabbitmq_event_exchange]) (default [])
4040
--syslog strings Syslog
4141
--version string Instance RabbitMQ version
4242
```

‎docs/stackit_rabbitmq_instance_update.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ stackit rabbitmq instance update INSTANCE_ID [flags]
2727
--enable-monitoring Enable monitoring
2828
--graphite string Graphite host
2929
-h, --help Help for "stackit rabbitmq instance update"
30-
--metrics-frequency int Metrics frequency
30+
--metrics-frequency int32 Metrics frequency
3131
--metrics-prefix string Metrics prefix
3232
--monitoring-instance-id string Monitoring instance ID
3333
--plan-id string Plan ID
3434
--plan-name string Plan name
35-
--plugin strings Plugin
35+
--plugin strings Plugins (multiple of: [rabbitmq_consistent_hash_exchange, rabbitmq_federation, rabbitmq_federation_management, rabbitmq_mqtt, rabbitmq_sharding, rabbitmq_shovel, rabbitmq_shovel_management, rabbitmq_stomp, rabbitmq_tracing, rabbitmq_event_exchange]) (default [])
3636
--syslog strings Syslog
3737
--version string Instance RabbitMQ version
3838
```

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,12 @@ require (
267267
github.com/spf13/cast v1.10.0 // indirect
268268
github.com/stackitcloud/stackit-sdk-go/services/kms v1.11.0
269269
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0
270-
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.6
270+
github.com/stackitcloud/stackit-sdk-go/services/logme v0.30.0
271271
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.25.6
272272
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.7.0
273273
github.com/stackitcloud/stackit-sdk-go/services/observability v0.17.0
274-
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.26.0
275-
github.com/stackitcloud/stackit-sdk-go/services/redis v1.1.0
274+
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v1.1.0
275+
github.com/stackitcloud/stackit-sdk-go/services/redis v1.1.0
276276
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.9.0
277277
github.com/subosito/gotenv v1.6.0 // indirect
278278
golang.org/x/sys v0.43.0 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -616,8 +616,8 @@ github.com/stackitcloud/stackit-sdk-go/services/kms v1.11.0 h1:OrUaDypQNr1nOXZfV
616616
github.com/stackitcloud/stackit-sdk-go/services/kms v1.11.0/go.mod h1:pVaCmb1ZHAPGVRlSlBlVOjThp9Tb2sX9+nRX0M+d1KU=
617617
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0 h1:1dvL7tX91ziklayQmOupniE3jM4D5Nbtc0auNcx2p18=
618618
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0/go.mod h1:+Ld3dn648I+YKcBV3fEkYpDSr3fel421+LurJGywSBs=
619-
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.6 h1:4x30lC+YBmo7XpsAzTn0W+C/oP5flnLVgIh5u3O/P0o=
620-
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.6/go.mod h1:ewaYUiZcBTSS6urE5zEJBPCqxu70w2IjnBHCvnKdFKE=
619+
github.com/stackitcloud/stackit-sdk-go/services/logme v0.30.0 h1:csZlzmvAB+klgUQo7AjoGO+YkpdxRFY3yE5Y7SDeB5w=
620+
github.com/stackitcloud/stackit-sdk-go/services/logme v0.30.0/go.mod h1:JDOOYaGgcBts2x52nKPRMFgSZe7qqOFmfz1xIXCQgRY=
621621
github.com/stackitcloud/stackit-sdk-go/services/logs v0.5.2 h1:vr4atxFRT+EL+DqONMT5R44f7AzEMbePa9U7PEE0THU=
622622
github.com/stackitcloud/stackit-sdk-go/services/logs v0.5.2/go.mod h1:CAPsiTX7osAImfrG5RnIjaJ/Iz3QpoBKuH2fS346wuQ=
623623
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.25.6 h1:Y/byRjX2u/OZl0gKS/Rau6ob2bDyv26xnw6A6JNkKJk=
@@ -632,8 +632,8 @@ github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.6 h1:oTVx1+O177
632632
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.6/go.mod h1:6ZBeCCY6qG8w1oK7osf61Egyv3mp7Ahv6GDGxiarDGo=
633633
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5 h1:H67e3KnHQx954yI8fuQmxXwRf/myqAdLg2KvxImp00g=
634634
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5/go.mod h1:xmAWk9eom8wznvLuLfm0F4xyeiBX8LaggXsKFmos+dw=
635-
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.26.0 h1:/8lmviszgrB+0Cz7HdhFELyTiTeqIs7LfnI6sNX4rW8=
636-
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.26.0/go.mod h1:hnhvlLX1Y71R8KIQqLBeoSZqkU5ZJOG0J4wz0LeUdaw=
635+
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v1.1.0 h1:HRJwodJX4aOn/487zaqJIKw13yIj4T6dn7/kEHLxeTg=
636+
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v1.1.0/go.mod h1:TwfVVynB/+AKbccSOLk2qZpPL1tdK43BBAiACP6EtSg=
637637
github.com/stackitcloud/stackit-sdk-go/services/redis v1.1.0 h1:ckYMRXAGE2/vaxPeNGEuun9AGcFn/8xuu0ytfsiqfWU=
638638
github.com/stackitcloud/stackit-sdk-go/services/redis v1.1.0/go.mod h1:yjej6QfYoYdRIyKXlmbVz8fZYxbuUdl+QBkvLDPgA4k=
639639
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.0 h1:JPP6a0ME1tZXr4iB69d/LtJsCAr58ENBadFaK9f48/c=

‎internal/cmd/logme/credentials/create/create.go‎

Lines changed: 12 additions & 13 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/logme"
10+
logme "github.com/stackitcloud/stackit-sdk-go/services/logme/v1api"
1111

1212
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1313
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -51,14 +51,13 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
5151
if err != nil {
5252
return err
5353
}
54-
5554
// Configure API client
5655
apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
5756
if err != nil {
5857
return err
5958
}
6059

61-
instanceLabel, err := logmeUtils.GetInstanceName(ctx, apiClient, model.ProjectId, model.InstanceId)
60+
instanceLabel, err := logmeUtils.GetInstanceName(ctx, apiClient.DefaultAPI, model.ProjectId, model.InstanceId)
6261
if err != nil {
6362
params.Printer.Debug(print.ErrorLevel, "get instance name: %v", err)
6463
instanceLabel = model.InstanceId
@@ -109,7 +108,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
109108
}
110109

111110
func buildRequest(ctx context.Context, model *inputModel, apiClient *logme.APIClient) logme.ApiCreateCredentialsRequest {
112-
req := apiClient.CreateCredentials(ctx, model.ProjectId, model.InstanceId)
111+
req := apiClient.DefaultAPI.CreateCredentials(ctx, model.ProjectId, model.InstanceId)
113112
return req
114113
}
115114

@@ -118,26 +117,26 @@ func outputResult(p *print.Printer, outputFormat string, showPassword bool, inst
118117
return fmt.Errorf("credentials response is empty")
119118
}
120119

121-
if !showPassword && resp.HasRaw() && resp.Raw.Credentials != nil {
122-
resp.Raw.Credentials.Password = utils.Ptr("hidden")
120+
if !showPassword && resp.HasRaw() {
121+
resp.Raw.Credentials.Password = "hidden"
123122
}
124123

125124
return p.OutputResult(outputFormat, resp, func() error {
126-
p.Outputf("Created credentials for instance %q. Credentials ID: %s\n\n", instanceLabel, utils.PtrString(resp.Id))
125+
p.Outputf("Created credentials for instance %q. Credentials ID: %s\n\n", instanceLabel, resp.Id)
127126
// The username field cannot be set by the user so we only display it if it's not returned empty
128-
if resp.HasRaw() && resp.Raw.Credentials != nil {
129-
if username := resp.Raw.Credentials.Username; username != nil && *username != "" {
130-
p.Outputf("Username: %s\n", utils.PtrString(username))
127+
if resp.HasRaw() {
128+
if username := resp.Raw.Credentials.Username; username != "" {
129+
p.Outputf("Username: %s\n", username)
131130
}
132131
if !showPassword {
133132
p.Outputf("Password: <hidden>\n")
134133
} else {
135-
p.Outputf("Password: %s\n", utils.PtrString(resp.Raw.Credentials.Password))
134+
p.Outputf("Password: %s\n", resp.Raw.Credentials.Password)
136135
}
137-
p.Outputf("Host: %s\n", utils.PtrString(resp.Raw.Credentials.Host))
136+
p.Outputf("Host: %s\n", resp.Raw.Credentials.Host)
138137
p.Outputf("Port: %s\n", utils.PtrString(resp.Raw.Credentials.Port))
139138
}
140-
p.Outputf("URI: %s\n", utils.PtrString(resp.Uri))
139+
p.Outputf("URI: %s\n", resp.Uri)
141140
return nil
142141
})
143142
}

‎internal/cmd/logme/credentials/create/create_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
8-
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
9-
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
10-
117
"github.com/google/go-cmp/cmp"
128
"github.com/google/go-cmp/cmp/cmpopts"
139
"github.com/google/uuid"
14-
"github.com/stackitcloud/stackit-sdk-go/services/logme"
10+
logme "github.com/stackitcloud/stackit-sdk-go/services/logme/v1api"
11+
12+
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
13+
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
14+
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
1515
)
1616

1717
var projectIdFlag = globalflags.ProjectIdFlag
1818

1919
type testCtxKey struct{}
2020

2121
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
22-
var testClient = &logme.APIClient{}
22+
var testClient = &logme.APIClient{DefaultAPI: &logme.DefaultAPIService{}}
2323
var testProjectId = uuid.NewString()
2424
var testInstanceId = uuid.NewString()
2525

@@ -49,7 +49,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4949
}
5050

5151
func fixtureRequest(mods ...func(request *logme.ApiCreateCredentialsRequest)) logme.ApiCreateCredentialsRequest {
52-
request := testClient.CreateCredentials(testCtx, testProjectId, testInstanceId)
52+
request := testClient.DefaultAPI.CreateCredentials(testCtx, testProjectId, testInstanceId)
5353
for _, mod := range mods {
5454
mod(&request)
5555
}
@@ -155,7 +155,7 @@ func TestBuildRequest(t *testing.T) {
155155

156156
diff := cmp.Diff(request, tt.expectedRequest,
157157
cmp.AllowUnexported(tt.expectedRequest),
158-
cmpopts.EquateComparable(testCtx),
158+
cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),
159159
)
160160
if diff != "" {
161161
t.Fatalf("Data does not match: %s", diff)

‎internal/cmd/logme/credentials/delete/delete.go‎

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

1919
"github.com/spf13/cobra"
20-
"github.com/stackitcloud/stackit-sdk-go/services/logme"
20+
logme "github.com/stackitcloud/stackit-sdk-go/services/logme/v1api"
2121
)
2222

2323
const (
@@ -56,13 +56,13 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
5656
return err
5757
}
5858

59-
instanceLabel, err := logmeUtils.GetInstanceName(ctx, apiClient, model.ProjectId, model.InstanceId)
59+
instanceLabel, err := logmeUtils.GetInstanceName(ctx, apiClient.DefaultAPI, model.ProjectId, model.InstanceId)
6060
if err != nil {
6161
params.Printer.Debug(print.ErrorLevel, "get instance name: %v", err)
6262
instanceLabel = model.InstanceId
6363
}
6464

65-
credentialsLabel, err := logmeUtils.GetCredentialsUsername(ctx, apiClient, model.ProjectId, model.InstanceId, model.CredentialsId)
65+
credentialsLabel, err := logmeUtils.GetCredentialsUsername(ctx, apiClient.DefaultAPI, model.ProjectId, model.InstanceId, model.CredentialsId)
6666
if err != nil {
6767
params.Printer.Debug(print.ErrorLevel, "get credentials username: %v", err)
6868
credentialsLabel = model.CredentialsId
@@ -115,6 +115,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
115115
}
116116

117117
func buildRequest(ctx context.Context, model *inputModel, apiClient *logme.APIClient) logme.ApiDeleteCredentialsRequest {
118-
req := apiClient.DeleteCredentials(ctx, model.ProjectId, model.InstanceId, model.CredentialsId)
118+
req := apiClient.DefaultAPI.DeleteCredentials(ctx, model.ProjectId, model.InstanceId, model.CredentialsId)
119119
return req
120120
}

‎internal/cmd/logme/credentials/delete/delete_test.go‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@ import (
1010
"github.com/google/go-cmp/cmp"
1111
"github.com/google/go-cmp/cmp/cmpopts"
1212
"github.com/google/uuid"
13-
"github.com/stackitcloud/stackit-sdk-go/services/logme"
13+
logme "github.com/stackitcloud/stackit-sdk-go/services/logme/v1api"
1414
)
1515

1616
var projectIdFlag = globalflags.ProjectIdFlag
1717

1818
type testCtxKey struct{}
1919

2020
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
21-
var testClient = &logme.APIClient{}
21+
var testClient = &logme.APIClient{DefaultAPI: &logme.DefaultAPIService{}}
2222
var testProjectId = uuid.NewString()
2323
var testInstanceId = uuid.NewString()
2424
var testCredentialsId = uuid.NewString()
25+
var testRegion = "region"
2526

2627
func fixtureArgValues(mods ...func(argValues []string)) []string {
2728
argValues := []string{
@@ -35,8 +36,9 @@ func fixtureArgValues(mods ...func(argValues []string)) []string {
3536

3637
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3738
flagValues := map[string]string{
38-
projectIdFlag: testProjectId,
39-
instanceIdFlag: testInstanceId,
39+
projectIdFlag: testProjectId,
40+
instanceIdFlag: testInstanceId,
41+
globalflags.RegionFlag: testRegion,
4042
}
4143
for _, mod := range mods {
4244
mod(flagValues)
@@ -48,6 +50,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4850
model := &inputModel{
4951
GlobalFlagModel: &globalflags.GlobalFlagModel{
5052
ProjectId: testProjectId,
53+
Region: testRegion,
5154
Verbosity: globalflags.VerbosityDefault,
5255
},
5356
InstanceId: testInstanceId,
@@ -60,7 +63,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6063
}
6164

6265
func fixtureRequest(mods ...func(request *logme.ApiDeleteCredentialsRequest)) logme.ApiDeleteCredentialsRequest {
63-
request := testClient.DeleteCredentials(testCtx, testProjectId, testInstanceId, testCredentialsId)
66+
request := testClient.DefaultAPI.DeleteCredentials(testCtx, testProjectId, testInstanceId, testCredentialsId)
6467
for _, mod := range mods {
6568
mod(&request)
6669
}
@@ -188,7 +191,7 @@ func TestBuildRequest(t *testing.T) {
188191

189192
diff := cmp.Diff(request, tt.expectedRequest,
190193
cmp.AllowUnexported(tt.expectedRequest),
191-
cmpopts.EquateComparable(testCtx),
194+
cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),
192195
)
193196
if diff != "" {
194197
t.Fatalf("Data does not match: %s", diff)

0 commit comments

Comments
 (0)