remove time component

f0ssel · f0ssel · commit f9bd7c2834da · 2023-12-15T13:51:32.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -583,9 +583,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 					HostnamePrefix:   vals.SSHConfig.DeploymentName.String(),
 					SSHConfigOptions: configSSHOptions,
 				},
-				// we are experimenting with self destructing flags that stop working after a certain date.
-				// This flag should be removed after the date specified below.
-				AllowWorkspaceRenames: allowWorkspaceRenames(vals.AllowWorkspaceRenames.Value()),
+				AllowWorkspaceRenames: vals.AllowWorkspaceRenames.Value(),
 			}
 			if httpServers.TLSConfig != nil {
 				options.TLSCertificates = httpServers.TLSConfig.Certificates
@@ -2551,7 +2549,3 @@ func parseExternalAuthProvidersFromEnv(prefix string, environ []string) ([]coder
 	}
 	return providers, nil
 }
-
-func allowWorkspaceRenames(flagValue bool) bool {
-	return flagValue && time.Now().Before(codersdk.WorkspaceRenameDeadline)
-}
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"flag"
-	"fmt"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -1846,7 +1845,7 @@ Write out the current server config as YAML to stdout.`,
 		},
 		{
 			Name:        "Allow Workspace Renames",
-			Description: fmt.Sprintf("DEPRECATED: Allow users to rename their workspaces. Use only for temporary compatibility reasons, this flag will no longer function after %s.", WorkspaceRenameDeadline.Format("2006-01-02")),
+			Description: "DEPRECATED: Allow users to rename their workspaces. Use only for temporary compatibility reasons.",
 			Flag:        "allow-workspace-renames",
 			Env:         "CODER_ALLOW_WORKSPACE_RENAMES",
 			Default:     "false",
diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go
@@ -21,8 +21,6 @@ const (
 	AutomaticUpdatesNever  AutomaticUpdates = "never"
 )
 
-var WorkspaceRenameDeadline = time.Date(2024, 04, 01, 0, 0, 0, 0, time.UTC)
-
 // Workspace is a deployment of a template. It references a specific
 // version and can be updated.
 type Workspace struct {

Original file line number	Diff line number	Diff line change
`@@ -583,9 +583,7 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`583`	`583`	`HostnamePrefix: vals.SSHConfig.DeploymentName.String(),`
`584`	`584`	`SSHConfigOptions: configSSHOptions,`
`585`	`585`	`},`
`586`		`- // we are experimenting with self destructing flags that stop working after a certain date.`
`587`		`- // This flag should be removed after the date specified below.`
`588`		`- AllowWorkspaceRenames: allowWorkspaceRenames(vals.AllowWorkspaceRenames.Value()),`
	`586`	`+ AllowWorkspaceRenames: vals.AllowWorkspaceRenames.Value(),`
`589`	`587`	`}`
`590`	`588`	`if httpServers.TLSConfig != nil {`
`591`	`589`	`options.TLSCertificates = httpServers.TLSConfig.Certificates`
`@@ -2551,7 +2549,3 @@ func parseExternalAuthProvidersFromEnv(prefix string, environ []string) ([]coder`
`2551`	`2549`	`}`
`2552`	`2550`	`return providers, nil`
`2553`	`2551`	`}`
`2554`		`-`
`2555`		`-func allowWorkspaceRenames(flagValue bool) bool {`
`2556`		`- return flagValue && time.Now().Before(codersdk.WorkspaceRenameDeadline)`
`2557`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@ const (`
`21`	`21`	`AutomaticUpdatesNever AutomaticUpdates = "never"`
`22`	`22`	`)`
`23`	`23`
`24`		`-var WorkspaceRenameDeadline = time.Date(2024, 04, 01, 0, 0, 0, 0, time.UTC)`
`25`		`-`
`26`	`24`	`// Workspace is a deployment of a template. It references a specific`
`27`	`25`	`// version and can be updated.`
`28`	`26`	`type Workspace struct {`