Skip to content

Commit 1cb1cf2

Browse files
Galin-KarabadzhakovGalin-Karabadzhakov
authored
Merge branch 'main' into feat/support-wif-ske-exec
2 parents b91442f + f14e531 commit 1cb1cf2

8 files changed

Lines changed: 40 additions & 32 deletions

File tree

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,25 @@ require (
1919
github.com/stackitcloud/stackit-sdk-go/services/alb v0.17.1
2020
github.com/stackitcloud/stackit-sdk-go/services/albwaf v0.13.1
2121
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.15.2
22-
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.19.0
23-
github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0
22+
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.20.0
23+
github.com/stackitcloud/stackit-sdk-go/services/dns v0.22.1
2424
github.com/stackitcloud/stackit-sdk-go/services/edge v0.13.1
2525
github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0
26-
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.13.0
26+
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.14.1
2727
github.com/stackitcloud/stackit-sdk-go/services/intake v0.11.1
2828
github.com/stackitcloud/stackit-sdk-go/services/logs v0.10.1
2929
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.12.0
3030
github.com/stackitcloud/stackit-sdk-go/services/opensearch v1.1.0
3131
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.12.0
32-
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.0
32+
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.2
3333
github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.8.0
3434
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.18.2
3535
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.7.0
3636
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.2
3737
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.20.0
3838
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.1
3939
github.com/stackitcloud/stackit-sdk-go/services/ske v1.21.1
40-
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.17.0
40+
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.18.0
4141
github.com/stackitcloud/stackit-sdk-go/services/vpn v0.15.0
4242
github.com/zalando/go-keyring v0.2.8
4343
golang.org/x/mod v0.39.0

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -598,16 +598,16 @@ github.com/stackitcloud/stackit-sdk-go/services/albwaf v0.13.1 h1:NsUOizMbRrIyvx
598598
github.com/stackitcloud/stackit-sdk-go/services/albwaf v0.13.1/go.mod h1:4M9G1I64kZwlXO32ZoIpt0GAN4SpZ1SYerwCVVIBGoE=
599599
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.15.2 h1:b7WJ/vwxlVmNNX91kI3obqGcuoPAyaCbDL5aCMQ/sNg=
600600
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.15.2/go.mod h1:T/JF25XGJ3GqER/1L2N//DgY8x5tY7gA3N+/0nvmOWY=
601-
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.19.0 h1:k+KJ4gp9awhJMY5y55vDqRSr6G/S9+8haTNILGbgH9s=
602-
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.19.0/go.mod h1:MHB1N3EQ9GuAduAQoNS+gb1MjrWJieszbpOso9TQv5s=
603-
github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0 h1:ZVkptfVCAqpaPWkE+WIopM9XdzqgbVcwmX5L1jZqqx8=
604-
github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0/go.mod h1:FiYSv3D9rzgEVzi8Mpq5oYZBosrasa5uUYqVdEIbM1U=
601+
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.20.0 h1:p/8f/+Z+OtqX0cau2CqkidjfO3FkHPc7ymdrF1zv7UY=
602+
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.20.0/go.mod h1:MHB1N3EQ9GuAduAQoNS+gb1MjrWJieszbpOso9TQv5s=
603+
github.com/stackitcloud/stackit-sdk-go/services/dns v0.22.1 h1:vC0GpKVKH1Tce9VNyZTMWbheyGGS9a9GZWv6H5/z4Ek=
604+
github.com/stackitcloud/stackit-sdk-go/services/dns v0.22.1/go.mod h1:FiYSv3D9rzgEVzi8Mpq5oYZBosrasa5uUYqVdEIbM1U=
605605
github.com/stackitcloud/stackit-sdk-go/services/edge v0.13.1 h1:N36I7MavPdDUb0GJXmwNzjEdypJEizW4eQi+/YOzedM=
606606
github.com/stackitcloud/stackit-sdk-go/services/edge v0.13.1/go.mod h1:Ylse6gqGJtsd5TVmvha+hoLd1QQHLKvhY5dO15+q5kg=
607607
github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0 h1:VZBneGprCmHqckcSMPs3puBlK8rBpLMtYKmBktwdoVE=
608608
github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0/go.mod h1:YZEL+gaK+ELn5E9VtK8yvz5RcmCBH+JkRpf6YbNVSbM=
609-
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.13.0 h1:PQZ6n71CMadLU3DjJxJXiPHdK9Bz4hMttBREQD6no34=
610-
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.13.0/go.mod h1:AbPN9BGkdjc+tVsXEX9Vr8BPDjdlDmG26K1FwCKZQVU=
609+
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.14.1 h1:P8XhOi8TLA7NbLHhxU8dCJjgQpha/65agos3pI59+vw=
610+
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.14.1/go.mod h1:/QpOsaCOQjwGgQqG8y9xXqryp25AfkorPjInX9xIeOU=
611611
github.com/stackitcloud/stackit-sdk-go/services/intake v0.11.1 h1:f9sKrmLxBK9g0zS9qGGDFVQx+6HjBALL18ibfPFOqPw=
612612
github.com/stackitcloud/stackit-sdk-go/services/intake v0.11.1/go.mod h1:UXhPs7JXjQvTp14d4ZffSLnFMQyB7y1cj100XWwQudI=
613613
github.com/stackitcloud/stackit-sdk-go/services/kms v1.11.0 h1:OrUaDypQNr1nOXZfVQXCwUpN4YhR5y0vtvYi9/Ogoi4=
@@ -634,8 +634,8 @@ github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v1.2.1 h1:AG+2SPyXYEcCE
634634
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v1.2.1/go.mod h1:TwfVVynB/+AKbccSOLk2qZpPL1tdK43BBAiACP6EtSg=
635635
github.com/stackitcloud/stackit-sdk-go/services/redis v1.1.0 h1:ckYMRXAGE2/vaxPeNGEuun9AGcFn/8xuu0ytfsiqfWU=
636636
github.com/stackitcloud/stackit-sdk-go/services/redis v1.1.0/go.mod h1:yjej6QfYoYdRIyKXlmbVz8fZYxbuUdl+QBkvLDPgA4k=
637-
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.0 h1:JPP6a0ME1tZXr4iB69d/LtJsCAr58ENBadFaK9f48/c=
638-
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.0/go.mod h1:NEz3f+GV5G++BE9/MmZCsXJyCih7jtg0pZuSyG2sLEs=
637+
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.2 h1:4UxxJmCSCwV8q4bT4G+D1JH8F9Gm6BKaLGixX5DVcvI=
638+
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.2/go.mod h1:NEz3f+GV5G++BE9/MmZCsXJyCih7jtg0pZuSyG2sLEs=
639639
github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.8.0 h1:T5gy5i+NxrpJPYDEJNjGjljhfD7PWTFia7us8A4mL/c=
640640
github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.8.0/go.mod h1:iB27HtF0UcAugURc9w+nlNrtbAj7Mukw/ptAz+7p2WE=
641641
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.18.2 h1:1MvnXjo5C73HPErKY7pWIg7j2QXrH9z/axCVihEIvNo=
@@ -652,8 +652,8 @@ github.com/stackitcloud/stackit-sdk-go/services/sfs v0.11.1 h1:EF9vDpfyjREUOPZVu
652652
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.11.1/go.mod h1:jMlBoXqrPNX5nXbo6oT7exalqilw1jiLPoIp4Cn0CdI=
653653
github.com/stackitcloud/stackit-sdk-go/services/ske v1.21.1 h1:dSkUoaMip0uA8tnRERjT8A/3JFpx7Gux0qpxI5oGO1k=
654654
github.com/stackitcloud/stackit-sdk-go/services/ske v1.21.1/go.mod h1:TbqmZhLMofmfl+HhVl6oHYcI3zvXTm1vRjN3A/fOkM4=
655-
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.17.0 h1:skiTu1l1H0gumo9kosp5fSzrjWDZWcUM5pBH6aqUaG8=
656-
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.17.0/go.mod h1:AiUoMAqQcOlMgDtkVJlqI7P/VGD5xjN3dYjERGnwN/M=
655+
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.18.0 h1:k4dgOFQvkBhSNTtmFOZwMbkKf6ZCEGB/D1WQgiO9gwc=
656+
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.18.0/go.mod h1:AiUoMAqQcOlMgDtkVJlqI7P/VGD5xjN3dYjERGnwN/M=
657657
github.com/stackitcloud/stackit-sdk-go/services/vpn v0.15.0 h1:JpMJjWBa6fwNNcAHoq00v+8+DwMD0/fe4WPjvbHdY2o=
658658
github.com/stackitcloud/stackit-sdk-go/services/vpn v0.15.0/go.mod h1:toIjQk1dhxdUFVyCWJJja0w/0nFpDid8MWX0ukQfvfo=
659659
github.com/stbenjam/no-sprintf-host-port v0.3.1 h1:AyX7+dxI4IdLBPtDbsGAyqiTSLpCP9hWRrXQDU4Cm/g=

‎internal/cmd/beta/cdn/distribution/create/create.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,13 +301,15 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *cdn.APIClie
301301
payload.DefaultCacheDuration = utils.Ptr(model.DefaultCacheDuration)
302302
}
303303
if model.Loki != nil {
304-
payload.LogSink = &cdn.LokiLogSinkCreate{
305-
Credentials: cdn.LokiLogSinkCredentials{
306-
Password: model.Loki.Password,
307-
Username: model.Loki.Username,
304+
payload.LogSink = &cdn.CreateDistributionPayloadLogSink{
305+
LokiLogSinkCreate: &cdn.LokiLogSinkCreate{
306+
Credentials: cdn.LokiLogSinkCredentials{
307+
Password: model.Loki.Password,
308+
Username: model.Loki.Username,
309+
},
310+
PushUrl: model.Loki.PushURL,
311+
Type: "loki",
308312
},
309-
PushUrl: model.Loki.PushURL,
310-
Type: "loki",
311313
}
312314
}
313315
payload.MonthlyLimitBytes = model.MonthlyLimitBytes

‎internal/cmd/beta/cdn/distribution/create/create_test.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,12 @@ func payloadBucketBackend() func(payload *cdn.CreateDistributionPayload) {
167167

168168
func payloadLoki() func(payload *cdn.CreateDistributionPayload) {
169169
return func(payload *cdn.CreateDistributionPayload) {
170-
payload.LogSink = &cdn.LokiLogSinkCreate{
171-
Type: "loki",
172-
PushUrl: "https://loki.example.com",
173-
Credentials: *cdn.NewLokiLogSinkCredentials("", "loki-user"),
170+
payload.LogSink = &cdn.CreateDistributionPayloadLogSink{
171+
LokiLogSinkCreate: &cdn.LokiLogSinkCreate{
172+
Type: "loki",
173+
PushUrl: "https://loki.example.com",
174+
Credentials: *cdn.NewLokiLogSinkCredentials("", "loki-user"),
175+
},
174176
}
175177
}
176178
}

‎internal/cmd/beta/cdn/distribution/describe/describe.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ func buildDistributionTable(d *cdn.Distribution) tables.Table {
125125
defaultCacheDuration = *d.Config.DefaultCacheDuration.Get()
126126
}
127127
logSinkPushUrl := ""
128-
if d.Config.LogSink != nil && d.Config.LogSink.PushUrl != "" {
129-
logSinkPushUrl = d.Config.LogSink.PushUrl
128+
if d.Config.LogSink != nil && d.Config.LogSink.LokiLogSink != nil && d.Config.LogSink.LokiLogSink.PushUrl != "" {
129+
logSinkPushUrl = d.Config.LogSink.LokiLogSink.PushUrl
130130
}
131131
monthlyLimitBytes := ""
132132
if d.Config.MonthlyLimitBytes.IsSet() && d.Config.MonthlyLimitBytes.Get() != nil {

‎internal/cmd/beta/cdn/distribution/describe/describe_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,10 @@ func TestOutputResult(t *testing.T) {
328328
r.Distribution.Config.BlockedCountries = []string{"US", "CN"}
329329
r.Distribution.Config.BlockedIps = []string{"127.0.0.1"}
330330
r.Distribution.Config.DefaultCacheDuration = *cdn.NewNullableString(utils.Ptr("P1DT2H30M"))
331-
r.Distribution.Config.LogSink = &cdn.LokiLogSink{
332-
PushUrl: "https://logs.example.com",
331+
r.Distribution.Config.LogSink = &cdn.ConfigLogSink{
332+
LokiLogSink: &cdn.LokiLogSink{
333+
PushUrl: "https://logs.example.com",
334+
},
333335
}
334336
monthlyLimit := int64(104857600)
335337
r.Distribution.Config.MonthlyLimitBytes = *cdn.NewNullableInt64(&monthlyLimit)

‎internal/cmd/beta/cdn/distribution/update/update.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,8 @@ func buildRequest(ctx context.Context, apiClient *cdn.APIClient, model *inputMod
298298
}
299299
if model.Loki != nil {
300300
loki := &cdn.LokiLogSinkPatch{}
301-
cfg.LogSink = *cdn.NewNullableLokiLogSinkPatch(loki)
301+
logSink := cdn.LokiLogSinkPatchAsConfigPatchLogSink(loki)
302+
cfg.LogSink = *cdn.NewNullableConfigPatchLogSink(&logSink)
302303
if model.Loki.PushURL != "" {
303304
loki.PushUrl = utils.Ptr(model.Loki.PushURL)
304305
}

‎internal/cmd/beta/cdn/distribution/update/update_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,12 +245,13 @@ func TestBuildRequest(t *testing.T) {
245245
payload.Config.DefaultCacheDuration = *cdn.NewNullableString(utils.Ptr(testCacheDuration))
246246
monthlyLimitBytes := testMonthlyLimitBytes
247247
payload.Config.MonthlyLimitBytes = *cdn.NewNullableInt64(&monthlyLimitBytes)
248-
payload.Config.LogSink = *cdn.NewNullableLokiLogSinkPatch(
248+
logSink := cdn.LokiLogSinkPatchAsConfigPatchLogSink(
249249
&cdn.LokiLogSinkPatch{
250250
Credentials: cdn.NewLokiLogSinkCredentials("loki-pass", "loki-user"),
251251
PushUrl: utils.Ptr("https://loki.example.com"),
252252
},
253253
)
254+
payload.Config.LogSink = *cdn.NewNullableConfigPatchLogSink(&logSink)
254255
payload.Config.Optimizer = &cdn.OptimizerPatch{
255256
Enabled: utils.Ptr(true),
256257
}
@@ -315,7 +316,7 @@ func TestBuildRequest(t *testing.T) {
315316
cdn.ApiPatchDistributionRequest{},
316317
cdn.NullableString{},
317318
cdn.NullableInt64{},
318-
cdn.NullableLokiLogSinkPatch{},
319+
cdn.NullableConfigPatchLogSink{},
319320
cdn.DefaultAPIService{},
320321
),
321322
cmpopts.EquateComparable(testCtx),

0 commit comments

Comments
 (0)