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 @@ -25,7 +25,7 @@ stackit beta cdn distribution list [flags]
```
-- int Limit the output to the first n elements
-h, --help Help for "stackit beta cdn distribution list"
--sort-by string Sort entries by a specific field, (one of: [id, createdAt, updatedAt, originUrl, status, originUrlRelated]) (default "createdAt")
--sort-by string Sort entries by a specific field, (one of: [id, updatedAt, createdAt, originUrl, status, originUrlRelated]) (default "createdAt")
```

### Options inherited from parent commands
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
github.com/stackitcloud/stackit-sdk-go/core v0.26.0
github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.2
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.15.2
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.16.0
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.19.0
github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0
github.com/stackitcloud/stackit-sdk-go/services/edge v0.13.1
github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,8 @@ github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.2 h1:hGzfOJjlCRoFpri5e
github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.2/go.mod h1:eK6oRB5Tmpt6KbXQ4UYBGg2LgW5bPtVoncL9E8JSRww=
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.15.2 h1:b7WJ/vwxlVmNNX91kI3obqGcuoPAyaCbDL5aCMQ/sNg=
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.15.2/go.mod h1:T/JF25XGJ3GqER/1L2N//DgY8x5tY7gA3N+/0nvmOWY=
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.16.0 h1:Wqxx0PDTL2F5gqI5jjznuJY0TdqECltjA0aa/rHY63U=
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.16.0/go.mod h1:MHB1N3EQ9GuAduAQoNS+gb1MjrWJieszbpOso9TQv5s=
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.19.0 h1:k+KJ4gp9awhJMY5y55vDqRSr6G/S9+8haTNILGbgH9s=
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.19.0/go.mod h1:MHB1N3EQ9GuAduAQoNS+gb1MjrWJieszbpOso9TQv5s=
github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0 h1:ZVkptfVCAqpaPWkE+WIopM9XdzqgbVcwmX5L1jZqqx8=
github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0/go.mod h1:FiYSv3D9rzgEVzi8Mpq5oYZBosrasa5uUYqVdEIbM1U=
github.com/stackitcloud/stackit-sdk-go/services/edge v0.13.1 h1:N36I7MavPdDUb0GJXmwNzjEdypJEizW4eQi+/YOzedM=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/google/uuid"
cdn "github.com/stackitcloud/stackit-sdk-go/services/cdn/v1api"
"github.com/stackitcloud/stackit-sdk-go/services/cdn/v1api/wait"

"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"

Expand Down Expand Up @@ -79,7 +78,7 @@ func fixtureResponse(mods ...func(resp *cdn.GetDistributionResponse)) *cdn.GetDi
Errors: nil,
Id: testDistributionID,
ProjectId: testProjectID,
Status: wait.DISTRIBUTIONSTATUS_ACTIVE,
Status: cdn.DISTRIBUTIONSTATUS_ACTIVE,
UpdatedAt: testTime,
Waf: nil,
},
Expand Down
6 changes: 3 additions & 3 deletions internal/cmd/beta/cdn/distribution/list/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

type inputModel struct {
*globalflags.GlobalFlagModel
SortBy string
SortBy cdn.ListDistributionsSortByParameter
Limit *int32
}

Expand All @@ -34,9 +34,9 @@ const (

var sortByFlag = flags.StringEnumFlag(
"sort-by",
[]string{"id", "createdAt", "updatedAt", "originUrl", "status", "originUrlRelated"},
cdn.AllowedListDistributionsSortByParameterEnumValues,
"Sort entries by a specific field,",
flags.StringEnumDefaultValue("createdAt"),
flags.StringEnumDefaultValue(cdn.LISTDISTRIBUTIONSSORTBYPARAMETER_CREATED_AT),
)

func NewCmd(params *types.CmdParams) *cobra.Command {
Expand Down
7 changes: 3 additions & 4 deletions internal/cmd/beta/cdn/distribution/list/list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"github.com/google/uuid"
sdkConfig "github.com/stackitcloud/stackit-sdk-go/core/config"
cdn "github.com/stackitcloud/stackit-sdk-go/services/cdn/v1api"
"github.com/stackitcloud/stackit-sdk-go/services/cdn/v1api/wait"

"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"

Expand All @@ -32,7 +31,7 @@ var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
const (
testNextPageID = "next-page-id-123"
testID = "dist-1"
testStatus = wait.DISTRIBUTIONSTATUS_ACTIVE
testStatus = cdn.DISTRIBUTIONSTATUS_ACTIVE
)

func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
Expand Down Expand Up @@ -62,7 +61,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
func fixtureRequest(mods ...func(request cdn.ApiListDistributionsRequest) cdn.ApiListDistributionsRequest) cdn.ApiListDistributionsRequest {
request := testClient.DefaultAPI.ListDistributions(testCtx, testProjectId)
request = request.PageSize(100)
request = request.SortBy("createdAt")
request = request.SortBy(cdn.LISTDISTRIBUTIONSSORTBYPARAMETER_CREATED_AT)
for _, mod := range mods {
request = mod(request)
}
Expand Down Expand Up @@ -196,7 +195,7 @@ func TestBuildRequest(t *testing.T) {
model.SortBy = "updatedAt"
}),
expected: fixtureRequest(func(req cdn.ApiListDistributionsRequest) cdn.ApiListDistributionsRequest {
return req.SortBy("updatedAt")
return req.SortBy(cdn.LISTDISTRIBUTIONSSORTBYPARAMETER_UPDATED_AT)
}),
},
{
Expand Down