Deprecate, not remove CLI flags

Signed-off-by: Spike Curtis <spike@coder.com>
coder · spikecurtis · Sep 19, 2023 · Sep 8, 2023 · Sep 13, 2023 · Sep 13, 2023
commit e8451405a4ed9fc69f8b17e83d6115693ae226bd
diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden
@@ -392,6 +392,12 @@ updating, and deleting workspace resources.
       --provisioner-force-cancel-interval duration, $CODER_PROVISIONER_FORCE_CANCEL_INTERVAL (default: 10m0s)
           Time to force cancel provisioning tasks that are stuck.
 
+      --provisioner-daemon-poll-interval duration, $CODER_PROVISIONER_DAEMON_POLL_INTERVAL (default: 1s)
+          Deprecated and ignored.
+
+      --provisioner-daemon-poll-jitter duration, $CODER_PROVISIONER_DAEMON_POLL_JITTER (default: 100ms)
+          Deprecated and ignored.
+
       --provisioner-daemon-psk string, $CODER_PROVISIONER_DAEMON_PSK
           Pre-shared key to authenticate external provisioner daemons to Coder
           server.

diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
@@ -348,6 +348,12 @@ provisioning:
   # tests.
   # (default: false, type: bool)
   daemonsEcho: false
+  # Deprecated and ignored.
+  # (default: 1s, type: duration)
+  daemonPollInterval: 1s
+  # Deprecated and ignored.
+  # (default: 100ms, type: duration)
+  daemonPollJitter: 100ms
   # Time to force cancel provisioning tasks that are stuck.
   # (default: 10m0s, type: duration)
   forceCancelInterval: 10m0s

diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -340,6 +340,8 @@ type GitAuthConfig struct {
 type ProvisionerConfig struct {
 	Daemons             clibase.Int64    `json:"daemons" typescript:",notnull"`
 	DaemonsEcho         clibase.Bool     `json:"daemons_echo" typescript:",notnull"`
+	DaemonPollInterval  clibase.Duration `json:"daemon_poll_interval" typescript:",notnull"`
+	DaemonPollJitter    clibase.Duration `json:"daemon_poll_jitter" typescript:",notnull"`
 	ForceCancelInterval clibase.Duration `json:"force_cancel_interval" typescript:",notnull"`
 	DaemonPSK           clibase.String   `json:"daemon_psk" typescript:",notnull"`
 }
@@ -1268,6 +1270,26 @@ when required by your organization's security policy.`,
 			Group:       &deploymentGroupProvisioning,
 			YAML:        "daemonsEcho",
 		},
+		{
+			Name:        "Poll Interval",
+			Description: "Deprecated and ignored.",
+			Flag:        "provisioner-daemon-poll-interval",
+			Env:         "CODER_PROVISIONER_DAEMON_POLL_INTERVAL",
+			Default:     time.Second.String(),
+			Value:       &c.Provisioner.DaemonPollInterval,
+			Group:       &deploymentGroupProvisioning,
+			YAML:        "daemonPollInterval",
+		},
+		{
+			Name:        "Poll Jitter",
+			Description: "Deprecated and ignored.",
+			Flag:        "provisioner-daemon-poll-jitter",
+			Env:         "CODER_PROVISIONER_DAEMON_POLL_JITTER",
+			Default:     (100 * time.Millisecond).String(),
+			Value:       &c.Provisioner.DaemonPollJitter,
+			Group:       &deploymentGroupProvisioning,
+			YAML:        "daemonPollJitter",
+		},
 		{
 			Name:        "Force Cancel Interval",
 			Description: "Time to force cancel provisioning tasks that are stuck.",

diff --git a/docs/api/general.md b/docs/api/general.md
diff --git a/docs/api/schemas.md b/docs/api/schemas.md
diff --git a/docs/cli/provisionerd_start.md b/docs/cli/provisionerd_start.md
diff --git a/docs/cli/server.md b/docs/cli/server.md
diff --git a/enterprise/cli/provisionerdaemons.go b/enterprise/cli/provisionerdaemons.go
@@ -45,6 +45,8 @@ func (r *RootCmd) provisionerDaemonStart() *clibase.Cmd {
 	var (
 		cacheDir     string
 		rawTags      []string
+		pollInterval time.Duration
+		pollJitter   time.Duration
 		preSharedKey string
 	)
 	client := new(codersdk.Client)
@@ -181,6 +183,20 @@ func (r *RootCmd) provisionerDaemonStart() *clibase.Cmd {
 			Description:   "Tags to filter provisioner jobs by.",
 			Value:         clibase.StringArrayOf(&rawTags),
 		},
+		{
+			Flag:        "poll-interval",
+			Env:         "CODER_PROVISIONERD_POLL_INTERVAL",
+			Default:     time.Second.String(),
+			Description: "Deprecated and ignored.",
+			Value:       clibase.DurationOf(&pollInterval),
+		},
+		{
+			Flag:        "poll-jitter",
+			Env:         "CODER_PROVISIONERD_POLL_JITTER",
+			Description: "Deprecated and ignored.",
+			Default:     (100 * time.Millisecond).String(),
+			Value:       clibase.DurationOf(&pollJitter),
+		},
 		{
 			Flag:        "psk",
 			Env:         "CODER_PROVISIONER_DAEMON_PSK",

diff --git a/enterprise/cli/testdata/coder_provisionerd_start_--help.golden b/enterprise/cli/testdata/coder_provisionerd_start_--help.golden
@@ -9,6 +9,12 @@ OPTIONS:
   -c, --cache-dir string, $CODER_CACHE_DIRECTORY (default: [cache dir])
           Directory to store cached data.
 
+      --poll-interval duration, $CODER_PROVISIONERD_POLL_INTERVAL (default: 1s)
+          Deprecated and ignored.
+
+      --poll-jitter duration, $CODER_PROVISIONERD_POLL_JITTER (default: 100ms)
+          Deprecated and ignored.
+
       --psk string, $CODER_PROVISIONER_DAEMON_PSK
           Pre-shared key to authenticate with Coder server.
 

diff --git a/enterprise/cli/testdata/coder_server_--help.golden b/enterprise/cli/testdata/coder_server_--help.golden
@@ -393,6 +393,12 @@ updating, and deleting workspace resources.
       --provisioner-force-cancel-interval duration, $CODER_PROVISIONER_FORCE_CANCEL_INTERVAL (default: 10m0s)
           Time to force cancel provisioning tasks that are stuck.
 
+      --provisioner-daemon-poll-interval duration, $CODER_PROVISIONER_DAEMON_POLL_INTERVAL (default: 1s)
+          Deprecated and ignored.
+
+      --provisioner-daemon-poll-jitter duration, $CODER_PROVISIONER_DAEMON_POLL_JITTER (default: 100ms)
+          Deprecated and ignored.
+
       --provisioner-daemon-psk string, $CODER_PROVISIONER_DAEMON_PSK
           Pre-shared key to authenticate external provisioner daemons to Coder
           server.

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts