Use a duration for subject_delete_marker_ttl

Signed-off-by: R.I.Pienaar <rip@devco.net>

Author: ripienaar

cli/stream_command.go

@@ -163,7 +163,7 @@ type streamCmd struct {
 	subjectDeleteMarkersSet   bool
 	subjectDeleteMarkers      bool
 	subjectDeleteMarkerTTLSet bool
-	subjectDeleteMarkerTTL    string
+	subjectDeleteMarkerTTL    time.Duration
 }
 
 type streamStat struct {
@@ -223,7 +223,7 @@ func configureStreamCommand(app commandHost) {
 			f.Flag("allow-msg-ttl", "Allows per-message TTL handling").IsSetByUser(&c.allowMsgTTlSet).UnNegatableBoolVar(&c.allowMsgTTL)
 		}
 		f.Flag("subject-del-markers", "Create subject delete markers").IsSetByUser(&c.subjectDeleteMarkersSet).BoolVar(&c.subjectDeleteMarkers)
-		f.Flag("subject-del-markers-ttl", "How long delete markers should persist in the Stream").IsSetByUser(&c.subjectDeleteMarkerTTLSet).StringVar(&c.subjectDeleteMarkerTTL)
+		f.Flag("subject-del-markers-ttl", "How long delete markers should persist in the Stream").IsSetByUser(&c.subjectDeleteMarkerTTLSet).DurationVar(&c.subjectDeleteMarkerTTL)
 		f.Flag("transform-source", "Stream subject transform source").PlaceHolder("SOURCE").StringVar(&c.subjectTransformSource)
 		f.Flag("transform-destination", "Stream subject transform destination").PlaceHolder("DEST").StringVar(&c.subjectTransformDest)
 		f.Flag("metadata", "Adds metadata to the stream").PlaceHolder("META").IsSetByUser(&c.metadataIsSet).StringMapVar(&c.metadata)
@@ -1919,7 +1919,7 @@ func (c *streamCmd) copyAndEditStream(cfg api.StreamConfig, pc *fisk.ParseContex
 		cfg.SubjectDeleteMarkerTTL = c.subjectDeleteMarkerTTL
 	}
 	if !cfg.SubjectDeleteMarkers {
-		cfg.SubjectDeleteMarkerTTL = ""
+		cfg.SubjectDeleteMarkerTTL = 0
 	}
 
 	return cfg, nil
@@ -1970,7 +1970,7 @@ func (c *streamCmd) interactiveEdit(cfg api.StreamConfig) (api.StreamConfig, err
 
 	// coupled items
 	if !ncfg.SubjectDeleteMarkers {
-		ncfg.SubjectDeleteMarkerTTL = ""
+		ncfg.SubjectDeleteMarkerTTL = 0
 	}
 
 	return ncfg, nil
@@ -2768,7 +2768,7 @@ func (c *streamCmd) prepareConfig(_ *fisk.ParseContext, requireSize bool) api.St
 	}
 
 	if !cfg.SubjectDeleteMarkers {
-		cfg.SubjectDeleteMarkerTTL = ""
+		cfg.SubjectDeleteMarkerTTL = 0
 	}
 
 	if c.limitInactiveThreshold > 0 {

go.mod

@@ -19,15 +19,15 @@ require (
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/klauspost/compress v1.17.11
 	github.com/mattn/go-isatty v0.0.20
-	github.com/nats-io/jsm.go v0.1.1-0.20250123132505-562367622799
+	github.com/nats-io/jsm.go v0.1.1-0.20250127092329-6a11282c8e3a
 	github.com/nats-io/jwt/v2 v2.7.3
-	github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250123154454-257319cc03c6
+	github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250126014539-f2eb5650d200
 	github.com/nats-io/nats.go v1.38.0
 	github.com/nats-io/nkeys v0.4.9
 	github.com/nats-io/nuid v1.0.1
 	github.com/prometheus/client_golang v1.20.5
 	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
-	github.com/synadia-io/jwt-auth-builder.go v0.0.2
+	github.com/synadia-io/jwt-auth-builder.go v0.0.3
 	github.com/tylertreat/hdrhistogram-writer v0.0.0-20210816161836-2e440612a39f
 	golang.org/x/crypto v0.32.0
 	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
@@ -66,6 +66,6 @@ require (
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
-	google.golang.org/protobuf v1.36.3 // indirect
+	google.golang.org/protobuf v1.36.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -105,12 +105,12 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/jsm.go v0.1.1-0.20250123132505-562367622799 h1:OHpgLmtG9vxlNw4/F4+0r8cNC39jh8JGYRH1Zy85LOY=
-github.com/nats-io/jsm.go v0.1.1-0.20250123132505-562367622799/go.mod h1:pJNuRtq8FK/KjHB+PA4Z95Nhp0mr7iq6iuN6qsUszfg=
+github.com/nats-io/jsm.go v0.1.1-0.20250127092329-6a11282c8e3a h1:aNLIRorjN4OimEpEMDV1poAIleoXyhqqIgWArn/i11A=
+github.com/nats-io/jsm.go v0.1.1-0.20250127092329-6a11282c8e3a/go.mod h1:+wiVkC1oBBVXnJaWdbsLwXN/vH5rZgjkkfsu5a76q3s=
 github.com/nats-io/jwt/v2 v2.7.3 h1:6bNPK+FXgBeAqdj4cYQ0F8ViHRbi7woQLq4W29nUAzE=
 github.com/nats-io/jwt/v2 v2.7.3/go.mod h1:GvkcbHhKquj3pkioy5put1wvPxs78UlZ7D/pY+BgZk4=
-github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250123154454-257319cc03c6 h1:q6dOZcqJmcxnPaR3+4cMUccF4YoZlOcf6cnOKLoyLZE=
-github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250123154454-257319cc03c6/go.mod h1:NLseHFkD5ZPPkHVYn4JEG8LguxveaOXJPiIfswZugHg=
+github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250126014539-f2eb5650d200 h1:JTZQwrehqUHpEO+DRjm0734B4a0porO1Cb5ACT0nSJY=
+github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250126014539-f2eb5650d200/go.mod h1:NLseHFkD5ZPPkHVYn4JEG8LguxveaOXJPiIfswZugHg=
 github.com/nats-io/nats.go v1.38.0 h1:A7P+g7Wjp4/NWqDOOP/K6hfhr54DvdDQUznt5JFg9XA=
 github.com/nats-io/nats.go v1.38.0/go.mod h1:IGUM++TwokGnXPs82/wCuiHS02/aKrdYUQkU8If6yjw=
 github.com/nats-io/nkeys v0.4.9 h1:qe9Faq2Gxwi6RZnZMXfmGMZkg3afLLOtrU+gDZJ35b0=
@@ -152,8 +152,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/synadia-io/jwt-auth-builder.go v0.0.2 h1:7MgSqk1+KXK6c5zcdyd8a9kFx4MfcTap8Vxc7jECQHE=
-github.com/synadia-io/jwt-auth-builder.go v0.0.2/go.mod h1:8WYR7+nLQcDMBpocuPgdFJ5/2UOr+HPll3qv+KNdGvs=
+github.com/synadia-io/jwt-auth-builder.go v0.0.3 h1:reMDX933ep++1TUdTWfLZobTdx65+luay5cKUnMPvyw=
+github.com/synadia-io/jwt-auth-builder.go v0.0.3/go.mod h1:8WYR7+nLQcDMBpocuPgdFJ5/2UOr+HPll3qv+KNdGvs=
 github.com/tylertreat/hdrhistogram-writer v0.0.0-20210816161836-2e440612a39f h1:SGznmvCovewbaSgBsHgdThtWsLj5aCLX/3ZXMLd1UD0=
 github.com/tylertreat/hdrhistogram-writer v0.0.0-20210816161836-2e440612a39f/go.mod h1:IY84XkhrEJTdHYLNy/zObs8mXuUAp9I65VyarbPSCCY=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -223,8 +223,8 @@ gonum.org/v1/gonum v0.8.2 h1:CCXrcPKiGGotvnN6jfUsKk4rRqm7q09/YbKb5xCEvtM=
 gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
 gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
-google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
-google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
+google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=