feat: remove workspace_actions experiment (#11427)

sreya · web-flow · commit 9b437032e901 · 2024-01-10T16:19:39.000-06:00
diff --git a/cli/templatecreate.go b/cli/templatecreate.go
@@ -49,18 +49,6 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
 			isTemplateSchedulingOptionsSet := failureTTL != 0 || dormancyThreshold != 0 || dormancyAutoDeletion != 0 || maxTTL != 0
 
 			if isTemplateSchedulingOptionsSet || requireActiveVersion {
-				if failureTTL != 0 || dormancyThreshold != 0 || dormancyAutoDeletion != 0 {
-					// This call can be removed when workspace_actions is no longer experimental
-					experiments, exErr := client.Experiments(inv.Context())
-					if exErr != nil {
-						return xerrors.Errorf("get experiments: %w", exErr)
-					}
-
-					if !experiments.Enabled(codersdk.ExperimentWorkspaceActions) {
-						return xerrors.Errorf("--failure-ttl, --dormancy-threshold, and --dormancy-auto-deletion are experimental features. Use the workspace_actions CODER_EXPERIMENTS flag to set these configuration values.")
-					}
-				}
-
 				entitlements, err := client.Entitlements(inv.Context())
 				if cerr, ok := codersdk.AsError(err); ok && cerr.StatusCode() == http.StatusNotFound {
 					return xerrors.Errorf("your deployment appears to be an AGPL deployment, so you cannot set enterprise-only flags")
diff --git a/cli/templateedit.go b/cli/templateedit.go
@@ -47,18 +47,6 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
 		),
 		Short: "Edit the metadata of a template by name.",
 		Handler: func(inv *clibase.Invocation) error {
-			// This clause can be removed when workspace_actions is no longer experimental
-			if failureTTL != 0 || dormancyThreshold != 0 || dormancyAutoDeletion != 0 {
-				experiments, exErr := client.Experiments(inv.Context())
-				if exErr != nil {
-					return xerrors.Errorf("get experiments: %w", exErr)
-				}
-
-				if !experiments.Enabled(codersdk.ExperimentWorkspaceActions) {
-					return xerrors.Errorf("--failure-ttl, --dormancy-threshold, and --dormancy-auto-deletion are experimental features. Use the workspace_actions CODER_EXPERIMENTS flag to set these configuration values.")
-				}
-			}
-
 			unsetAutostopRequirementDaysOfWeek := len(autostopRequirementDaysOfWeek) == 1 && autostopRequirementDaysOfWeek[0] == "none"
 			requiresScheduling := (len(autostopRequirementDaysOfWeek) > 0 && !unsetAutostopRequirementDaysOfWeek) ||
 				autostopRequirementWeeks > 0 ||
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/codersdk/deployment.go b/codersdk/deployment.go
@@ -2077,9 +2077,6 @@ func (c *Client) BuildInfo(ctx context.Context) (BuildInfoResponse, error) {
 type Experiment string
 
 const (
-	// https://github.com/coder/coder/milestone/19
-	ExperimentWorkspaceActions Experiment = "workspace_actions"
-
 	// Deployment health page
 	ExperimentDeploymentHealthPage Experiment = "deployment_health_page"
 
diff --git a/docs/api/general.md b/docs/api/general.md
diff --git a/docs/api/schemas.md b/docs/api/schemas.md
diff --git a/enterprise/cli/templatecreate_test.go b/enterprise/cli/templatecreate_test.go
@@ -62,19 +62,13 @@ func TestTemplateCreate(t *testing.T) {
 	t.Run("WorkspaceCleanup", func(t *testing.T) {
 		t.Parallel()
 
-		dv := coderdtest.DeploymentValues(t)
-		dv.Experiments = []string{
-			string(codersdk.ExperimentWorkspaceActions),
-		}
-
 		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
 					codersdk.FeatureAdvancedTemplateScheduling: 1,
 				},
 			},
 			Options: &coderdtest.Options{
-				DeploymentValues:         dv,
 				IncludeProvisionerDaemon: true,
 			},
 		})
diff --git a/enterprise/cli/templateedit_test.go b/enterprise/cli/templateedit_test.go
@@ -89,19 +89,13 @@ func TestTemplateEdit(t *testing.T) {
 	t.Run("WorkspaceCleanup", func(t *testing.T) {
 		t.Parallel()
 
-		dv := coderdtest.DeploymentValues(t)
-		dv.Experiments = []string{
-			string(codersdk.ExperimentWorkspaceActions),
-		}
-
 		ownerClient, owner := coderdenttest.New(t, &coderdenttest.Options{
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
 					codersdk.FeatureAdvancedTemplateScheduling: 1,
 				},
 			},
 			Options: &coderdtest.Options{
-				DeploymentValues:         dv,
 				IncludeProvisionerDaemon: true,
 			},
 		})
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
diff --git a/site/src/components/Dashboard/DashboardProvider.tsx b/site/src/components/Dashboard/DashboardProvider.tsx
@@ -113,11 +113,6 @@ export const useDashboard = (): DashboardProviderValue => {
 };
 
 export const useIsWorkspaceActionsEnabled = (): boolean => {
-  const { entitlements, experiments } = useDashboard();
-  const allowAdvancedScheduling =
-    entitlements.features["advanced_template_scheduling"].enabled;
-  // This check can be removed when https://github.com/coder/coder/milestone/19
-  // is merged up
-  const allowWorkspaceActions = experiments.includes("workspace_actions");
-  return allowWorkspaceActions && allowAdvancedScheduling;
+  const { entitlements } = useDashboard();
+  return entitlements.features["advanced_template_scheduling"].enabled;
 };
diff --git a/site/src/components/WorkspaceDeletion/DormantDeletionText.tsx b/site/src/components/WorkspaceDeletion/DormantDeletionText.tsx
@@ -10,20 +10,13 @@ interface DormantDeletionTextProps {
 export const DormantDeletionText: FC<DormantDeletionTextProps> = ({
   workspace,
 }) => {
-  const { entitlements, experiments } = useDashboard();
+  const { entitlements } = useDashboard();
   const allowAdvancedScheduling =
     entitlements.features["advanced_template_scheduling"].enabled;
   // This check can be removed when https://github.com/coder/coder/milestone/19
   // is merged up
-  const allowWorkspaceActions = experiments.includes("workspace_actions");
 
-  if (
-    !displayDormantDeletion(
-      workspace,
-      allowAdvancedScheduling,
-      allowWorkspaceActions,
-    )
-  ) {
+  if (!displayDormantDeletion(workspace, allowAdvancedScheduling)) {
     return null;
   }
 
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx
@@ -54,7 +54,6 @@ export interface TemplateScheduleForm {
   isSubmitting: boolean;
   error?: unknown;
   allowAdvancedScheduling: boolean;
-  allowWorkspaceActions: boolean;
   // Helpful to show field errors on Storybook
   initialTouched?: FormikTouched<UpdateTemplateMeta>;
 }
@@ -65,7 +64,6 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
   onCancel,
   error,
   allowAdvancedScheduling,
-  allowWorkspaceActions,
   isSubmitting,
   initialTouched,
 }) => {
@@ -562,7 +560,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
           </Stack>
         </Stack>
       </FormSection>
-      {allowAdvancedScheduling && allowWorkspaceActions && (
+      {allowAdvancedScheduling && (
         <>
           <FormSection
             title="Failure Cleanup"
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.test.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.test.tsx
@@ -139,9 +139,6 @@ describe("TemplateSchedulePage", () => {
     jest
       .spyOn(API, "getEntitlements")
       .mockResolvedValue(MockEntitlementsWithScheduling);
-
-    // remove when https://github.com/coder/coder/milestone/19 is completed.
-    jest.spyOn(API, "getExperiments").mockResolvedValue(["workspace_actions"]);
   });
 
   it("Calls the API when user fills in and submits a form", async () => {
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.tsx
@@ -18,12 +18,9 @@ const TemplateSchedulePage: FC = () => {
   const queryClient = useQueryClient();
   const orgId = useOrganizationId();
   const { template } = useTemplateSettings();
-  const { entitlements, experiments } = useDashboard();
+  const { entitlements } = useDashboard();
   const allowAdvancedScheduling =
     entitlements.features["advanced_template_scheduling"].enabled;
-  // This check can be removed when https://github.com/coder/coder/milestone/19
-  // is merged up
-  const allowWorkspaceActions = experiments.includes("workspace_actions");
   const { clearLocal } = useLocalStorage();
 
   const {
@@ -52,7 +49,6 @@ const TemplateSchedulePage: FC = () => {
       </Helmet>
       <TemplateSchedulePageView
         allowAdvancedScheduling={allowAdvancedScheduling}
-        allowWorkspaceActions={allowWorkspaceActions}
         isSubmitting={isSubmitting}
         template={template}
         submitError={submitError}
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.stories.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.stories.tsx
@@ -31,7 +31,6 @@ type Story = StoryObj<typeof TemplateSchedulePageView>;
 
 const defaultArgs = {
   allowAdvancedScheduling: true,
-  allowWorkspaceActions: true,
   template: MockTemplate,
   onSubmit: action("onSubmit"),
   onCancel: action("cancel"),
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.tsx
@@ -13,7 +13,6 @@ export interface TemplateSchedulePageViewProps {
     typeof TemplateScheduleForm
   >["initialTouched"];
   allowAdvancedScheduling: boolean;
-  allowWorkspaceActions: boolean;
 }
 
 export const TemplateSchedulePageView: FC<TemplateSchedulePageViewProps> = ({
@@ -22,7 +21,6 @@ export const TemplateSchedulePageView: FC<TemplateSchedulePageViewProps> = ({
   onSubmit,
   isSubmitting,
   allowAdvancedScheduling,
-  allowWorkspaceActions,
   submitError,
   initialTouched,
 }) => {
@@ -34,7 +32,6 @@ export const TemplateSchedulePageView: FC<TemplateSchedulePageViewProps> = ({
 
       <TemplateScheduleForm
         allowAdvancedScheduling={allowAdvancedScheduling}
-        allowWorkspaceActions={allowWorkspaceActions}
         initialTouched={initialTouched}
         isSubmitting={isSubmitting}
         template={template}
diff --git a/site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx b/site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx
@@ -24,7 +24,6 @@ const meta: Meta<typeof WorkspaceTopbar> = {
   parameters: {
     layout: "fullscreen",
     features: ["advanced_template_scheduling"],
-    experiments: ["workspace_actions"],
   },
 };
 
diff --git a/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx b/site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
@@ -88,16 +88,14 @@ export const WorkspaceTopbar = (props: WorkspaceProps) => {
   });
 
   // Dormant
-  const { entitlements, experiments } = useDashboard();
+  const { entitlements } = useDashboard();
   const allowAdvancedScheduling =
     entitlements.features["advanced_template_scheduling"].enabled;
   // This check can be removed when https://github.com/coder/coder/milestone/19
   // is merged up
-  const allowWorkspaceActions = experiments.includes("workspace_actions");
   const shouldDisplayDormantData = displayDormantDeletion(
     workspace,
     allowAdvancedScheduling,
-    allowWorkspaceActions,
   );
 
   return (
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -2047,7 +2047,9 @@ export const MockEntitlementsWithUserLimit: TypesGen.Entitlements = {
   }),
 };
 
-export const MockExperiments: TypesGen.Experiment[] = ["workspace_actions"];
+export const MockExperiments: TypesGen.Experiment[] = [
+  "deployment_health_page",
+];
 
 export const MockAuditLog: TypesGen.AuditLog = {
   id: "fbd2116a-8961-4954-87ae-e4575bd29ce0",
diff --git a/site/src/utils/dormant.test.ts b/site/src/utils/dormant.test.ts
@@ -4,53 +4,39 @@ import { displayDormantDeletion } from "./dormant";
 
 describe("displayDormantDeletion", () => {
   const today = new Date();
-  it.each<[string, boolean, boolean, boolean]>([
+  it.each<[string, boolean, boolean]>([
     [
       new Date(new Date().setDate(today.getDate() + 15)).toISOString(),
       true,
-      true,
       false,
     ], // today + 15 days out
     [
       new Date(new Date().setDate(today.getDate() + 14)).toISOString(),
       true,
       true,
-      true,
     ], // today + 14
     [
       new Date(new Date().setDate(today.getDate() + 13)).toISOString(),
       true,
       true,
-      true,
     ], // today + 13
     [
       new Date(new Date().setDate(today.getDate() + 1)).toISOString(),
       true,
       true,
-      true,
     ], // today + 1
-    [new Date().toISOString(), true, true, true], // today + 0
-    [new Date().toISOString(), false, true, false], // Advanced Scheduling off
-    [new Date().toISOString(), true, false, false], // Workspace Actions off
+    [new Date().toISOString(), true, true], // today + 0
+    [new Date().toISOString(), false, false], // Advanced Scheduling off
   ])(
-    `deleting_at=%p, allowAdvancedScheduling=%p, AllowWorkspaceActions=%p, shouldDisplay=%p`,
-    (
-      deleting_at,
-      allowAdvancedScheduling,
-      allowWorkspaceActions,
-      shouldDisplay,
-    ) => {
+    `deleting_at=%p, allowAdvancedScheduling=%p, shouldDisplay=%p`,
+    (deleting_at, allowAdvancedScheduling, shouldDisplay) => {
       const workspace: TypesGen.Workspace = {
         ...Mocks.MockWorkspace,
         deleting_at,
       };
-      expect(
-        displayDormantDeletion(
-          workspace,
-          allowAdvancedScheduling,
-          allowWorkspaceActions,
-        ),
-      ).toBe(shouldDisplay);
+      expect(displayDormantDeletion(workspace, allowAdvancedScheduling)).toBe(
+        shouldDisplay,
+      );
     },
   );
 });
diff --git a/site/src/utils/dormant.ts b/site/src/utils/dormant.ts
