Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ require (
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.6
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.25.6
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.4.5
github.com/stackitcloud/stackit-sdk-go/services/observability v0.16.3
github.com/stackitcloud/stackit-sdk-go/services/observability v0.17.0
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.26.0
github.com/stackitcloud/stackit-sdk-go/services/redis v0.25.6
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.3.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -628,8 +628,8 @@ github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.8 h1:S7t4wcT6SN
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.8/go.mod h1:CdrhFUsBO7/iJleCc2yQjDChIbG6YaxKNBQRNCjgcF4=
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.4.5 h1:4gpvB6t7d2lLjInoTxcvjL9jCpBl5EDfYe5yUtR1MvA=
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.4.5/go.mod h1:Bdcd59sRySyhfSUCy+5BNkp5w9PECmrywdvt+ORMKnI=
github.com/stackitcloud/stackit-sdk-go/services/observability v0.16.3 h1:J/R6iBALMiNpg+JDEx1adH50TM4UTF/KBYFuHENMKIs=
github.com/stackitcloud/stackit-sdk-go/services/observability v0.16.3/go.mod h1:9KdrXC5JS30Ay3mR0adb3vNdhca+qxiy/cPF5P4wehQ=
github.com/stackitcloud/stackit-sdk-go/services/observability v0.17.0 h1:LGwCvvST0fwUgZ6bOxYIfu45qqTgv421ZS07UhKjZL8=
github.com/stackitcloud/stackit-sdk-go/services/observability v0.17.0/go.mod h1:9KdrXC5JS30Ay3mR0adb3vNdhca+qxiy/cPF5P4wehQ=
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.6 h1:oTVx1+O177Ojn8OvXIOUbRSwtx7L59jhxDPrZEQFOfQ=
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.6/go.mod h1:6ZBeCCY6qG8w1oK7osf61Egyv3mp7Ahv6GDGxiarDGo=
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5 h1:H67e3KnHQx954yI8fuQmxXwRf/myqAdLg2KvxImp00g=
Expand Down
10 changes: 5 additions & 5 deletions internal/cmd/observability/scrape-config/create/create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var testProjectId = uuid.NewString()
var testInstanceId = uuid.NewString()

var testPayload = &observability.CreateScrapeConfigPayload{
BasicAuth: &observability.CreateScrapeConfigPayloadBasicAuth{
BasicAuth: &observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth{
Username: utils.Ptr("username"),
Password: utils.Ptr("password"),
},
Expand All @@ -35,9 +35,9 @@ var testPayload = &observability.CreateScrapeConfigPayload{
HonorTimeStamps: utils.Ptr(true),
MetricsPath: utils.Ptr("/metrics"),
JobName: utils.Ptr("default-name"),
MetricsRelabelConfigs: &[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{
MetricsRelabelConfigs: &[]observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner{
{
Action: observability.CREATESCRAPECONFIGPAYLOADMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(),
Action: observability.PARTIALUPDATESCRAPECONFIGSREQUESTINNERMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(),
Modulus: utils.Ptr(1.0),
Regex: utils.Ptr("regex"),
Replacement: utils.Ptr("replacement"),
Expand All @@ -54,7 +54,7 @@ var testPayload = &observability.CreateScrapeConfigPayload{
Scheme: observability.CREATESCRAPECONFIGPAYLOADSCHEME_HTTPS.Ptr(),
ScrapeInterval: utils.Ptr("interval"),
ScrapeTimeout: utils.Ptr("timeout"),
StaticConfigs: &[]observability.CreateScrapeConfigPayloadStaticConfigsInner{
StaticConfigs: &[]observability.PartialUpdateScrapeConfigsRequestInnerStaticConfigsInner{
{
Labels: &map[string]interface{}{
"label": "value",
Expand All @@ -63,7 +63,7 @@ var testPayload = &observability.CreateScrapeConfigPayload{
Targets: &[]string{"target"},
},
},
TlsConfig: &observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig{
TlsConfig: &observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig{
InsecureSkipVerify: utils.Ptr(true),
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ var testInstanceId = uuid.NewString()
var testJobName = "my-config"

var testPayload = observability.UpdateScrapeConfigPayload{
BasicAuth: &observability.CreateScrapeConfigPayloadBasicAuth{
BasicAuth: &observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth{
Username: utils.Ptr("username"),
Password: utils.Ptr("password"),
},
BearerToken: utils.Ptr("bearerToken"),
HonorLabels: utils.Ptr(true),
HonorTimeStamps: utils.Ptr(true),
MetricsPath: utils.Ptr("/metrics"),
MetricsRelabelConfigs: &[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{
MetricsRelabelConfigs: &[]observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner{
{
Action: observability.CREATESCRAPECONFIGPAYLOADMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(),
Action: observability.PARTIALUPDATESCRAPECONFIGSREQUESTINNERMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(),
Modulus: utils.Ptr(1.0),
Regex: utils.Ptr("regex"),
Replacement: utils.Ptr("replacement"),
Expand Down
18 changes: 9 additions & 9 deletions internal/pkg/services/observability/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type ObservabilityClient interface {
}

var (
defaultStaticConfigs = []observability.CreateScrapeConfigPayloadStaticConfigsInner{
defaultStaticConfigs = []observability.PartialUpdateScrapeConfigsRequestInnerStaticConfigsInner{
{
Targets: utils.Ptr([]string{
"url-target",
Expand Down Expand Up @@ -120,14 +120,14 @@ func MapToUpdateScrapeConfigPayload(resp *observability.GetScrapeConfigResponse)
return &payload, nil
}

func mapMetricsRelabelConfig(metricsRelabelConfigs *[]observability.MetricsRelabelConfig) *[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner {
func mapMetricsRelabelConfig(metricsRelabelConfigs *[]observability.MetricsRelabelConfig) *[]observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner {
if metricsRelabelConfigs == nil {
return nil
}
var mappedConfigs []observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner
var mappedConfigs []observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner
for _, config := range *metricsRelabelConfigs {
mappedConfig := observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{
Action: observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInnerGetActionAttributeType(config.Action),
mappedConfig := observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner{
Action: observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInnerGetActionAttributeType(config.Action),
Modulus: utils.ConvertInt64PToFloat64P(config.Modulus),
Regex: config.Regex,
Replacement: config.Replacement,
Expand Down Expand Up @@ -160,23 +160,23 @@ func mapStaticConfig(staticConfigs *[]observability.StaticConfigs) *[]observabil
return &mappedConfigs
}

func mapBasicAuth(basicAuth *observability.BasicAuth) *observability.CreateScrapeConfigPayloadBasicAuth {
func mapBasicAuth(basicAuth *observability.BasicAuth) *observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth {
if basicAuth == nil {
return nil
}

return &observability.CreateScrapeConfigPayloadBasicAuth{
return &observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth{
Password: basicAuth.Password,
Username: basicAuth.Username,
}
}

func mapTlsConfig(tlsConfig *observability.TLSConfig) *observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig {
func mapTlsConfig(tlsConfig *observability.TLSConfig) *observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig {
if tlsConfig == nil {
return nil
}

return &observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig{
return &observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig{
InsecureSkipVerify: tlsConfig.InsecureSkipVerify,
}
}
Expand Down
26 changes: 13 additions & 13 deletions internal/pkg/services/observability/utils/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,17 @@ func fixtureGetScrapeConfigResponse(mods ...func(*observability.GetScrapeConfigR

func fixtureUpdateScrapeConfigPayload(mods ...func(*observability.UpdateScrapeConfigPayload)) *observability.UpdateScrapeConfigPayload {
payload := &observability.UpdateScrapeConfigPayload{
BasicAuth: &observability.CreateScrapeConfigPayloadBasicAuth{
BasicAuth: &observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth{
Username: utils.Ptr("username"),
Password: utils.Ptr("password"),
},
BearerToken: utils.Ptr("bearerToken"),
HonorLabels: utils.Ptr(true),
HonorTimeStamps: utils.Ptr(true),
MetricsPath: utils.Ptr("/metrics"),
MetricsRelabelConfigs: &[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{
MetricsRelabelConfigs: &[]observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner{
{
Action: utils.Ptr(observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInnerAction("replace")),
Action: observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInnerGetActionAttributeType(utils.Ptr("replace")),
Modulus: utils.Ptr(1.0),
Regex: utils.Ptr("regex"),
Replacement: utils.Ptr("replacement"),
Expand All @@ -125,7 +125,7 @@ func fixtureUpdateScrapeConfigPayload(mods ...func(*observability.UpdateScrapeCo
Targets: &[]string{"target"},
},
},
TlsConfig: &observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig{
TlsConfig: &observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig{
InsecureSkipVerify: utils.Ptr(true),
},
}
Expand Down Expand Up @@ -426,7 +426,7 @@ func TestMapMetricsRelabelConfig(t *testing.T) {
tests := []struct {
description string
config *[]observability.MetricsRelabelConfig
expected *[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner
expected *[]observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner
}{
{
description: "base case",
Expand All @@ -441,9 +441,9 @@ func TestMapMetricsRelabelConfig(t *testing.T) {
TargetLabel: utils.Ptr("targetLabel"),
},
},
expected: &[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{
expected: &[]observability.PartialUpdateScrapeConfigsRequestInnerMetricsRelabelConfigsInner{
{
Action: observability.CREATESCRAPECONFIGPAYLOADMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(),
Action: observability.PARTIALUPDATESCRAPECONFIGSREQUESTINNERMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(),
Modulus: utils.Float64Ptr(1.0),
Regex: utils.Ptr("regex"),
Replacement: utils.Ptr("replacement"),
Expand Down Expand Up @@ -540,23 +540,23 @@ func TestMapBasicAuth(t *testing.T) {
tests := []struct {
description string
auth *observability.BasicAuth
expected *observability.CreateScrapeConfigPayloadBasicAuth
expected *observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth
}{
{
description: "base case",
auth: &observability.BasicAuth{
Username: utils.Ptr("username"),
Password: utils.Ptr("password"),
},
expected: &observability.CreateScrapeConfigPayloadBasicAuth{
expected: &observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth{
Username: utils.Ptr("username"),
Password: utils.Ptr("password"),
},
},
{
description: "empty data",
auth: &observability.BasicAuth{},
expected: &observability.CreateScrapeConfigPayloadBasicAuth{},
expected: &observability.PartialUpdateScrapeConfigsRequestInnerBasicAuth{},
},
{
description: "nil",
Expand Down Expand Up @@ -585,21 +585,21 @@ func TestMapTlsConfig(t *testing.T) {
tests := []struct {
description string
config *observability.TLSConfig
expected *observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig
expected *observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig
}{
{
description: "base case",
config: &observability.TLSConfig{
InsecureSkipVerify: utils.Ptr(true),
},
expected: &observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig{
expected: &observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig{
InsecureSkipVerify: utils.Ptr(true),
},
},
{
description: "empty data",
config: &observability.TLSConfig{},
expected: &observability.CreateScrapeConfigPayloadHttpSdConfigsInnerOauth2TlsConfig{},
expected: &observability.PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig{},
},
{
description: "nil",
Expand Down
Loading