leftovers

Tufin · Jun 18, 2024 · 1d44bb2 · 1d44bb2
1 parent 60e2132
commit 1d44bb2
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 19 deletions.
diff --git a/internal/breaking_changes.go b/internal/breaking_changes.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/tufin/oasdiff/checker"
-	"github.com/tufin/oasdiff/formatters"
 )
 
 func getBreakingChangesCmd() *cobra.Command {
@@ -22,7 +21,6 @@ func getBreakingChangesCmd() *cobra.Command {
 
 	addCommonDiffFlags(&cmd, &flags)
 	addCommonBreakingFlags(&cmd, &flags)
-	enumWithOptions(&cmd, newEnumValue(formatters.SupportedFormatsByContentType(formatters.OutputChangelog), string(formatters.FormatText), &flags.format), "format", "f", "output format")
 	enumWithOptions(&cmd, newEnumValue([]string{LevelErr, LevelWarn}, "", &flags.failOn), "fail-on", "o", "exit with return code 1 when output includes errors with this level or higher")
 
 	return &cmd

diff --git a/internal/changelog.go b/internal/changelog.go
@@ -27,7 +27,6 @@ func getChangelogCmd() *cobra.Command {
 
 	addCommonDiffFlags(&cmd, &flags)
 	addCommonBreakingFlags(&cmd, &flags)
-	enumWithOptions(&cmd, newEnumValue(formatters.SupportedFormatsByContentType(formatters.OutputChangelog), string(formatters.FormatText), &flags.format), "format", "f", "output format")
 	enumWithOptions(&cmd, newEnumValue([]string{LevelErr, LevelWarn, LevelInfo}, "", &flags.failOn), "fail-on", "o", "exit with return code 1 when output includes errors with this level or higher")
 	enumWithOptions(&cmd, newEnumValue([]string{LevelErr, LevelWarn, LevelInfo}, LevelInfo, &flags.level), "level", "", "output errors with this level or higher")
 

diff --git a/internal/changelog_flags.go b/internal/changelog_flags.go
@@ -28,8 +28,8 @@ type ChangelogFlags struct {
 	lang                     string
 	errIgnoreFile            string
 	warnIgnoreFile           string
-	deprecationDaysBeta      int
-	deprecationDaysStable    int
+	deprecationDaysBeta      uint
+	deprecationDaysStable    uint
 	color                    string
 }
 
@@ -78,11 +78,11 @@ func (flags *ChangelogFlags) getIncludeChecks() []string {
 	return flags.includeChecks
 }
 
-func (flags *ChangelogFlags) getDeprecationDaysBeta() int {
+func (flags *ChangelogFlags) getDeprecationDaysBeta() uint {
 	return flags.deprecationDaysBeta
 }
 
-func (flags *ChangelogFlags) getDeprecationDaysStable() int {
+func (flags *ChangelogFlags) getDeprecationDaysStable() uint {
 	return flags.deprecationDaysStable
 }
 
@@ -190,6 +190,10 @@ func (flags *ChangelogFlags) refLang() *string {
 	return &flags.lang
 }
 
+func (flags *ChangelogFlags) refFormat() *string {
+	return &flags.format
+}
+
 func (flags *ChangelogFlags) refErrIgnoreFile() *string {
 	return &flags.errIgnoreFile
 }
@@ -202,11 +206,11 @@ func (flags *ChangelogFlags) refIncludeChecks() *[]string {
 	return &flags.includeChecks
 }
 
-func (flags *ChangelogFlags) refDeprecationDaysBeta() *int {
+func (flags *ChangelogFlags) refDeprecationDaysBeta() *uint {
 	return &flags.deprecationDaysBeta
 }
 
-func (flags *ChangelogFlags) refDeprecationDaysStable() *int {
+func (flags *ChangelogFlags) refDeprecationDaysStable() *uint {
 	return &flags.deprecationDaysStable
 }
 

diff --git a/internal/cmd_flags.go b/internal/cmd_flags.go
@@ -4,6 +4,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/tufin/oasdiff/checker"
 	"github.com/tufin/oasdiff/checker/localizations"
+	"github.com/tufin/oasdiff/formatters"
 )
 
 func addCommonDiffFlags(cmd *cobra.Command, flags Flags) {
@@ -42,7 +43,8 @@ func addCommonBreakingFlags(cmd *cobra.Command, flags Flags) {
 	cmd.PersistentFlags().StringVarP(flags.refErrIgnoreFile(), "err-ignore", "", "", "configuration file for ignoring errors")
 	cmd.PersistentFlags().StringVarP(flags.refWarnIgnoreFile(), "warn-ignore", "", "", "configuration file for ignoring warnings")
 	cmd.PersistentFlags().VarP(newEnumSliceValue(checker.GetOptionalRuleIds(), nil, flags.refIncludeChecks()), "include-checks", "i", "comma-separated list of optional checks (run 'oasdiff checks --required false' to see options)")
-	cmd.PersistentFlags().IntVarP(flags.refDeprecationDaysBeta(), "deprecation-days-beta", "", checker.BetaDeprecationDays, "min days required between deprecating a beta resource and removing it")
-	cmd.PersistentFlags().IntVarP(flags.refDeprecationDaysStable(), "deprecation-days-stable", "", checker.StableDeprecationDays, "min days required between deprecating a stable resource and removing it")
+	cmd.PersistentFlags().UintVarP(flags.refDeprecationDaysBeta(), "deprecation-days-beta", "", checker.DefaultBetaDeprecationDays, "min days required between deprecating a beta resource and removing it")
+	cmd.PersistentFlags().UintVarP(flags.refDeprecationDaysStable(), "deprecation-days-stable", "", checker.DefaultStableDeprecationDays, "min days required between deprecating a stable resource and removing it")
 	enumWithOptions(cmd, newEnumValue([]string{"auto", "always", "never"}, "auto", flags.refColor()), "color", "", "when to colorize textual output")
+	enumWithOptions(cmd, newEnumValue(formatters.SupportedFormatsByContentType(formatters.OutputChangelog), string(formatters.FormatText), flags.refFormat()), "format", "f", "output format")
 }
diff --git a/internal/diff_flags.go b/internal/diff_flags.go
@@ -70,11 +70,11 @@ func (flags *DiffFlags) getIncludeChecks() []string {
 	return nil
 }
 
-func (flags *DiffFlags) getDeprecationDaysBeta() int {
+func (flags *DiffFlags) getDeprecationDaysBeta() uint {
 	return 0
 }
 
-func (flags *DiffFlags) getDeprecationDaysStable() int {
+func (flags *DiffFlags) getDeprecationDaysStable() uint {
 	return 0
 }
 
@@ -182,6 +182,10 @@ func (flags *DiffFlags) refLang() *string {
 	return nil
 }
 
+func (flags *DiffFlags) refFormat() *string {
+	return nil
+}
+
 func (flags *DiffFlags) refErrIgnoreFile() *string {
 	return nil
 }
@@ -194,11 +198,11 @@ func (flags *DiffFlags) refIncludeChecks() *[]string {
 	return nil
 }
 
-func (flags *DiffFlags) refDeprecationDaysBeta() *int {
+func (flags *DiffFlags) refDeprecationDaysBeta() *uint {
 	return nil
 }
 
-func (flags *DiffFlags) refDeprecationDaysStable() *int {
+func (flags *DiffFlags) refDeprecationDaysStable() *uint {
 	return nil
 }
 

diff --git a/internal/flags.go b/internal/flags.go
@@ -16,8 +16,8 @@ type Flags interface {
 	getInsensitiveHeaders() bool
 	getCircularReferenceCounter() int
 	getIncludeChecks() []string
-	getDeprecationDaysBeta() int
-	getDeprecationDaysStable() int
+	getDeprecationDaysBeta() uint
+	getDeprecationDaysStable() uint
 	getLang() string
 	getColor() string
 	getWarnIgnoreFile() string
@@ -47,10 +47,11 @@ type Flags interface {
 	refFlattenParams() *bool
 	refInsensitiveHeaders() *bool
 	refLang() *string
+	refFormat() *string
 	refErrIgnoreFile() *string
 	refWarnIgnoreFile() *string
 	refIncludeChecks() *[]string
-	refDeprecationDaysBeta() *int
-	refDeprecationDaysStable() *int
+	refDeprecationDaysBeta() *uint
+	refDeprecationDaysStable() *uint
 	refColor() *string
 }
diff --git a/internal/run_test.go b/internal/run_test.go
@@ -277,6 +277,12 @@ func Test_BreakingChangesFlattenAllOf(t *testing.T) {
 	require.Zero(t, internal.Run(cmdToArgs("oasdiff breaking ../data/allof/simple.yaml ../data/allof/revision.yaml --flatten-allof --fail-on ERR"), io.Discard, io.Discard))
 }
 
+func Test_BreakingChangesInvalidDeprecationDays(t *testing.T) {
+	var stderr bytes.Buffer
+	require.Equal(t, 100, internal.Run(cmdToArgs("oasdiff breaking ../data/deprecation/base.yaml ../data/deprecation/deprecated-with-sunset.yaml --deprecation-days-stable=-1"), io.Discard, &stderr))
+	require.Equal(t, "Error: invalid argument \"-1\" for \"--deprecation-days-stable\" flag: strconv.ParseUint: parsing \"-1\": invalid syntax\n", stderr.String())
+}
+
 func Test_BreakingChangesFlattenCommonParams(t *testing.T) {
 	require.Zero(t, internal.Run(cmdToArgs("oasdiff breaking ../data/common-params/params_in_path.yaml ../data/common-params/params_in_op.yaml --flatten-params --fail-on ERR"), io.Discard, io.Discard))
 }