From e8718dd03cc1f83e1307d3a9a0e8c54c103edfb6 Mon Sep 17 00:00:00 2001 From: Jonas Schlecht Date: Tue, 3 Nov 2026 13:58:35 +0100 Subject: [PATCH] fix(cdn): throw error on empty update, fix limit flag in list, check for projectId in delete --- docs/stackit_beta_cdn_distribution_list.md | 2 +- .../beta/cdn/distribution/delete/delete.go | 4 +++ .../cdn/distribution/delete/delete_test.go | 6 ++++ .../cmd/beta/cdn/distribution/list/list.go | 5 +-- .../beta/cdn/distribution/list/list_test.go | 34 +++++++++++++++++++ .../beta/cdn/distribution/update/update.go | 16 +++++++++ .../cdn/distribution/update/update_test.go | 3 +- 7 files changed, 65 insertions(+), 5 deletions(-) diff --git a/docs/stackit_beta_cdn_distribution_list.md b/docs/stackit_beta_cdn_distribution_list.md index 4bc6c3e61..1ca59247b 100644 --- a/docs/stackit_beta_cdn_distribution_list.md +++ b/docs/stackit_beta_cdn_distribution_list.md @@ -24,7 +24,7 @@ stackit beta cdn distribution list [flags] ``` -h, --help Help for "stackit beta cdn distribution list" - --limit int Limit the output to the first n elements + --limit int32 Limit the output to the first n elements --sort-by string Sort entries by a specific field, (one of: [id, updatedAt, createdAt, originUrl, status, originUrlRelated]) (default "createdAt") ``` diff --git a/internal/cmd/beta/cdn/distribution/delete/delete.go b/internal/cmd/beta/cdn/distribution/delete/delete.go index c2d6e832c..c41bcbae9 100644 --- a/internal/cmd/beta/cdn/distribution/delete/delete.go +++ b/internal/cmd/beta/cdn/distribution/delete/delete.go @@ -8,6 +8,7 @@ import ( cdn "github.com/stackitcloud/stackit-sdk-go/services/cdn/v1api" "github.com/stackitcloud/stackit-cli/internal/pkg/args" + "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" "github.com/stackitcloud/stackit-cli/internal/pkg/print" @@ -77,6 +78,9 @@ func NewCmd(params *types.CmdParams) *cobra.Command { func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) { globalFlags := globalflags.Parse(p, cmd) + if globalFlags.ProjectId == "" { + return nil, &errors.ProjectIdError{} + } distributionID := inputArgs[0] model := inputModel{ diff --git a/internal/cmd/beta/cdn/distribution/delete/delete_test.go b/internal/cmd/beta/cdn/distribution/delete/delete_test.go index 00fe5b7fe..de2f6181b 100644 --- a/internal/cmd/beta/cdn/distribution/delete/delete_test.go +++ b/internal/cmd/beta/cdn/distribution/delete/delete_test.go @@ -87,6 +87,12 @@ func TestParseInput(t *testing.T) { }, isValid: false, }, + { + description: "no project id", + argsValues: fixtureArgValues(), + flagValues: map[string]string{}, + isValid: false, + }, { description: "no arg values", argsValues: []string{}, diff --git a/internal/cmd/beta/cdn/distribution/list/list.go b/internal/cmd/beta/cdn/distribution/list/list.go index 21855c3bd..3bfd4589f 100644 --- a/internal/cmd/beta/cdn/distribution/list/list.go +++ b/internal/cmd/beta/cdn/distribution/list/list.go @@ -84,7 +84,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { func configureFlags(cmd *cobra.Command) { // same default as apiClient sortByFlag.Register(cmd.Flags()) - cmd.Flags().Int64(limitFlag, 0, "Limit the output to the first n elements") + cmd.Flags().Int32(limitFlag, 0, "Limit the output to the first n elements") } func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) { @@ -104,6 +104,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, model := inputModel{ GlobalFlagModel: globalFlags, SortBy: sortByFlag.Get(), + Limit: limit, } p.DebugInputModel(model) @@ -173,7 +174,7 @@ func fetchDistributions(ctx context.Context, model *inputModel, apiClient *cdn.A if response.NextPageIdentifier != nil { nextPageID = *response.NextPageIdentifier } - received += want + received += int32(len(response.Distributions)) //nolint:gosec //is safe since this is limited by the in32 limit flag if nextPageID == "" || received >= limit { break } diff --git a/internal/cmd/beta/cdn/distribution/list/list_test.go b/internal/cmd/beta/cdn/distribution/list/list_test.go index ccac0814c..291bf015f 100644 --- a/internal/cmd/beta/cdn/distribution/list/list_test.go +++ b/internal/cmd/beta/cdn/distribution/list/list_test.go @@ -168,6 +168,22 @@ func TestParseInput(t *testing.T) { model.SortBy = "createdAt" }), }, + { + description: "limit", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[limitFlag] = "25" + }), + isValid: true, + expected: fixtureInputModel(func(model *inputModel) { + model.Limit = utils.Ptr(int32(25)) + }), + }, + { + description: "zero limit", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[limitFlag] = "0" + }), + }, } for _, tt := range tests { @@ -365,6 +381,24 @@ func TestFetchDistributions(t *testing.T) { }, expected: slices.Concat(fixtureDistributions(100), fixtureDistributions(10)), }, + { + description: "limit counts results across short pages", + limit: 110, + responses: []testResponse{ + fixtureTestResponse(func(resp *testResponse) { + resp.body.NextPageIdentifier = utils.Ptr(testNextPageID) + resp.body.Distributions = fixtureDistributions(1) + }), + fixtureTestResponse(func(resp *testResponse) { + resp.body.NextPageIdentifier = utils.Ptr("third-page") + resp.body.Distributions = fixtureDistributions(2)[1:] + }), + fixtureTestResponse(func(resp *testResponse) { + resp.body.Distributions = fixtureDistributions(3)[2:] + }), + }, + expected: fixtureDistributions(3), + }, } for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { diff --git a/internal/cmd/beta/cdn/distribution/update/update.go b/internal/cmd/beta/cdn/distribution/update/update.go index 1e2e489e2..1e006e36c 100644 --- a/internal/cmd/beta/cdn/distribution/update/update.go +++ b/internal/cmd/beta/cdn/distribution/update/update.go @@ -160,6 +160,22 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu if globalFlags.ProjectId == "" { return nil, &errors.ProjectIdError{} } + hasUpdates := false + for _, flag := range []string{ + flagRegions.Name(), flagHTTPOriginURL, flagHTTPGeofencing, flagHTTPOriginRequestHeaders, + flagBucketURL, flagBucketCredentialsAccessKeyID, flagBucketPassword, flagBucketRegion, + flagBlockedCountries, flagBlockedIPs, flagDefaultCacheDuration, + flagLokiUsername, flagLokiPassword, flagLokiPushURL, flagMonthlyLimitBytes, flagOptimizer, + } { + if cmd.Flags().Changed(flag) { + hasUpdates = true + break + } + } + if !hasUpdates { + return nil, &errors.EmptyUpdateError{} + } + distributionID := inputArgs[0] regions := flagRegions.Get() diff --git a/internal/cmd/beta/cdn/distribution/update/update_test.go b/internal/cmd/beta/cdn/distribution/update/update_test.go index 0a082eba7..495661d76 100644 --- a/internal/cmd/beta/cdn/distribution/update/update_test.go +++ b/internal/cmd/beta/cdn/distribution/update/update_test.go @@ -92,8 +92,7 @@ func TestParseInput(t *testing.T) { description: "base", argValues: []string{testDistributionID}, flagValues: fixtureFlagValues(), - isValid: true, - expected: fixtureInputModel(), + isValid: false, }, { description: "distribution id missing",