From 4355894b2ba4e06a625177a49d98094246430533 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 4 Jan 2024 11:47:31 +0000 Subject: [PATCH] fix(coderd/database): revert addition of v prefix to provisioner_daemons.api_version (#11403) "Reverts" #11385 by adding an inverse migration. --- coderd/database/dump.sql | 2 +- ...000184_provisionerd_api_version_rm_prefix.down.sql | 5 +++++ .../000184_provisionerd_api_version_rm_prefix.up.sql | 5 +++++ provisionersdk/serve.go | 11 +++++++++-- 4 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 coderd/database/migrations/000184_provisionerd_api_version_rm_prefix.down.sql create mode 100644 coderd/database/migrations/000184_provisionerd_api_version_rm_prefix.up.sql diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql index 204204a84e..ee0d9f92f4 100644 --- a/coderd/database/dump.sql +++ b/coderd/database/dump.sql @@ -537,7 +537,7 @@ CREATE TABLE provisioner_daemons ( tags jsonb DEFAULT '{}'::jsonb NOT NULL, last_seen_at timestamp with time zone, version text DEFAULT ''::text NOT NULL, - api_version text DEFAULT 'v1.0'::text NOT NULL + api_version text DEFAULT '1.0'::text NOT NULL ); COMMENT ON COLUMN provisioner_daemons.api_version IS 'The API version of the provisioner daemon'; diff --git a/coderd/database/migrations/000184_provisionerd_api_version_rm_prefix.down.sql b/coderd/database/migrations/000184_provisionerd_api_version_rm_prefix.down.sql new file mode 100644 index 0000000000..f06719f003 --- /dev/null +++ b/coderd/database/migrations/000184_provisionerd_api_version_rm_prefix.down.sql @@ -0,0 +1,5 @@ +ALTER TABLE ONLY provisioner_daemons + ALTER COLUMN api_version SET DEFAULT 'v1.0'::text; +UPDATE provisioner_daemons + SET api_version = 'v1.0' + WHERE api_version = '1.0'; diff --git a/coderd/database/migrations/000184_provisionerd_api_version_rm_prefix.up.sql b/coderd/database/migrations/000184_provisionerd_api_version_rm_prefix.up.sql new file mode 100644 index 0000000000..298d891caa --- /dev/null +++ b/coderd/database/migrations/000184_provisionerd_api_version_rm_prefix.up.sql @@ -0,0 +1,5 @@ +ALTER TABLE ONLY provisioner_daemons + ALTER COLUMN api_version SET DEFAULT '1.0'::text; +UPDATE provisioner_daemons + SET api_version = '1.0' + WHERE api_version = 'v1.0'; diff --git a/provisionersdk/serve.go b/provisionersdk/serve.go index fad5da8417..fc6d94ba52 100644 --- a/provisionersdk/serve.go +++ b/provisionersdk/serve.go @@ -3,6 +3,7 @@ package provisionersdk import ( "context" "errors" + "fmt" "io" "net" "os" @@ -21,10 +22,16 @@ import ( ) const ( + CurrentMajor = 1 + CurrentMinor = 0 +) + +var ( + SupportedMajors = []int{1} // APIVersionCurrent is the current provisionerd API version. // Breaking changes to the provisionerd API **MUST** increment - // the major version below. - APIVersionCurrent = "v1.0" + // CurrentMajor above. + APIVersionCurrent = fmt.Sprintf("%d.%d", CurrentMajor, CurrentMinor) ) // ServeOptions are configurations to serve a provisioner.