chore(cdn): Adjust code for cdn v1.2.0

Signed-off-by: Alexander Dahmen <alexander.dahmen@inovex.de>

Author: Fyusel

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

@@ -301,13 +301,15 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *cdn.APIClie
 		payload.DefaultCacheDuration = utils.Ptr(model.DefaultCacheDuration)
 	}
 	if model.Loki != nil {
-		payload.LogSink = &cdn.LokiLogSinkCreate{
-			Credentials: cdn.LokiLogSinkCredentials{
-				Password: model.Loki.Password,
-				Username: model.Loki.Username,
+		payload.LogSink = &cdn.CreateDistributionPayloadLogSink{
+			LokiLogSinkCreate: &cdn.LokiLogSinkCreate{
+				Credentials: cdn.LokiLogSinkCredentials{
+					Password: model.Loki.Password,
+					Username: model.Loki.Username,
+				},
+				PushUrl: model.Loki.PushURL,
+				Type:    "loki",
 			},
-			PushUrl: model.Loki.PushURL,
-			Type:    "loki",
 		}
 	}
 	payload.MonthlyLimitBytes = model.MonthlyLimitBytes

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

@@ -167,10 +167,12 @@ func payloadBucketBackend() func(payload *cdn.CreateDistributionPayload) {
 
 func payloadLoki() func(payload *cdn.CreateDistributionPayload) {
 	return func(payload *cdn.CreateDistributionPayload) {
-		payload.LogSink = &cdn.LokiLogSinkCreate{
-			Type:        "loki",
-			PushUrl:     "https://loki.example.com",
-			Credentials: *cdn.NewLokiLogSinkCredentials("", "loki-user"),
+		payload.LogSink = &cdn.CreateDistributionPayloadLogSink{
+			LokiLogSinkCreate: &cdn.LokiLogSinkCreate{
+				Type:        "loki",
+				PushUrl:     "https://loki.example.com",
+				Credentials: *cdn.NewLokiLogSinkCredentials("", "loki-user"),
+			},
 		}
 	}
 }

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

@@ -125,8 +125,8 @@ func buildDistributionTable(d *cdn.Distribution) tables.Table {
 		defaultCacheDuration = *d.Config.DefaultCacheDuration.Get()
 	}
 	logSinkPushUrl := ""
-	if d.Config.LogSink != nil && d.Config.LogSink.PushUrl != "" {
-		logSinkPushUrl = d.Config.LogSink.PushUrl
+	if d.Config.LogSink != nil && d.Config.LogSink.LokiLogSink != nil && d.Config.LogSink.LokiLogSink.PushUrl != "" {
+		logSinkPushUrl = d.Config.LogSink.LokiLogSink.PushUrl
 	}
 	monthlyLimitBytes := ""
 	if d.Config.MonthlyLimitBytes.IsSet() && d.Config.MonthlyLimitBytes.Get() != nil {

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

@@ -328,8 +328,10 @@ func TestOutputResult(t *testing.T) {
 					r.Distribution.Config.BlockedCountries = []string{"US", "CN"}
 					r.Distribution.Config.BlockedIps = []string{"127.0.0.1"}
 					r.Distribution.Config.DefaultCacheDuration = *cdn.NewNullableString(utils.Ptr("P1DT2H30M"))
-					r.Distribution.Config.LogSink = &cdn.LokiLogSink{
-						PushUrl: "https://logs.example.com",
+					r.Distribution.Config.LogSink = &cdn.ConfigLogSink{
+						LokiLogSink: &cdn.LokiLogSink{
+							PushUrl: "https://logs.example.com",
+						},
 					}
 					monthlyLimit := int64(104857600)
 					r.Distribution.Config.MonthlyLimitBytes = *cdn.NewNullableInt64(&monthlyLimit)

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

@@ -298,7 +298,8 @@ func buildRequest(ctx context.Context, apiClient *cdn.APIClient, model *inputMod
 	}
 	if model.Loki != nil {
 		loki := &cdn.LokiLogSinkPatch{}
-		cfg.LogSink = *cdn.NewNullableLokiLogSinkPatch(loki)
+		logSink := cdn.LokiLogSinkPatchAsConfigPatchLogSink(loki)
+		cfg.LogSink = *cdn.NewNullableConfigPatchLogSink(&logSink)
 		if model.Loki.PushURL != "" {
 			loki.PushUrl = utils.Ptr(model.Loki.PushURL)
 		}

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

@@ -245,12 +245,13 @@ func TestBuildRequest(t *testing.T) {
 					payload.Config.DefaultCacheDuration = *cdn.NewNullableString(utils.Ptr(testCacheDuration))
 					monthlyLimitBytes := testMonthlyLimitBytes
 					payload.Config.MonthlyLimitBytes = *cdn.NewNullableInt64(&monthlyLimitBytes)
-					payload.Config.LogSink = *cdn.NewNullableLokiLogSinkPatch(
+					logSink := cdn.LokiLogSinkPatchAsConfigPatchLogSink(
 						&cdn.LokiLogSinkPatch{
 							Credentials: cdn.NewLokiLogSinkCredentials("loki-pass", "loki-user"),
 							PushUrl:     utils.Ptr("https://loki.example.com"),
 						},
 					)
+					payload.Config.LogSink = *cdn.NewNullableConfigPatchLogSink(&logSink)
 					payload.Config.Optimizer = &cdn.OptimizerPatch{
 						Enabled: utils.Ptr(true),
 					}
@@ -315,7 +316,7 @@ func TestBuildRequest(t *testing.T) {
 					cdn.ApiPatchDistributionRequest{},
 					cdn.NullableString{},
 					cdn.NullableInt64{},
-					cdn.NullableLokiLogSinkPatch{},
+					cdn.NullableConfigPatchLogSink{},
 					cdn.DefaultAPIService{},
 				),
 				cmpopts.EquateComparable(testCtx),