Skip to content

Commit ebae6ad

Browse files
committed
chore(trdl-vault): replace project-name flag with arg
Signed-off-by: Evgeniy Frolov <evgeniy.frolov@flant.com>
1 parent e7c1916 commit ebae6ad

File tree

3 files changed

+9
-19
lines changed

3 files changed

+9
-19
lines changed

release/cmd/trdl-vault/main.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ func main() {
2626
log := logger.NewLogger(slog.LevelInfo)
2727

2828
var publishCmd = &cobra.Command{
29-
Use: "publish",
29+
Use: "publish <project-name>",
3030
Short: "Publish operation",
31+
Args: cobra.MinimumNArgs(1),
3132
RunE: func(cmd *cobra.Command, args []string) error {
33+
projectName := args[0]
3234
client, err := newVaultClient(
3335
*commonCmdData.VaultAddress,
3436
*commonCmdData.VaultToken,
@@ -42,7 +44,7 @@ func main() {
4244
return err
4345
}
4446

45-
err = client.Publish(*commonCmdData.ProjectName)
47+
err = client.Publish(projectName)
4648
if err != nil {
4749
log.Error("", fmt.Sprintf("Publish failed: %v", err))
4850
return err
@@ -54,11 +56,12 @@ func main() {
5456
}
5557

5658
var releaseCmd = &cobra.Command{
57-
Use: "release <git-tag>",
59+
Use: "release <project-name> <git-tag>",
5860
Short: "Release operation",
59-
Args: cobra.MinimumNArgs(1),
61+
Args: cobra.MinimumNArgs(2),
6062
RunE: func(cmd *cobra.Command, args []string) error {
61-
gitTag := args[0]
63+
projectName := args[0]
64+
gitTag := args[1]
6265
client, err := newVaultClient(
6366
*commonCmdData.VaultAddress,
6467
*commonCmdData.VaultToken,
@@ -72,7 +75,7 @@ func main() {
7275
return err
7376
}
7477

75-
err = client.Release(*commonCmdData.ProjectName, gitTag)
78+
err = client.Release(projectName, gitTag)
7679
if err != nil {
7780
log.Error("", fmt.Sprintf("Release failed: %v", err))
7881
return err
@@ -83,7 +86,6 @@ func main() {
8386
},
8487
}
8588

86-
common.SetupProjectName(&commonCmdData, cmd)
8789
common.SetupVaultAddress(&commonCmdData, cmd)
8890
common.SetupVaultToken(&commonCmdData, cmd)
8991
common.SetupRetry(&commonCmdData, cmd)

release/common/cmd_data.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package common
33
import "time"
44

55
type CmdData struct {
6-
ProjectName *string
7-
GitTag *string
86
VaultAddress *string
97
VaultToken *string
108
Retry *bool

release/common/common.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
11
package common
22

33
import (
4-
"log"
54
"net/url"
65
"os"
76
"time"
87

98
"github.com/spf13/cobra"
109
)
1110

12-
func SetupProjectName(cmdData *CmdData, cmd *cobra.Command) {
13-
cmdData.ProjectName = new(string)
14-
cmd.PersistentFlags().StringVarP(cmdData.ProjectName, "project-name", "N", os.Getenv("TRDL_PROJECT_NAME"), "Set a specific project name")
15-
if *cmdData.ProjectName == "" {
16-
log.Fatal("Project name is required. Please specify the --project-name flag or set the TRDL_PROJECT_NAME environment variable.")
17-
}
18-
19-
}
20-
2111
func SetupVaultAddress(cmdData *CmdData, cmd *cobra.Command) {
2212
cmdData.VaultAddress = new(string)
2313
defaultValue := "http://localhost:8200"

0 commit comments

Comments
 (0)