Skip to content

Commit c9d3c5c

Browse files
committed
Add required CLI flags, default to GITHUB_TOKEN when the --token flag is unset, etc
Signed-off-by: timflannagan <[email protected]>
1 parent ec55dea commit c9d3c5c

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

main.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,14 @@ func main() {
1616
cmd := &cobra.Command{
1717
Use: "changelog-generator <token> <owner> <repo> <start-sha> <end-sha> <output-path>",
1818
Short: "Generate a changelog between two commits",
19-
Args: cobra.ExactArgs(6),
2019
RunE: func(cmd *cobra.Command, args []string) error {
2120
ctx := context.Background()
21+
if token == "" {
22+
token = os.Getenv("GITHUB_TOKEN")
23+
}
24+
if token == "" {
25+
return fmt.Errorf("GITHUB_TOKEN is not set")
26+
}
2227
client := github.NewClient(nil).WithAuthToken(token)
2328

2429
g := generator.New(client, owner, repo)
@@ -33,12 +38,16 @@ func main() {
3338
return nil
3439
},
3540
}
36-
cmd.Flags().StringVarP(&token, "token", "t", "", "GitHub token")
41+
cmd.Flags().StringVarP(&token, "token", "t", "", "GitHub token (optional, defaults to GITHUB_TOKEN)")
3742
cmd.Flags().StringVarP(&owner, "owner", "o", "", "GitHub owner")
3843
cmd.Flags().StringVarP(&repo, "repo", "r", "", "GitHub repository")
3944
cmd.Flags().StringVarP(&startSHA, "start-sha", "s", "", "Start commit SHA")
4045
cmd.Flags().StringVarP(&endSHA, "end-sha", "e", "", "End commit SHA")
4146
cmd.Flags().StringVarP(&outputPath, "output-path", "p", "", "Output path")
47+
cmd.MarkFlagRequired("owner")
48+
cmd.MarkFlagRequired("repo")
49+
cmd.MarkFlagRequired("start-sha")
50+
cmd.MarkFlagRequired("end-sha")
4251

4352
if err := cmd.Execute(); err != nil {
4453
fmt.Fprintf(os.Stderr, "Error: %v\n", err)

0 commit comments

Comments
 (0)