Skip to content

Commit d58a374

Browse files
ThisIsDemetrioThisIsDemetrio
authored
feat: marketplace features removed from alpha build (#221)
1 parent 0482b00 commit d58a374

File tree

5 files changed

+24
-69
lines changed

5 files changed

+24
-69
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616

1717
- deprecate `deploy` command
1818
- update go version to 1.22.5
19+
- `marketplace list-versions` command removed from alpha build
1920

2021
## [v0.14.0] - 2024-07-25
2122

‎internal/cmd/marketplace.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"github.com/mia-platform/miactl/internal/clioptions"
2020
"github.com/mia-platform/miactl/internal/cmd/marketplace"
2121
marketplace_apply "github.com/mia-platform/miactl/internal/cmd/marketplace/apply"
22-
"github.com/mia-platform/miactl/internal/util"
2322
"github.com/spf13/cobra"
2423
)
2524

@@ -40,11 +39,7 @@ func MarketplaceCmd(options *clioptions.CLIOptions) *cobra.Command {
4039
cmd.AddCommand(marketplace.GetCmd(options))
4140
cmd.AddCommand(marketplace.DeleteCmd(options))
4241
cmd.AddCommand(marketplace_apply.ApplyCmd(options))
43-
44-
// ALPHA commands
45-
if util.AlphaCommandsEnabled() {
46-
cmd.AddCommand(marketplace.ListVersionCmd(options))
47-
}
42+
cmd.AddCommand(marketplace.ListVersionCmd(options))
4843

4944
return cmd
5045
}

‎internal/cmd/marketplace/delete.go

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"github.com/mia-platform/miactl/internal/client"
2525
"github.com/mia-platform/miactl/internal/clioptions"
2626
"github.com/mia-platform/miactl/internal/resources/marketplace"
27-
"github.com/mia-platform/miactl/internal/util"
2827
"github.com/spf13/cobra"
2928
)
3029

@@ -34,7 +33,7 @@ const (
3433
// deleteItemByTupleEndpointTemplate formatting template for item deletion by the tuple itemID versionID endpoint; specify companyID, itemID, version
3534
deleteItemByTupleEndpointTemplate = "/api/backend/marketplace/tenants/%s/resources/%s/versions/%s"
3635

37-
cmdDeleteAlphaLong = `Delete a single Marketplace item
36+
cmdDeleteLongDescription = `Delete a single Marketplace item
3837
3938
You need to specify either:
4039
- the companyId, itemId and version, via the respective flags (recommended). The company-id flag can be omitted if it is already set in the context.
@@ -43,13 +42,7 @@ const (
4342
Passing the ObjectID is expected only when dealing with deprecated Marketplace items missing the itemId and/or version fields.
4443
Otherwise, it is preferable to pass the tuple companyId-itemId-version.
4544
`
46-
cmdDeleteStableLong = `Delete a single Marketplace item
47-
48-
You need to specify the ObjectID of the item with the flag object-id.
49-
`
50-
51-
cmdDeleteAlphaUse = "delete { --item-id item-id --version version } | --object-id object-id [flags]..."
52-
cmdDeleteStableUse = "delete --object-id object-id [flags]..."
45+
cmdUse = "delete { --item-id item-id --version version } | --object-id object-id [flags]..."
5346
)
5447

5548
var (
@@ -59,19 +52,10 @@ var (
5952

6053
// DeleteCmd return a new cobra command for deleting a single marketplace resource
6154
func DeleteCmd(options *clioptions.CLIOptions) *cobra.Command {
62-
var long, use string
63-
if util.AlphaCommandsEnabled() {
64-
long = cmdDeleteAlphaLong
65-
use = cmdDeleteAlphaUse
66-
} else {
67-
long = cmdDeleteStableLong
68-
use = cmdDeleteStableUse
69-
}
70-
7155
cmd := &cobra.Command{
72-
Use: use,
56+
Use: cmdUse,
7357
Short: "Delete a Marketplace item",
74-
Long: long,
58+
Long: cmdDeleteLongDescription,
7559
SuggestFor: []string{"rm"},
7660
RunE: func(cmd *cobra.Command, _ []string) error {
7761
restConfig, err := options.ToRESTConfig()
@@ -108,17 +92,13 @@ func DeleteCmd(options *clioptions.CLIOptions) *cobra.Command {
10892

10993
itemObjectIDFlagName := options.AddMarketplaceItemObjectIDFlag(cmd.Flags())
11094

111-
if util.AlphaCommandsEnabled() {
112-
itemIDFlagName := options.AddMarketplaceItemIDFlag(cmd.Flags())
113-
versionFlagName := options.AddMarketplaceVersionFlag(cmd.Flags())
95+
itemIDFlagName := options.AddMarketplaceItemIDFlag(cmd.Flags())
96+
versionFlagName := options.AddMarketplaceVersionFlag(cmd.Flags())
11497

115-
cmd.MarkFlagsRequiredTogether(itemIDFlagName, versionFlagName)
116-
cmd.MarkFlagsMutuallyExclusive(itemObjectIDFlagName, itemIDFlagName)
117-
cmd.MarkFlagsMutuallyExclusive(itemObjectIDFlagName, versionFlagName)
118-
cmd.MarkFlagsOneRequired(itemObjectIDFlagName, itemIDFlagName, versionFlagName)
119-
} else {
120-
cmd.MarkFlagsOneRequired(itemObjectIDFlagName)
121-
}
98+
cmd.MarkFlagsRequiredTogether(itemIDFlagName, versionFlagName)
99+
cmd.MarkFlagsMutuallyExclusive(itemObjectIDFlagName, itemIDFlagName)
100+
cmd.MarkFlagsMutuallyExclusive(itemObjectIDFlagName, versionFlagName)
101+
cmd.MarkFlagsOneRequired(itemObjectIDFlagName, itemIDFlagName, versionFlagName)
122102

123103
return cmd
124104
}

‎internal/cmd/marketplace/get.go

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@ import (
2323
"github.com/mia-platform/miactl/internal/clioptions"
2424
"github.com/mia-platform/miactl/internal/encoding"
2525
"github.com/mia-platform/miactl/internal/resources/marketplace"
26-
"github.com/mia-platform/miactl/internal/util"
2726
"github.com/spf13/cobra"
2827
)
2928

3029
const (
3130
getItemByObjectIDEndpointTemplate = "/api/backend/marketplace/%s"
3231
getItemByItemIDAndVersionEndpointTemplate = "/api/backend/marketplace/tenants/%s/resources/%s/versions/%s"
3332

34-
cmdGetAlphaLong = `Get a single Marketplace item
33+
cmdGetLongDescription = `Get a single Marketplace item
3534
3635
You need to specify either:
3736
- the companyId, itemId and version, via the respective flags (recommended). The company-id flag can be omitted if it is already set in the context.
@@ -40,29 +39,15 @@ const (
4039
Passing the ObjectID is expected only when dealing with deprecated Marketplace items missing the itemId and/or version fields.
4140
Otherwise, it is preferable to pass the tuple companyId-itemId-version.
4241
`
43-
cmdGetStableLong = `Get a single Marketplace item
44-
45-
You need to specify the ObjectID of the item with the flag object-id
46-
`
47-
cmdGetAlphaUse = "get { --item-id item-id --version version } | --object-id object-id [FLAGS]..."
48-
cmdGetStableUse = "get --object-id object-id [FLAGS]..."
42+
cmdGetUse = "get { --item-id item-id --version version } | --object-id object-id [FLAGS]..."
4943
)
5044

5145
// GetCmd return a new cobra command for getting a single marketplace resource
5246
func GetCmd(options *clioptions.CLIOptions) *cobra.Command {
53-
var long, use string
54-
if util.AlphaCommandsEnabled() {
55-
long = cmdGetAlphaLong
56-
use = cmdGetAlphaUse
57-
} else {
58-
long = cmdGetStableLong
59-
use = cmdGetStableUse
60-
}
61-
6247
cmd := &cobra.Command{
63-
Use: use,
48+
Use: cmdGetUse,
6449
Short: "Get Marketplace item",
65-
Long: long,
50+
Long: cmdGetLongDescription,
6651
RunE: func(cmd *cobra.Command, _ []string) error {
6752
restConfig, err := options.ToRESTConfig()
6853
cobra.CheckErr(err)
@@ -89,17 +74,13 @@ func GetCmd(options *clioptions.CLIOptions) *cobra.Command {
8974

9075
itemObjectIDFlagName := options.AddMarketplaceItemObjectIDFlag(cmd.Flags())
9176

92-
if util.AlphaCommandsEnabled() {
93-
itemIDFlagName := options.AddMarketplaceItemIDFlag(cmd.Flags())
94-
versionFlagName := options.AddMarketplaceVersionFlag(cmd.Flags())
77+
itemIDFlagName := options.AddMarketplaceItemIDFlag(cmd.Flags())
78+
versionFlagName := options.AddMarketplaceVersionFlag(cmd.Flags())
9579

96-
cmd.MarkFlagsRequiredTogether(itemIDFlagName, versionFlagName)
97-
cmd.MarkFlagsMutuallyExclusive(itemObjectIDFlagName, itemIDFlagName)
98-
cmd.MarkFlagsMutuallyExclusive(itemObjectIDFlagName, versionFlagName)
99-
cmd.MarkFlagsOneRequired(itemObjectIDFlagName, itemIDFlagName, versionFlagName)
100-
} else {
101-
cmd.MarkFlagsOneRequired(itemObjectIDFlagName)
102-
}
80+
cmd.MarkFlagsRequiredTogether(itemIDFlagName, versionFlagName)
81+
cmd.MarkFlagsMutuallyExclusive(itemObjectIDFlagName, itemIDFlagName)
82+
cmd.MarkFlagsMutuallyExclusive(itemObjectIDFlagName, versionFlagName)
83+
cmd.MarkFlagsOneRequired(itemObjectIDFlagName, itemIDFlagName, versionFlagName)
10384

10485
return cmd
10586
}

‎internal/cmd/marketplace/list_versions.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,9 @@ var (
3838
func ListVersionCmd(options *clioptions.CLIOptions) *cobra.Command {
3939
cmd := &cobra.Command{
4040
Use: "list-versions",
41-
Short: "List versions of a Marketplace item (ALPHA)",
41+
Short: "List versions of a Marketplace item",
4242
Long: `List the currently available versions of a Marketplace item.
43-
The command will output a table with each version of the item.
44-
45-
This command is in ALPHA state. This means that it can be subject to breaking changes in the next versions of miactl.`,
43+
The command will output a table with each version of the item.`,
4644
Run: func(cmd *cobra.Command, _ []string) {
4745
restConfig, err := options.ToRESTConfig()
4846
cobra.CheckErr(err)

0 commit comments

Comments
 (0)