From 650125e2c4357ab3bc5ee2a1f3f58eca276ae2bd Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Thu, 4 Jan 2024 21:56:59 +0000 Subject: [PATCH 1/7] feat: remove workspace_actions experiment --- cli/templatecreate.go | 12 ------------ cli/templateedit.go | 12 ------------ coderd/apidoc/docs.go | 2 -- coderd/apidoc/swagger.json | 7 +------ codersdk/deployment.go | 3 --- docs/api/general.md | 4 ++-- docs/api/schemas.md | 3 +-- enterprise/cli/templatecreate_test.go | 6 ------ enterprise/cli/templateedit_test.go | 6 ------ site/src/api/typesGenerated.ts | 6 +----- .../components/Dashboard/DashboardProvider.tsx | 9 ++------- .../WorkspaceDeletion/DormantDeletionText.tsx | 11 ++--------- .../TemplateScheduleForm.tsx | 4 +--- .../TemplateSchedulePage.test.tsx | 3 --- .../TemplateSchedulePage.tsx | 6 +----- .../TemplateSchedulePageView.stories.tsx | 1 - .../TemplateSchedulePageView.tsx | 3 --- .../WorkspacePage/WorkspaceTopbar.stories.tsx | 1 - .../src/pages/WorkspacePage/WorkspaceTopbar.tsx | 4 +--- site/src/utils/dormant.test.ts | 17 ++++------------- site/src/utils/dormant.ts | 7 +------ 21 files changed, 17 insertions(+), 110 deletions(-) diff --git a/cli/templatecreate.go b/cli/templatecreate.go index 51a4c33cfa226..4569330e5a522 100644 --- 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 index 9cbcefc88730f..a9abb6e3de36c 100644 --- a/cli/templateedit.go +++ b/cli/templateedit.go @@ -46,18 +46,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 index 3778f590e4f8a..919be044a3b72 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -9108,12 +9108,10 @@ const docTemplate = `{ "codersdk.Experiment": { "type": "string", "enum": [ - "workspace_actions", "tailnet_pg_coordinator", "deployment_health_page" ], "x-enum-varnames": [ - "ExperimentWorkspaceActions", "ExperimentTailnetPGCoordinator", "ExperimentDeploymentHealthPage" ] diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index 0bfff1c165371..2ba01f12bc84f 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -8153,13 +8153,8 @@ }, "codersdk.Experiment": { "type": "string", - "enum": [ - "workspace_actions", - "tailnet_pg_coordinator", - "deployment_health_page" - ], + "enum": ["tailnet_pg_coordinator", "deployment_health_page"], "x-enum-varnames": [ - "ExperimentWorkspaceActions", "ExperimentTailnetPGCoordinator", "ExperimentDeploymentHealthPage" ] diff --git a/codersdk/deployment.go b/codersdk/deployment.go index 831ac91291c2b..914bea20c0fe7 100644 --- 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" - // ExperimentTailnetPGCoordinator enables the PGCoord in favor of the pubsub- // only Coordinator ExperimentTailnetPGCoordinator Experiment = "tailnet_pg_coordinator" diff --git a/docs/api/general.md b/docs/api/general.md index f82c4aaeb3a63..6843ae89d98a2 100644 --- a/docs/api/general.md +++ b/docs/api/general.md @@ -563,7 +563,7 @@ curl -X GET http://coder-server:8080/api/v2/experiments \ > 200 Response ```json -["workspace_actions"] +["tailnet_pg_coordinator"] ``` ### Responses @@ -600,7 +600,7 @@ curl -X GET http://coder-server:8080/api/v2/experiments/available \ > 200 Response ```json -["workspace_actions"] +["tailnet_pg_coordinator"] ``` ### Responses diff --git a/docs/api/schemas.md b/docs/api/schemas.md index 0f2072a1a2f57..7a24e4fca4191 100644 --- a/docs/api/schemas.md +++ b/docs/api/schemas.md @@ -2869,7 +2869,7 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in ## codersdk.Experiment ```json -"workspace_actions" +"tailnet_pg_coordinator" ``` ### Properties @@ -2878,7 +2878,6 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in | Value | | ------------------------ | -| `workspace_actions` | | `tailnet_pg_coordinator` | | `deployment_health_page` | diff --git a/enterprise/cli/templatecreate_test.go b/enterprise/cli/templatecreate_test.go index 9499810b7df3a..6803ad394033e 100644 --- a/enterprise/cli/templatecreate_test.go +++ b/enterprise/cli/templatecreate_test.go @@ -62,11 +62,6 @@ 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{ @@ -74,7 +69,6 @@ func TestTemplateCreate(t *testing.T) { }, }, Options: &coderdtest.Options{ - DeploymentValues: dv, IncludeProvisionerDaemon: true, }, }) diff --git a/enterprise/cli/templateedit_test.go b/enterprise/cli/templateedit_test.go index 36b17e23d2119..75417196a6b8f 100644 --- a/enterprise/cli/templateedit_test.go +++ b/enterprise/cli/templateedit_test.go @@ -89,11 +89,6 @@ 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{ @@ -101,7 +96,6 @@ func TestTemplateEdit(t *testing.T) { }, }, Options: &coderdtest.Options{ - DeploymentValues: dv, IncludeProvisionerDaemon: true, }, }) diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index 572f6d4996a39..34f7ec23377d8 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -1812,14 +1812,10 @@ export const Entitlements: Entitlement[] = [ ]; // From codersdk/deployment.go -export type Experiment = - | "deployment_health_page" - | "tailnet_pg_coordinator" - | "workspace_actions"; +export type Experiment = "deployment_health_page" | "tailnet_pg_coordinator"; export const Experiments: Experiment[] = [ "deployment_health_page", "tailnet_pg_coordinator", - "workspace_actions", ]; // From codersdk/deployment.go diff --git a/site/src/components/Dashboard/DashboardProvider.tsx b/site/src/components/Dashboard/DashboardProvider.tsx index ae05ff0ae7447..7fcefb173eccf 100644 --- 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 index f6b1d393bb7f5..924fc59cb47d9 100644 --- a/site/src/components/WorkspaceDeletion/DormantDeletionText.tsx +++ b/site/src/components/WorkspaceDeletion/DormantDeletionText.tsx @@ -10,20 +10,13 @@ interface DormantDeletionTextProps { export const DormantDeletionText: FC = ({ 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 index f1f0af511ec9b..ae30f12471096 100644 --- 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; } @@ -65,7 +64,6 @@ export const TemplateScheduleForm: FC = ({ onCancel, error, allowAdvancedScheduling, - allowWorkspaceActions, isSubmitting, initialTouched, }) => { @@ -560,7 +558,7 @@ export const TemplateScheduleForm: FC = ({ - {allowAdvancedScheduling && allowWorkspaceActions && ( + {allowAdvancedScheduling && ( <> { 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 index d91600361b205..65a2b885719ee 100644 --- 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 = () => { ; 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 index 5ce8fd3eee5fb..8ad9c4d1391d4 100644 --- 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 = ({ @@ -22,7 +21,6 @@ export const TemplateSchedulePageView: FC = ({ onSubmit, isSubmitting, allowAdvancedScheduling, - allowWorkspaceActions, submitError, initialTouched, }) => { @@ -34,7 +32,6 @@ export const TemplateSchedulePageView: FC = ({ = { 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 index c963ebc8b683f..e41fdc56b2981 100644 --- 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/utils/dormant.test.ts b/site/src/utils/dormant.test.ts index ae02ef017690c..9ca9966e942cf 100644 --- a/site/src/utils/dormant.test.ts +++ b/site/src/utils/dormant.test.ts @@ -34,23 +34,14 @@ describe("displayDormantDeletion", () => { [new Date().toISOString(), true, false, false], // Workspace Actions off ])( `deleting_at=%p, allowAdvancedScheduling=%p, AllowWorkspaceActions=%p, shouldDisplay=%p`, - ( - deleting_at, - allowAdvancedScheduling, - allowWorkspaceActions, - shouldDisplay, - ) => { + (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 index 14ac74f4a00bd..1265647878a82 100644 --- a/site/src/utils/dormant.ts +++ b/site/src/utils/dormant.ts @@ -14,14 +14,9 @@ const IMPENDING_DELETION_DISPLAY_THRESHOLD = 14; // 14 days export const displayDormantDeletion = ( workspace: Workspace, allowAdvancedScheduling: boolean, - allowWorkspaceActions: boolean, ) => { const today = new Date(); - if ( - !workspace.deleting_at || - !allowAdvancedScheduling || - !allowWorkspaceActions - ) { + if (!workspace.deleting_at || !allowAdvancedScheduling) { return false; } return ( From 040fd78c91a8bd8d8c702b5a1b6d0c90134b8fbb Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Thu, 4 Jan 2024 22:30:06 +0000 Subject: [PATCH 2/7] fix test --- site/src/utils/dormant.test.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/site/src/utils/dormant.test.ts b/site/src/utils/dormant.test.ts index 9ca9966e942cf..06d892cc0785b 100644 --- a/site/src/utils/dormant.test.ts +++ b/site/src/utils/dormant.test.ts @@ -4,34 +4,30 @@ 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 + [new Date().toISOString(), true, false], // Workspace Actions off ])( `deleting_at=%p, allowAdvancedScheduling=%p, AllowWorkspaceActions=%p, shouldDisplay=%p`, (deleting_at, allowAdvancedScheduling, shouldDisplay) => { From aa090ec8ab9f7e908a0f52c186713970f875126d Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Thu, 4 Jan 2024 22:37:38 +0000 Subject: [PATCH 3/7] remove unnecessary test --- site/src/utils/dormant.test.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/site/src/utils/dormant.test.ts b/site/src/utils/dormant.test.ts index 06d892cc0785b..babbb5ef6940b 100644 --- a/site/src/utils/dormant.test.ts +++ b/site/src/utils/dormant.test.ts @@ -27,9 +27,8 @@ describe("displayDormantDeletion", () => { ], // today + 1 [new Date().toISOString(), true, true], // today + 0 [new Date().toISOString(), false, false], // Advanced Scheduling off - [new Date().toISOString(), true, false], // Workspace Actions off ])( - `deleting_at=%p, allowAdvancedScheduling=%p, AllowWorkspaceActions=%p, shouldDisplay=%p`, + `deleting_at=%p, allowAdvancedScheduling=%p, shouldDisplay=%p`, (deleting_at, allowAdvancedScheduling, shouldDisplay) => { const workspace: TypesGen.Workspace = { ...Mocks.MockWorkspace, From 3110735d87b426e2dfc938ee8834129e694065aa Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Wed, 10 Jan 2024 00:50:14 +0000 Subject: [PATCH 4/7] make gen --- coderd/apidoc/docs.go | 8 -------- coderd/apidoc/swagger.json | 6 ------ codersdk/deployment.go | 5 ----- docs/api/schemas.md | 4 ---- site/src/api/typesGenerated.ts | 7 ------- 5 files changed, 30 deletions(-) diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go index afb3404a74091..30e20360d3f4d 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -9108,19 +9108,11 @@ const docTemplate = `{ "codersdk.Experiment": { "type": "string", "enum": [ -<<<<<<< HEAD "tailnet_pg_coordinator", "deployment_health_page" ], "x-enum-varnames": [ "ExperimentTailnetPGCoordinator", -======= - "workspace_actions", - "deployment_health_page" - ], - "x-enum-varnames": [ - "ExperimentWorkspaceActions", ->>>>>>> main "ExperimentDeploymentHealthPage" ] }, diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index 53d2ac2dccf5f..b6623cedf23a2 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -8153,15 +8153,9 @@ }, "codersdk.Experiment": { "type": "string", -<<<<<<< HEAD "enum": ["tailnet_pg_coordinator", "deployment_health_page"], "x-enum-varnames": [ "ExperimentTailnetPGCoordinator", -======= - "enum": ["workspace_actions", "deployment_health_page"], - "x-enum-varnames": [ - "ExperimentWorkspaceActions", ->>>>>>> main "ExperimentDeploymentHealthPage" ] }, diff --git a/codersdk/deployment.go b/codersdk/deployment.go index ee4c1d7ef5e23..914bea20c0fe7 100644 --- a/codersdk/deployment.go +++ b/codersdk/deployment.go @@ -2077,14 +2077,9 @@ func (c *Client) BuildInfo(ctx context.Context) (BuildInfoResponse, error) { type Experiment string const ( -<<<<<<< HEAD // ExperimentTailnetPGCoordinator enables the PGCoord in favor of the pubsub- // only Coordinator ExperimentTailnetPGCoordinator Experiment = "tailnet_pg_coordinator" -======= - // https://github.com/coder/coder/milestone/19 - ExperimentWorkspaceActions Experiment = "workspace_actions" ->>>>>>> main // Deployment health page ExperimentDeploymentHealthPage Experiment = "deployment_health_page" diff --git a/docs/api/schemas.md b/docs/api/schemas.md index 3c5c45ad735ff..0971617b86dd2 100644 --- a/docs/api/schemas.md +++ b/docs/api/schemas.md @@ -2878,11 +2878,7 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in | Value | | ------------------------ | -<<<<<<< HEAD | `tailnet_pg_coordinator` | -======= -| `workspace_actions` | ->>>>>>> main | `deployment_health_page` | ## codersdk.ExternalAuth diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index 18ade42d07d0b..015c0a51724d3 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -1813,17 +1813,10 @@ export const Entitlements: Entitlement[] = [ ]; // From codersdk/deployment.go -<<<<<<< HEAD export type Experiment = "deployment_health_page" | "tailnet_pg_coordinator"; export const Experiments: Experiment[] = [ "deployment_health_page", "tailnet_pg_coordinator", -======= -export type Experiment = "deployment_health_page" | "workspace_actions"; -export const Experiments: Experiment[] = [ - "deployment_health_page", - "workspace_actions", ->>>>>>> main ]; // From codersdk/deployment.go From 819466e02f06a43ae2b2ce2d783a9a11c2aa12ca Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Wed, 10 Jan 2024 21:51:53 +0000 Subject: [PATCH 5/7] fix test helper --- site/src/testHelpers/entities.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts index 51f2d7f7d87cf..0e4d613b61fd2 100644 --- 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", From 4bce63da81c214f56859596188500f8a39fc67f8 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Wed, 10 Jan 2024 21:56:16 +0000 Subject: [PATCH 6/7] remove bad merge --- codersdk/deployment.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/codersdk/deployment.go b/codersdk/deployment.go index 914bea20c0fe7..2f4da0675c120 100644 --- a/codersdk/deployment.go +++ b/codersdk/deployment.go @@ -2077,10 +2077,6 @@ func (c *Client) BuildInfo(ctx context.Context) (BuildInfoResponse, error) { type Experiment string const ( - // ExperimentTailnetPGCoordinator enables the PGCoord in favor of the pubsub- - // only Coordinator - ExperimentTailnetPGCoordinator Experiment = "tailnet_pg_coordinator" - // Deployment health page ExperimentDeploymentHealthPage Experiment = "deployment_health_page" From 7bcdb818db4416d93f8231d96d1e9a3d988fcf84 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Wed, 10 Jan 2024 22:03:24 +0000 Subject: [PATCH 7/7] make gen again --- coderd/apidoc/docs.go | 2 -- coderd/apidoc/swagger.json | 7 ++----- coderd/database/models.go | 2 +- coderd/database/querier.go | 2 +- coderd/database/queries.sql.go | 2 +- docs/api/general.md | 4 ++-- docs/api/schemas.md | 3 +-- site/src/api/typesGenerated.ts | 7 ++----- 8 files changed, 10 insertions(+), 19 deletions(-) diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go index 30e20360d3f4d..b3f90cfa06b09 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -9108,11 +9108,9 @@ const docTemplate = `{ "codersdk.Experiment": { "type": "string", "enum": [ - "tailnet_pg_coordinator", "deployment_health_page" ], "x-enum-varnames": [ - "ExperimentTailnetPGCoordinator", "ExperimentDeploymentHealthPage" ] }, diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index b6623cedf23a2..d517185ec2218 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -8153,11 +8153,8 @@ }, "codersdk.Experiment": { "type": "string", - "enum": ["tailnet_pg_coordinator", "deployment_health_page"], - "x-enum-varnames": [ - "ExperimentTailnetPGCoordinator", - "ExperimentDeploymentHealthPage" - ] + "enum": ["deployment_health_page"], + "x-enum-varnames": ["ExperimentDeploymentHealthPage"] }, "codersdk.ExternalAuth": { "type": "object", diff --git a/coderd/database/models.go b/coderd/database/models.go index e8c8ae2c31e50..cf9d8caaaea48 100644 --- a/coderd/database/models.go +++ b/coderd/database/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package database diff --git a/coderd/database/querier.go b/coderd/database/querier.go index 3d2631c49f65f..e32c106787a13 100644 --- a/coderd/database/querier.go +++ b/coderd/database/querier.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package database diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 81bbe52386cf9..f9287915d5438 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package database diff --git a/docs/api/general.md b/docs/api/general.md index 6843ae89d98a2..2ca0a6c5d9873 100644 --- a/docs/api/general.md +++ b/docs/api/general.md @@ -563,7 +563,7 @@ curl -X GET http://coder-server:8080/api/v2/experiments \ > 200 Response ```json -["tailnet_pg_coordinator"] +["deployment_health_page"] ``` ### Responses @@ -600,7 +600,7 @@ curl -X GET http://coder-server:8080/api/v2/experiments/available \ > 200 Response ```json -["tailnet_pg_coordinator"] +["deployment_health_page"] ``` ### Responses diff --git a/docs/api/schemas.md b/docs/api/schemas.md index 0971617b86dd2..a93f5cfc1d9ba 100644 --- a/docs/api/schemas.md +++ b/docs/api/schemas.md @@ -2869,7 +2869,7 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in ## codersdk.Experiment ```json -"tailnet_pg_coordinator" +"deployment_health_page" ``` ### Properties @@ -2878,7 +2878,6 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in | Value | | ------------------------ | -| `tailnet_pg_coordinator` | | `deployment_health_page` | ## codersdk.ExternalAuth diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index 015c0a51724d3..be677e07d58d7 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -1813,11 +1813,8 @@ export const Entitlements: Entitlement[] = [ ]; // From codersdk/deployment.go -export type Experiment = "deployment_health_page" | "tailnet_pg_coordinator"; -export const Experiments: Experiment[] = [ - "deployment_health_page", - "tailnet_pg_coordinator", -]; +export type Experiment = "deployment_health_page"; +export const Experiments: Experiment[] = ["deployment_health_page"]; // From codersdk/deployment.go export type FeatureName = pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy