From 4bab3e8e6728efc4cb14f597797582576b27888e Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Wed, 3 Jan 2024 12:23:16 +0000 Subject: [PATCH 1/2] fix(coderd/database): add missing v prefix to provisioner_daemons.api_version --- .../000183_provisionerd_api_version_prefix.down.sql | 5 +++++ .../migrations/000183_provisionerd_api_version_prefix.up.sql | 5 +++++ provisionersdk/serve.go | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 coderd/database/migrations/000183_provisionerd_api_version_prefix.down.sql create mode 100644 coderd/database/migrations/000183_provisionerd_api_version_prefix.up.sql diff --git a/coderd/database/migrations/000183_provisionerd_api_version_prefix.down.sql b/coderd/database/migrations/000183_provisionerd_api_version_prefix.down.sql new file mode 100644 index 0000000000000..298d891caa77e --- /dev/null +++ b/coderd/database/migrations/000183_provisionerd_api_version_prefix.down.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/coderd/database/migrations/000183_provisionerd_api_version_prefix.up.sql b/coderd/database/migrations/000183_provisionerd_api_version_prefix.up.sql new file mode 100644 index 0000000000000..f06719f003150 --- /dev/null +++ b/coderd/database/migrations/000183_provisionerd_api_version_prefix.up.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/provisionersdk/serve.go b/provisionersdk/serve.go index b2d8f19d5e978..fad5da8417a5d 100644 --- a/provisionersdk/serve.go +++ b/provisionersdk/serve.go @@ -24,7 +24,7 @@ const ( // APIVersionCurrent is the current provisionerd API version. // Breaking changes to the provisionerd API **MUST** increment // the major version below. - APIVersionCurrent = "1.0" + APIVersionCurrent = "v1.0" ) // ServeOptions are configurations to serve a provisioner. From be3bc7ba6a573f2a15d140a965ff7c7f83c5e974 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Wed, 3 Jan 2024 12:39:56 +0000 Subject: [PATCH 2/2] make gen --- coderd/database/dump.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql index ee0d9f92f42f2..204204a84eb96 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 '1.0'::text NOT NULL + api_version text DEFAULT 'v1.0'::text NOT NULL ); COMMENT ON COLUMN provisioner_daemons.api_version IS 'The API version of the provisioner daemon';