Aug 6, 2024 · Aug 6, 2024 · Aug 6, 2024
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000239_provisioner_daemon_org_constraint.down.sql b/coderd/database/migrations/000239_provisioner_daemon_org_constraint.down.sql
 CREATE UNIQUE INDEX idx_provisioner_daemons_name_owner_key ON provisioner_daemons USING btree (name, lower(COALESCE((tags ->> 'owner'::text), ''::text)));

 COMMENT ON INDEX idx_provisioner_daemons_name_owner_key IS 'Allow unique provisioner daemon names by user';

 DROP INDEX idx_provisioner_daemons_org_name_owner_key;
diff --git a/coderd/database/migrations/000239_provisioner_daemon_org_constraint.up.sql b/coderd/database/migrations/000239_provisioner_daemon_org_constraint.up.sql
 CREATE UNIQUE INDEX idx_provisioner_daemons_org_name_owner_key ON provisioner_daemons USING btree (organization_id, name, lower(COALESCE((tags ->> 'owner'::text), ''::text)));

 COMMENT ON INDEX idx_provisioner_daemons_org_name_owner_key IS 'Allow unique provisioner daemon names by organization and user';

 DROP INDEX idx_provisioner_daemons_name_owner_key;
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/provisionerdaemons.sql b/coderd/database/queries/provisionerdaemons.sql
 @version,
 @organization_id,
 @api_version
 ) ON CONFLICT("name", LOWER(COALESCE(tags ->> 'owner'::text, ''::text))) DO UPDATE SET
 ) ON CONFLICT("organization_id", "name", LOWER(COALESCE(tags ->> 'owner'::text, ''::text))) DO UPDATE SET
 provisioners = @provisioners,
 tags = @tags,
 last_seen_at = @last_seen_at,
 "version" = @version,
 api_version = @api_version,
 organization_id = @organization_id
 WHERE
 -- Only ones with the same tags are allowed clobber
 provisioner_daemons.tags <@ @tags :: jsonb
 RETURNING *;

 -- name: UpdateProvisionerDaemonLastSeenAt :exec
diff --git a/coderd/database/unique_constraint.go b/coderd/database/unique_constraint.go
diff --git a/enterprise/coderd/provisionerdaemons_test.go b/enterprise/coderd/provisionerdaemons_test.go
 }
 })

 t.Run("ChangeTags", func(t *testing.T) {
 t.Parallel()
 client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 Features: license.Features{
 codersdk.FeatureExternalProvisionerDaemons: 1,
 },
 }})
 another, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID, rbac.ScopedRoleOrgAdmin(user.OrganizationID))
 ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 defer cancel()
 req := codersdk.ServeProvisionerDaemonRequest{
 ID:           uuid.New(),
 Name:         testutil.MustRandString(t, 63),
 Organization: user.OrganizationID,
 Provisioners: []codersdk.ProvisionerType{
 codersdk.ProvisionerTypeEcho,
 },
 Tags: map[string]string{
 provisionersdk.TagScope: provisionersdk.ScopeOrganization,
 },
 }
 _, err := another.ServeProvisionerDaemon(ctx, req)
 require.NoError(t, err)

 // add tag
 req.Tags["new"] = "tag"
 _, err = another.ServeProvisionerDaemon(ctx, req)
 require.NoError(t, err)

 // remove tag
 delete(req.Tags, "new")
 _, err = another.ServeProvisionerDaemon(ctx, req)
 require.NoError(t, err)
 })

 t.Run("PSK_daily_cost", func(t *testing.T) {
 t.Parallel()
 const provPSK = `provisionersftw`
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@
		CREATE UNIQUE INDEX idx_provisioner_daemons_name_owner_key ON provisioner_daemons USING btree (name, lower(COALESCE((tags ->> 'owner'::text), ''::text)));

		COMMENT ON INDEX idx_provisioner_daemons_name_owner_key IS 'Allow unique provisioner daemon names by user';

		DROP INDEX idx_provisioner_daemons_org_name_owner_key;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,16 +45,13 @@ VALUES (
		@version,
		@organization_id,
		@api_version
		) ON CONFLICT("name", LOWER(COALESCE(tags ->> 'owner'::text, ''::text))) DO UPDATE SET
		) ON CONFLICT("organization_id", "name", LOWER(COALESCE(tags ->> 'owner'::text, ''::text))) DO UPDATE SET
		provisioners = @provisioners,
		tags = @tags,
		last_seen_at = @last_seen_at,
		"version" = @version,
		api_version = @api_version,
		organization_id = @organization_id
		WHERE
		-- Only ones with the same tags are allowed clobber
		provisioner_daemons.tags <@ @tags :: jsonb
		RETURNING *;

		-- name: UpdateProvisionerDaemonLastSeenAt :exec
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -347,6 +347,41 @@ func TestProvisionerDaemonServe(t *testing.T) {
		}
		})

		t.Run("ChangeTags", func(t *testing.T) {
		t.Parallel()
		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
		Features: license.Features{
		codersdk.FeatureExternalProvisionerDaemons: 1,
		},
		}})
		another, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID, rbac.ScopedRoleOrgAdmin(user.OrganizationID))
		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
		defer cancel()
		req := codersdk.ServeProvisionerDaemonRequest{
		ID: uuid.New(),
		Name: testutil.MustRandString(t, 63),
		Organization: user.OrganizationID,
		Provisioners: []codersdk.ProvisionerType{
		codersdk.ProvisionerTypeEcho,
		},
		Tags: map[string]string{
		provisionersdk.TagScope: provisionersdk.ScopeOrganization,
		},
		}
		_, err := another.ServeProvisionerDaemon(ctx, req)
		require.NoError(t, err)

		// add tag
		req.Tags["new"] = "tag"
		_, err = another.ServeProvisionerDaemon(ctx, req)
		require.NoError(t, err)

		// remove tag
		delete(req.Tags, "new")
		_, err = another.ServeProvisionerDaemon(ctx, req)
		require.NoError(t, err)
		})

		t.Run("PSK_daily_cost", func(t *testing.T) {
		t.Parallel()
		const provPSK = `provisionersftw`
Expand Down