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 docs/stackit_beta_cdn_distribution_list.md
Original file line number Diff line number Diff line change
Expand Up @@ -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")
```

Expand Down
4 changes: 4 additions & 0 deletions internal/cmd/beta/cdn/distribution/delete/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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{
Expand Down
6 changes: 6 additions & 0 deletions internal/cmd/beta/cdn/distribution/delete/delete_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{},
Expand Down
5 changes: 3 additions & 2 deletions internal/cmd/beta/cdn/distribution/list/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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)
Expand Down Expand Up @@ -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
}
Expand Down
34 changes: 34 additions & 0 deletions internal/cmd/beta/cdn/distribution/list/list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down
16 changes: 16 additions & 0 deletions internal/cmd/beta/cdn/distribution/update/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/beta/cdn/distribution/update/update_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading