Apr 2, 2024 · Apr 1, 2024
diff --git a/coderd/autobuild/lifecycle_executor_test.go b/coderd/autobuild/lifecycle_executor_test.go
 "github.com/coder/coder/v2/coderd/autobuild"
 "github.com/coder/coder/v2/coderd/coderdtest"
 "github.com/coder/coder/v2/coderd/database"
 "github.com/coder/coder/v2/coderd/database/dbauthz"
 "github.com/coder/coder/v2/coderd/schedule"
 "github.com/coder/coder/v2/coderd/schedule/cron"
 "github.com/coder/coder/v2/coderd/util/ptr"
 ticker = make(chan time.Time)
 statCh = make(chan autobuild.Stats)

 ownerClient= coderdtest.New(t, &coderdtest.Options{
 ownerClient, db= coderdtest.NewWithDatabase(t, &coderdtest.Options{
 AutobuildTicker:          ticker,
 IncludeProvisionerDaemon: true,
 AutobuildStats:           statCh,
 TemplateScheduleStore:    schedule.NewAGPLTemplateScheduleStore(),
 })
 )
 ctx := testutil.Context(t, testutil.WaitShort)
 owner := coderdtest.CreateFirstUser(t, ownerClient)
 me, err := ownerClient.User(ctx, codersdk.Me)
 require.NoError(t, err)

 // Create an active and inactive template version. We'll
 // build a regular member's workspace using a non-active
 // template version and assert that the field is not abided
 // since there is no enterprise license.
 activeVersion := coderdtest.CreateTemplateVersion(t, ownerClient, owner.OrganizationID, nil)
 coderdtest.AwaitTemplateVersionJobCompleted(t, ownerClient, activeVersion.ID)
 template := coderdtest.CreateTemplate(t, ownerClient, owner.OrganizationID, activeVersion.ID, func(ctr *codersdk.CreateTemplateRequest) {
 ctr.RequireActiveVersion = true
 ctr.VersionID = activeVersion.ID
 template := coderdtest.CreateTemplate(t, ownerClient, owner.OrganizationID, activeVersion.ID)
 //nolint We need to set this in the database directly, because the API will return an error
 // letting you know that this feature requires an enterprise license.
 err = db.UpdateTemplateAccessControlByID(dbauthz.As(ctx, coderdtest.AuthzUserSubject(me, owner.OrganizationID)), database.UpdateTemplateAccessControlByIDParams{
 ID:                   template.ID,
 RequireActiveVersion: true,
 })
 require.NoError(t, err)
 inactiveVersion := coderdtest.CreateTemplateVersion(t, ownerClient, owner.OrganizationID, nil, func(ctvr *codersdk.CreateTemplateVersionRequest) {
 ctvr.TemplateID = template.ID
 })
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,6 +17,7 @@ import (
		"github.com/coder/coder/v2/coderd/autobuild"
		"github.com/coder/coder/v2/coderd/coderdtest"
		"github.com/coder/coder/v2/coderd/database"
		"github.com/coder/coder/v2/coderd/database/dbauthz"
		"github.com/coder/coder/v2/coderd/schedule"
		"github.com/coder/coder/v2/coderd/schedule/cron"
		"github.com/coder/coder/v2/coderd/util/ptr"
Expand DownExpand Up		@@ -849,25 +850,32 @@ func TestExecutorRequireActiveVersion(t *testing.T) {
		ticker = make(chan time.Time)
		statCh = make(chan autobuild.Stats)

		ownerClient= coderdtest.New(t, &coderdtest.Options{
		ownerClient, db= coderdtest.NewWithDatabase(t, &coderdtest.Options{
		AutobuildTicker: ticker,
		IncludeProvisionerDaemon: true,
		AutobuildStats: statCh,
		TemplateScheduleStore: schedule.NewAGPLTemplateScheduleStore(),
		})
		)
		ctx := testutil.Context(t, testutil.WaitShort)
		owner := coderdtest.CreateFirstUser(t, ownerClient)
		me, err := ownerClient.User(ctx, codersdk.Me)
		require.NoError(t, err)

		// Create an active and inactive template version. We'll
		// build a regular member's workspace using a non-active
		// template version and assert that the field is not abided
		// since there is no enterprise license.
		activeVersion := coderdtest.CreateTemplateVersion(t, ownerClient, owner.OrganizationID, nil)
		coderdtest.AwaitTemplateVersionJobCompleted(t, ownerClient, activeVersion.ID)
		template := coderdtest.CreateTemplate(t, ownerClient, owner.OrganizationID, activeVersion.ID, func(ctr *codersdk.CreateTemplateRequest) {
		ctr.RequireActiveVersion = true
		ctr.VersionID = activeVersion.ID
		template := coderdtest.CreateTemplate(t, ownerClient, owner.OrganizationID, activeVersion.ID)
		//nolint We need to set this in the database directly, because the API will return an error
		// letting you know that this feature requires an enterprise license.
		err = db.UpdateTemplateAccessControlByID(dbauthz.As(ctx, coderdtest.AuthzUserSubject(me, owner.OrganizationID)), database.UpdateTemplateAccessControlByIDParams{
		ID: template.ID,
		RequireActiveVersion: true,
		})
		require.NoError(t, err)
		inactiveVersion := coderdtest.CreateTemplateVersion(t, ownerClient, owner.OrganizationID, nil, func(ctvr *codersdk.CreateTemplateVersionRequest) {
		ctvr.TemplateID = template.ID
		})
Expand Down