Skip to content

Commit cb2d821

Browse files
FyuselFyusel
committed
chore(observablity): Update version to v0.17.0
Signed-off-by: Alexander Dahmen <alexander.dahmen@inovex.de>
1 parent 1ab23db commit cb2d821

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

‎internal/cmd/observability/scrape-config/create/create_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var testProjectId = uuid.NewString()
2626
var testInstanceId = uuid.NewString()
2727

2828
var testPayload = &observability.CreateScrapeConfigPayload{
29-
BasicAuth: &observability.CreateScrapeConfigPayloadBasicAuth{
29+
BasicAuth: &observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth{
3030
Username: utils.Ptr("username"),
3131
Password: utils.Ptr("password"),
3232
},
@@ -35,9 +35,9 @@ var testPayload = &observability.CreateScrapeConfigPayload{
3535
HonorTimeStamps: utils.Ptr(true),
3636
MetricsPath: utils.Ptr("/metrics"),
3737
JobName: utils.Ptr("default-name"),
38-
MetricsRelabelConfigs: &[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{
38+
MetricsRelabelConfigs: &[]observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner{
3939
{
40-
Action: observability.CREATESCRAPECONFIGPAYLOADMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(),
40+
Action: observability.PARTIALUPDATESCRAPECONFIGSREQUESTINNERMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(),
4141
Modulus: utils.Ptr(1.0),
4242
Regex: utils.Ptr("regex"),
4343
Replacement: utils.Ptr("replacement"),
@@ -54,7 +54,7 @@ var testPayload = &observability.CreateScrapeConfigPayload{
5454
Scheme: observability.CREATESCRAPECONFIGPAYLOADSCHEME_HTTPS.Ptr(),
5555
ScrapeInterval: utils.Ptr("interval"),
5656
ScrapeTimeout: utils.Ptr("timeout"),
57-
StaticConfigs: &[]observability.CreateScrapeConfigPayloadStaticConfigsInner{
57+
StaticConfigs: &[]observability.PartialUpdateScrapeConfigsRequestInnerStaticConfigsInner{
5858
{
5959
Labels: &map[string]interface{}{
6060
"label": "value",
@@ -63,7 +63,7 @@ var testPayload = &observability.CreateScrapeConfigPayload{
6363
Targets: &[]string{"target"},
6464
},
6565
},
66-
TlsConfig: &observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig{
66+
TlsConfig: &observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig{
6767
InsecureSkipVerify: utils.Ptr(true),
6868
},
6969
}

‎internal/cmd/observability/scrape-config/update/update_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ var testInstanceId = uuid.NewString()
2424
var testJobName = "my-config"
2525

2626
var testPayload = observability.UpdateScrapeConfigPayload{
27-
BasicAuth: &observability.CreateScrapeConfigPayloadBasicAuth{
27+
BasicAuth: &observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth{
2828
Username: utils.Ptr("username"),
2929
Password: utils.Ptr("password"),
3030
},
3131
BearerToken: utils.Ptr("bearerToken"),
3232
HonorLabels: utils.Ptr(true),
3333
HonorTimeStamps: utils.Ptr(true),
3434
MetricsPath: utils.Ptr("/metrics"),
35-
MetricsRelabelConfigs: &[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{
35+
MetricsRelabelConfigs: &[]observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner{
3636
{
37-
Action: observability.CREATESCRAPECONFIGPAYLOADMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(),
37+
Action: observability.PARTIALUPDATESCRAPECONFIGSREQUESTINNERMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(),
3838
Modulus: utils.Ptr(1.0),
3939
Regex: utils.Ptr("regex"),
4040
Replacement: utils.Ptr("replacement"),

‎internal/pkg/services/observability/utils/utils.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ type ObservabilityClient interface {
2121
}
2222

2323
var (
24-
defaultStaticConfigs = []observability.CreateScrapeConfigPayloadStaticConfigsInner{
24+
defaultStaticConfigs = []observability.PartialUpdateScrapeConfigsRequestInnerStaticConfigsInner{
2525
{
2626
Targets: utils.Ptr([]string{
2727
"url-target",
@@ -120,14 +120,14 @@ func MapToUpdateScrapeConfigPayload(resp *observability.GetScrapeConfigResponse)
120120
return &payload, nil
121121
}
122122

123-
func mapMetricsRelabelConfig(metricsRelabelConfigs *[]observability.MetricsRelabelConfig) *[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner {
123+
func mapMetricsRelabelConfig(metricsRelabelConfigs *[]observability.MetricsRelabelConfig) *[]observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner {
124124
if metricsRelabelConfigs == nil {
125125
return nil
126126
}
127-
var mappedConfigs []observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner
127+
var mappedConfigs []observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner
128128
for _, config := range *metricsRelabelConfigs {
129-
mappedConfig := observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{
130-
Action: observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInnerGetActionAttributeType(config.Action),
129+
mappedConfig := observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner{
130+
Action: observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInnerGetActionAttributeType(config.Action),
131131
Modulus: utils.ConvertInt64PToFloat64P(config.Modulus),
132132
Regex: config.Regex,
133133
Replacement: config.Replacement,
@@ -160,23 +160,23 @@ func mapStaticConfig(staticConfigs *[]observability.StaticConfigs) *[]observabil
160160
return &mappedConfigs
161161
}
162162

163-
func mapBasicAuth(basicAuth *observability.BasicAuth) *observability.CreateScrapeConfigPayloadBasicAuth {
163+
func mapBasicAuth(basicAuth *observability.BasicAuth) *observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth {
164164
if basicAuth == nil {
165165
return nil
166166
}
167167

168-
return &observability.CreateScrapeConfigPayloadBasicAuth{
168+
return &observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth{
169169
Password: basicAuth.Password,
170170
Username: basicAuth.Username,
171171
}
172172
}
173173

174-
func mapTlsConfig(tlsConfig *observability.TLSConfig) *observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig {
174+
func mapTlsConfig(tlsConfig *observability.TLSConfig) *observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig {
175175
if tlsConfig == nil {
176176
return nil
177177
}
178178

179-
return &observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig{
179+
return &observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig{
180180
InsecureSkipVerify: tlsConfig.InsecureSkipVerify,
181181
}
182182
}

‎internal/pkg/services/observability/utils/utils_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,17 @@ func fixtureGetScrapeConfigResponse(mods ...func(*observability.GetScrapeConfigR
8989

9090
func fixtureUpdateScrapeConfigPayload(mods ...func(*observability.UpdateScrapeConfigPayload)) *observability.UpdateScrapeConfigPayload {
9191
payload := &observability.UpdateScrapeConfigPayload{
92-
BasicAuth: &observability.CreateScrapeConfigPayloadBasicAuth{
92+
BasicAuth: &observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth{
9393
Username: utils.Ptr("username"),
9494
Password: utils.Ptr("password"),
9595
},
9696
BearerToken: utils.Ptr("bearerToken"),
9797
HonorLabels: utils.Ptr(true),
9898
HonorTimeStamps: utils.Ptr(true),
9999
MetricsPath: utils.Ptr("/metrics"),
100-
MetricsRelabelConfigs: &[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{
100+
MetricsRelabelConfigs: &[]observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner{
101101
{
102-
Action: utils.Ptr(observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInnerAction("replace")),
102+
Action: observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInnerGetActionAttributeType(utils.Ptr("replace")),
103103
Modulus: utils.Ptr(1.0),
104104
Regex: utils.Ptr("regex"),
105105
Replacement: utils.Ptr("replacement"),
@@ -125,7 +125,7 @@ func fixtureUpdateScrapeConfigPayload(mods ...func(*observability.UpdateScrapeCo
125125
Targets: &[]string{"target"},
126126
},
127127
},
128-
TlsConfig: &observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig{
128+
TlsConfig: &observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig{
129129
InsecureSkipVerify: utils.Ptr(true),
130130
},
131131
}
@@ -426,7 +426,7 @@ func TestMapMetricsRelabelConfig(t *testing.T) {
426426
tests := []struct {
427427
description string
428428
config *[]observability.MetricsRelabelConfig
429-
expected *[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner
429+
expected *[]observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner
430430
}{
431431
{
432432
description: "base case",
@@ -441,9 +441,9 @@ func TestMapMetricsRelabelConfig(t *testing.T) {
441441
TargetLabel: utils.Ptr("targetLabel"),
442442
},
443443
},
444-
expected: &[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{
444+
expected: &[]observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner{
445445
{
446-
Action: observability.CREATESCRAPECONFIGPAYLOADMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(),
446+
Action: observability.PARTIALUPDATESCRAPECONFIGSREQUESTINNERMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(),
447447
Modulus: utils.Float64Ptr(1.0),
448448
Regex: utils.Ptr("regex"),
449449
Replacement: utils.Ptr("replacement"),
@@ -540,23 +540,23 @@ func TestMapBasicAuth(t *testing.T) {
540540
tests := []struct {
541541
description string
542542
auth *observability.BasicAuth
543-
expected *observability.CreateScrapeConfigPayloadBasicAuth
543+
expected *observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth
544544
}{
545545
{
546546
description: "base case",
547547
auth: &observability.BasicAuth{
548548
Username: utils.Ptr("username"),
549549
Password: utils.Ptr("password"),
550550
},
551-
expected: &observability.CreateScrapeConfigPayloadBasicAuth{
551+
expected: &observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth{
552552
Username: utils.Ptr("username"),
553553
Password: utils.Ptr("password"),
554554
},
555555
},
556556
{
557557
description: "empty data",
558558
auth: &observability.BasicAuth{},
559-
expected: &observability.CreateScrapeConfigPayloadBasicAuth{},
559+
expected: &observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth{},
560560
},
561561
{
562562
description: "nil",
@@ -585,21 +585,21 @@ func TestMapTlsConfig(t *testing.T) {
585585
tests := []struct {
586586
description string
587587
config *observability.TLSConfig
588-
expected *observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig
588+
expected *observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig
589589
}{
590590
{
591591
description: "base case",
592592
config: &observability.TLSConfig{
593593
InsecureSkipVerify: utils.Ptr(true),
594594
},
595-
expected: &observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig{
595+
expected: &observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig{
596596
InsecureSkipVerify: utils.Ptr(true),
597597
},
598598
},
599599
{
600600
description: "empty data",
601601
config: &observability.TLSConfig{},
602-
expected: &observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig{},
602+
expected: &observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig{},
603603
},
604604
{
605605
description: "nil",

0 commit comments

Comments
 (0)