Feb 21, 2024 · Feb 9, 2024 · Feb 9, 2024 · Feb 9, 2024 · Feb 12, 2024 · Feb 12, 2024
diff --git a/.gitattributes b/.gitattributes
 coderd/database/dump.sqllinguist-generated=true
 peerbroker/proto/*.golinguist-generated=true
 provisionerd/proto/*.golinguist-generated=true
 provisionerd/proto/version.golinguist-generated=false
 provisionersdk/proto/*.golinguist-generated=true
 *.tfplan.jsonlinguist-generated=true
 *.tfstate.jsonlinguist-generated=true
 *.tfstate.dotlinguist-generated=true
 *.tfplan.dotlinguist-generated=true
 site/e2e/provisionerGenerated.tslinguist-generated=true
 site/src/api/typesGenerated.tslinguist-generated=true
 site/src/pages/SetupPage/countries.tsxlinguist-generated=true
diff --git a/cli/create_test.go b/cli/create_test.go
 {
 Type:&proto.Response_Plan{
 Plan:&proto.PlanComplete{
 ExternalAuthProviders: []string{"github"},
 ExternalAuthProviders: []*proto.ExternalAuthProviderResource{{Id:"github"}},
 },
 },
 },
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/coderd/coderd.go b/coderd/coderd.go
 Tags:       provisionersdk.MutateTags(uuid.Nil, nil),
 LastSeenAt: sql.NullTime{Time: dbtime.Now(), Valid: true},
 Version:    buildinfo.Version(),
 APIVersion: proto.VersionCurrent.String(),
 APIVersion: proto.CurrentVersion.String(),
 })
 if err != nil {
 return nil, xerrors.Errorf("failed to create in-memory provisioner daemon: %w", err)
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 JobID:      jobID,
 })
 check.Args(database.UpdateTemplateVersionExternalAuthProvidersByJobIDParams{
 JobID:                 jobID,
 ExternalAuthProviders: []string{},
 JobID: jobID,
 }).Asserts(t1, rbac.ActionUpdate).Returns()
 }))
 s.Run("GetTemplateInsights", s.Subtest(func(db database.Store, check *expects) {
diff --git a/coderd/database/dbpurge/dbpurge_test.go b/coderd/database/dbpurge/dbpurge_test.go
 CreatedAt:    now.Add(-14 * 24 * time.Hour),
 LastSeenAt:   sql.NullTime{Valid: true, Time: now.Add(-7 * 24 * time.Hour).Add(time.Minute)},
 Version:      "1.0.0",
 APIVersion:   proto.VersionCurrent.String(),
 APIVersion:   proto.CurrentVersion.String(),
 })
 require.NoError(t, err)
 _, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
 CreatedAt:    now.Add(-8 * 24 * time.Hour),
 LastSeenAt:   sql.NullTime{Valid: true, Time: now.Add(-8 * 24 * time.Hour).Add(time.Hour)},
 Version:      "1.0.0",
 APIVersion:   proto.VersionCurrent.String(),
 APIVersion:   proto.CurrentVersion.String(),
 })
 require.NoError(t, err)
 _, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
 },
 CreatedAt:  now.Add(-9 * 24 * time.Hour),
 Version:    "1.0.0",
 APIVersion: proto.VersionCurrent.String(),
 APIVersion: proto.CurrentVersion.String(),
 })
 require.NoError(t, err)
 _, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
 CreatedAt:  now.Add(-6 * 24 * time.Hour),
 LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-6 * 24 * time.Hour)},
 Version:    "1.0.0",
 APIVersion: proto.VersionCurrent.String(),
 APIVersion: proto.CurrentVersion.String(),
 })
 require.NoError(t, err)

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000196_external_auth_providers_jsonb.down.sql b/coderd/database/migrations/000196_external_auth_providers_jsonb.down.sql
 -- We cannot alter the column type while a view depends on it, so we drop it and recreate it.
 DROP VIEW template_version_with_user;


 -- Does the opposite of `migrate_external_auth_providers_to_jsonb`
 -- eg. `'[{"id": "github"}, {"id": "gitlab"}]'::jsonb` would become `'{github,gitlab}'::text[]`
 CREATE OR REPLACE FUNCTION revert_migrate_external_auth_providers_to_jsonb(jsonb)
  RETURNS text[]
  LANGUAGE plpgsql
  AS $$
 DECLARE
  result text[];
 BEGIN
  SELECT
    array_agg(id::text) INTO result
  FROM (
    SELECT
      jsonb_array_elements($1) ->> 'id' AS id) AS external_auth_provider_ids;
  RETURN result;
 END;
 $$;


 -- Remove the non-null constraint and default
 ALTER TABLE template_versions
  ALTER COLUMN external_auth_providers DROP DEFAULT;
 ALTER TABLE template_versions
  ALTER COLUMN external_auth_providers DROP NOT NULL;


 -- Update the column type and migrate the values
 ALTER TABLE template_versions
  ALTER COLUMN external_auth_providers TYPE text[]
  USING revert_migrate_external_auth_providers_to_jsonb(external_auth_providers);


 -- Recreate `template_version_with_user` as described in dump.sql
 CREATE VIEW template_version_with_user AS
 SELECT
  template_versions.id,
  template_versions.template_id,
  template_versions.organization_id,
  template_versions.created_at,
  template_versions.updated_at,
  template_versions.name,
  template_versions.readme,
  template_versions.job_id,
  template_versions.created_by,
  template_versions.external_auth_providers,
  template_versions.message,
  template_versions.archived,
  COALESCE(visible_users.avatar_url, ''::text) AS created_by_avatar_url,
  COALESCE(visible_users.username, ''::text) AS created_by_username
 FROM (public.template_versions
  LEFT JOIN visible_users ON (template_versions.created_by = visible_users.id));

 COMMENT ON VIEW template_version_with_user IS 'Joins in the username + avatar url of the created by user.';


 -- Cleanup
 DROP FUNCTION revert_migrate_external_auth_providers_to_jsonb;
diff --git a/coderd/database/migrations/000196_external_auth_providers_jsonb.up.sql b/coderd/database/migrations/000196_external_auth_providers_jsonb.up.sql
 -- We cannot alter the column type while a view depends on it, so we drop it and recreate it.
 DROP VIEW template_version_with_user;


 -- Turns the list of provider names into JSONB with the type `Array<{ id: string; optional?: boolean }>`
 -- eg. `'{github,gitlab}'::text[]` would become `'[{"id": "github"}, {"id": "gitlab"}]'::jsonb`
 CREATE OR REPLACE FUNCTION migrate_external_auth_providers_to_jsonb(text[])
  RETURNS jsonb
  LANGUAGE plpgsql
  AS $$
 DECLARE
  result jsonb;
 BEGIN
  SELECT
    jsonb_agg(jsonb_build_object('id', value::text)) INTO result
  FROM
    unnest($1) AS value;
  RETURN result;
 END;
 $$;


 -- Update the column type and migrate the values
 ALTER TABLE template_versions
  ALTER COLUMN external_auth_providers TYPE jsonb
  USING migrate_external_auth_providers_to_jsonb(external_auth_providers);


 -- Make the column non-nullable to make the types nicer on the Go side
 UPDATE template_versions
  SET external_auth_providers = '[]'::jsonb
  WHERE external_auth_providers IS NULL;
 ALTER TABLE template_versions
  ALTER COLUMN external_auth_providers SET DEFAULT '[]'::jsonb;
 ALTER TABLE template_versions
  ALTER COLUMN external_auth_providers SET NOT NULL;


 -- Recreate `template_version_with_user` as described in dump.sql
 CREATE VIEW template_version_with_user AS
 SELECT
  template_versions.id,
  template_versions.template_id,
  template_versions.organization_id,
  template_versions.created_at,
  template_versions.updated_at,
  template_versions.name,
  template_versions.readme,
  template_versions.job_id,
  template_versions.created_by,
  template_versions.external_auth_providers,
  template_versions.message,
  template_versions.archived,
  COALESCE(visible_users.avatar_url, ''::text) AS created_by_avatar_url,
  COALESCE(visible_users.username, ''::text) AS created_by_username
 FROM (public.template_versions
  LEFT JOIN visible_users ON (template_versions.created_by = visible_users.id));

 COMMENT ON VIEW template_version_with_user IS 'Joins in the username + avatar url of the created by user.';


 -- Cleanup
 DROP FUNCTION migrate_external_auth_providers_to_jsonb;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/types.go b/coderd/database/types.go
 return json.Marshal(t)
 }

 type ExternalAuthProvider struct {
 ID       string `json:"id"`
 Optional bool   `json:"optional,omitempty"`
 }

 type StringMap map[string]string

 func (m *StringMap) Scan(src interface{}) error {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,10 +6,12 @@ coderd/apidoc/swagger.json linguist-generated=true
		coderd/database/dump.sqllinguist-generated=true
		peerbroker/proto/*.golinguist-generated=true
		provisionerd/proto/*.golinguist-generated=true
		provisionerd/proto/version.golinguist-generated=false
		provisionersdk/proto/*.golinguist-generated=true
		*.tfplan.jsonlinguist-generated=true
		*.tfstate.jsonlinguist-generated=true
		*.tfstate.dotlinguist-generated=true
		*.tfplan.dotlinguist-generated=true
		site/e2e/provisionerGenerated.tslinguist-generated=true
		site/src/api/typesGenerated.tslinguist-generated=true
		site/src/pages/SetupPage/countries.tsxlinguist-generated=true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -803,7 +803,7 @@ func TestCreateWithGitAuth(t *testing.T) {
		{
		Type:&proto.Response_Plan{
		Plan:&proto.PlanComplete{
		ExternalAuthProviders: []string{"github"},
		ExternalAuthProviders: []*proto.ExternalAuthProviderResource{{Id:"github"}},
		},
		},
		},
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1247,7 +1247,7 @@ func (api *API) CreateInMemoryProvisionerDaemon(dialCtx context.Context, name st
		Tags: provisionersdk.MutateTags(uuid.Nil, nil),
		LastSeenAt: sql.NullTime{Time: dbtime.Now(), Valid: true},
		Version: buildinfo.Version(),
		APIVersion: proto.VersionCurrent.String(),
		APIVersion: proto.CurrentVersion.String(),
		})
		if err != nil {
		return nil, xerrors.Errorf("failed to create in-memory provisioner daemon: %w", err)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -928,8 +928,7 @@ func (s *MethodTestSuite) TestTemplate() {
		JobID: jobID,
		})
		check.Args(database.UpdateTemplateVersionExternalAuthProvidersByJobIDParams{
		JobID: jobID,
		ExternalAuthProviders: []string{},
		JobID: jobID,
		}).Asserts(t1, rbac.ActionUpdate).Returns()
		}))
		s.Run("GetTemplateInsights", s.Subtest(func(db database.Store, check *expects) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -219,7 +219,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
		CreatedAt: now.Add(-14 * 24 * time.Hour),
		LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-7 * 24 * time.Hour).Add(time.Minute)},
		Version: "1.0.0",
		APIVersion: proto.VersionCurrent.String(),
		APIVersion: proto.CurrentVersion.String(),
		})
		require.NoError(t, err)
		_, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
Expand All		@@ -230,7 +230,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
		CreatedAt: now.Add(-8 * 24 * time.Hour),
		LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-8 * 24 * time.Hour).Add(time.Hour)},
		Version: "1.0.0",
		APIVersion: proto.VersionCurrent.String(),
		APIVersion: proto.CurrentVersion.String(),
		})
		require.NoError(t, err)
		_, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
Expand All		@@ -243,7 +243,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
		},
		CreatedAt: now.Add(-9 * 24 * time.Hour),
		Version: "1.0.0",
		APIVersion: proto.VersionCurrent.String(),
		APIVersion: proto.CurrentVersion.String(),
		})
		require.NoError(t, err)
		_, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
Expand All		@@ -257,7 +257,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
		CreatedAt: now.Add(-6 * 24 * time.Hour),
		LastSeenAt: sql.NullTime{Valid: true, Time: now.Add(-6 * 24 * time.Hour)},
		Version: "1.0.0",
		APIVersion: proto.VersionCurrent.String(),
		APIVersion: proto.CurrentVersion.String(),
		})
		require.NoError(t, err)

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,61 @@
		-- We cannot alter the column type while a view depends on it, so we drop it and recreate it.
		DROP VIEW template_version_with_user;


		-- Does the opposite of `migrate_external_auth_providers_to_jsonb`
		-- eg. `'[{"id": "github"}, {"id": "gitlab"}]'::jsonb` would become `'{github,gitlab}'::text[]`
		CREATE OR REPLACE FUNCTION revert_migrate_external_auth_providers_to_jsonb(jsonb)
		RETURNS text[]
		LANGUAGE plpgsql
		AS $$
		DECLARE
		result text[];
		BEGIN
		SELECT
		array_agg(id::text) INTO result
		FROM (
		SELECT
		jsonb_array_elements($1) ->> 'id' AS id) AS external_auth_provider_ids;
		RETURN result;
		END;
		$$;


		-- Remove the non-null constraint and default
		ALTER TABLE template_versions
		ALTER COLUMN external_auth_providers DROP DEFAULT;
		ALTER TABLE template_versions
		ALTER COLUMN external_auth_providers DROP NOT NULL;


		-- Update the column type and migrate the values
		ALTER TABLE template_versions
		ALTER COLUMN external_auth_providers TYPE text[]
		USING revert_migrate_external_auth_providers_to_jsonb(external_auth_providers);


		-- Recreate `template_version_with_user` as described in dump.sql
		CREATE VIEW template_version_with_user AS
		SELECT
		template_versions.id,
		template_versions.template_id,
		template_versions.organization_id,
		template_versions.created_at,
		template_versions.updated_at,
		template_versions.name,
		template_versions.readme,
		template_versions.job_id,
		template_versions.created_by,
		template_versions.external_auth_providers,
		template_versions.message,
		template_versions.archived,
		COALESCE(visible_users.avatar_url, ''::text) AS created_by_avatar_url,
		COALESCE(visible_users.username, ''::text) AS created_by_username
		FROM (public.template_versions
		LEFT JOIN visible_users ON (template_versions.created_by = visible_users.id));

		COMMENT ON VIEW template_version_with_user IS 'Joins in the username + avatar url of the created by user.';


		-- Cleanup
		DROP FUNCTION revert_migrate_external_auth_providers_to_jsonb;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,63 @@
		-- We cannot alter the column type while a view depends on it, so we drop it and recreate it.
		DROP VIEW template_version_with_user;


		-- Turns the list of provider names into JSONB with the type `Array<{ id: string; optional?: boolean }>`
		-- eg. `'{github,gitlab}'::text[]` would become `'[{"id": "github"}, {"id": "gitlab"}]'::jsonb`
		CREATE OR REPLACE FUNCTION migrate_external_auth_providers_to_jsonb(text[])
		RETURNS jsonb
		LANGUAGE plpgsql
		AS $$
		DECLARE
		result jsonb;
		BEGIN
		SELECT
		jsonb_agg(jsonb_build_object('id', value::text)) INTO result
		FROM
		unnest($1) AS value;
		RETURN result;
		END;
		$$;


		-- Update the column type and migrate the values
		ALTER TABLE template_versions
		ALTER COLUMN external_auth_providers TYPE jsonb
		USING migrate_external_auth_providers_to_jsonb(external_auth_providers);


		-- Make the column non-nullable to make the types nicer on the Go side
		UPDATE template_versions
		SET external_auth_providers = '[]'::jsonb
		WHERE external_auth_providers IS NULL;
		ALTER TABLE template_versions
		ALTER COLUMN external_auth_providers SET DEFAULT '[]'::jsonb;
		ALTER TABLE template_versions
		ALTER COLUMN external_auth_providers SET NOT NULL;


		-- Recreate `template_version_with_user` as described in dump.sql
		CREATE VIEW template_version_with_user AS
		SELECT
		template_versions.id,
		template_versions.template_id,
		template_versions.organization_id,
		template_versions.created_at,
		template_versions.updated_at,
		template_versions.name,
		template_versions.readme,
		template_versions.job_id,
		template_versions.created_by,
		template_versions.external_auth_providers,
		template_versions.message,
		template_versions.archived,
		COALESCE(visible_users.avatar_url, ''::text) AS created_by_avatar_url,
		COALESCE(visible_users.username, ''::text) AS created_by_username
		FROM (public.template_versions
		LEFT JOIN visible_users ON (template_versions.created_by = visible_users.id));

		COMMENT ON VIEW template_version_with_user IS 'Joins in the username + avatar url of the created by user.';


		-- Cleanup
		DROP FUNCTION migrate_external_auth_providers_to_jsonb;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,6 +64,11 @@ func (t TemplateACL) Value() (driver.Value, error) {
		return json.Marshal(t)
		}

		type ExternalAuthProvider struct {
		ID string `json:"id"`
		Optional bool `json:"optional,omitempty"`
		}

		type StringMap map[string]string

		func (m *StringMap) Scan(src interface{}) error {
Expand Down