Skip to content

Commit 02ad3f1

Browse files
kylecarbskylecarbs
authored
chore: Rename Projects to Templates (#880)
Customer feedback indicated projects was a confusing name. After querying the team internally, it seemed unanimous that it is indeed a confusing name. Here's for a lil less confusion @ashmeer7 🥂
1 parent 584c8b4 commit 02ad3f1

File tree

109 files changed

+2706
-2705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+2706
-2705
lines changed

‎cli/clitest/clitest.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ func SetupConfig(t *testing.T, client *codersdk.Client, root config.Root) {
3636
require.NoError(t, err)
3737
}
3838

39-
// CreateProjectVersionSource writes the echo provisioner responses into a
39+
// CreateTemplateVersionSource writes the echo provisioner responses into a
4040
// new temporary testing directory.
41-
func CreateProjectVersionSource(t *testing.T, responses *echo.Responses) string {
41+
func CreateTemplateVersionSource(t *testing.T, responses *echo.Responses) string {
4242
directory := t.TempDir()
4343
data, err := echo.Tar(responses)
4444
require.NoError(t, err)

‎cli/clitest/clitest_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestMain(m *testing.M) {
1717

1818
func TestCli(t *testing.T) {
1919
t.Parallel()
20-
clitest.CreateProjectVersionSource(t, nil)
20+
clitest.CreateTemplateVersionSource(t, nil)
2121
client := coderdtest.New(t, nil)
2222
cmd, config := clitest.New(t)
2323
clitest.SetupConfig(t, client, config)

‎cli/cliui/parameter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/coder/coder/codersdk"
1111
)
1212

13-
func ParameterSchema(cmd *cobra.Command, parameterSchema codersdk.ProjectVersionParameterSchema) (string, error) {
13+
func ParameterSchema(cmd *cobra.Command, parameterSchema codersdk.TemplateVersionParameterSchema) (string, error) {
1414
_, _ = fmt.Fprintln(cmd.OutOrStdout(), Styles.Bold.Render("var."+parameterSchema.Name))
1515
if parameterSchema.Description != "" {
1616
_, _ = fmt.Fprintln(cmd.OutOrStdout(), " "+strings.TrimSpace(strings.Join(strings.Split(parameterSchema.Description, "\n"), "\n "))+"\n")

‎cli/configssh_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ func TestConfigSSH(t *testing.T) {
1919
client := coderdtest.New(t, nil)
2020
user := coderdtest.CreateFirstUser(t, client)
2121
coderdtest.NewProvisionerDaemon(t, client)
22-
version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil)
23-
coderdtest.AwaitProjectVersionJob(t, client, version.ID)
24-
project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID)
25-
workspace := coderdtest.CreateWorkspace(t, client, codersdk.Me, project.ID)
22+
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
23+
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
24+
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
25+
workspace := coderdtest.CreateWorkspace(t, client, codersdk.Me, template.ID)
2626
coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
2727
tempFile, err := os.CreateTemp(t.TempDir(), "")
2828
require.NoError(t, err)

‎cli/login.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func login() *cobra.Command {
150150
cliui.Styles.Paragraph.Render(fmt.Sprintf("Welcome to Coder, %s! You're authenticated.", cliui.Styles.Keyword.Render(username)))+"\n")
151151

152152
_, _ = fmt.Fprintf(cmd.OutOrStdout(),
153-
cliui.Styles.Paragraph.Render("Get started by creating a project: "+cliui.Styles.Code.Render("coder projects create"))+"\n")
153+
cliui.Styles.Paragraph.Render("Get started by creating a template: "+cliui.Styles.Code.Render("coder templates create"))+"\n")
154154
return nil
155155
}
156156

‎cli/parameters.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ func parseScopeAndID(ctx context.Context, client *codersdk.Client, organization
3939
}
4040
scopeID = org.ID
4141
}
42-
case codersdk.ParameterProject:
43-
project, err := client.ProjectByName(ctx, organization.ID, name)
42+
case codersdk.ParameterTemplate:
43+
template, err := client.TemplateByName(ctx, organization.ID, name)
4444
if err != nil {
4545
return scope, uuid.Nil, err
4646
}
47-
scopeID = project.ID
47+
scopeID = template.ID
4848
case codersdk.ParameterUser:
4949
uid, _ := uuid.Parse(name)
5050
user, err := client.User(ctx, uid)
@@ -67,8 +67,8 @@ func parseParameterScope(scope string) (codersdk.ParameterScope, error) {
6767
switch scope {
6868
case string(codersdk.ParameterOrganization):
6969
return codersdk.ParameterOrganization, nil
70-
case string(codersdk.ParameterProject):
71-
return codersdk.ParameterProject, nil
70+
case string(codersdk.ParameterTemplate):
71+
return codersdk.ParameterTemplate, nil
7272
case string(codersdk.ParameterUser):
7373
return codersdk.ParameterUser, nil
7474
case string(codersdk.ParameterWorkspace):

‎cli/root.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ func Root() *cobra.Command {
4343
Example: cliui.Styles.Paragraph.Render(`Start Coder in "dev" mode. This dev-mode requires no further setup, and your local `+cliui.Styles.Code.Render("coder")+` CLI will be authenticated to talk to it. This makes it easy to experiment with Coder.`) + `
4444
4545
` + cliui.Styles.Code.Render("$ coder start --dev") + `
46-
` + cliui.Styles.Paragraph.Render("Get started by creating a project from an example.") + `
46+
` + cliui.Styles.Paragraph.Render("Get started by creating a template from an example.") + `
4747
48-
` + cliui.Styles.Code.Render("$ coder projects init"),
48+
` + cliui.Styles.Code.Render("$ coder templates init"),
4949
}
5050
// Customizes the color of headings to make subcommands
5151
// more visually appealing.
@@ -65,7 +65,7 @@ func Root() *cobra.Command {
6565
start(),
6666
login(),
6767
parameters(),
68-
projects(),
68+
templates(),
6969
users(),
7070
workspaces(),
7171
ssh(),

‎cli/ssh_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestSSH(t *testing.T) {
3131
user := coderdtest.CreateFirstUser(t, client)
3232
coderdtest.NewProvisionerDaemon(t, client)
3333
agentToken := uuid.NewString()
34-
version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, &echo.Responses{
34+
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
3535
Parse: echo.ParseComplete,
3636
ProvisionDryRun: echo.ProvisionComplete,
3737
Provision: []*proto.Provision_Response{{
@@ -51,9 +51,9 @@ func TestSSH(t *testing.T) {
5151
},
5252
}},
5353
})
54-
coderdtest.AwaitProjectVersionJob(t, client, version.ID)
55-
project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID)
56-
workspace := coderdtest.CreateWorkspace(t, client, codersdk.Me, project.ID)
54+
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
55+
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
56+
workspace := coderdtest.CreateWorkspace(t, client, codersdk.Me, template.ID)
5757
go func() {
5858
// Run this async so the SSH command has to wait for
5959
// the build and agent to connect!
@@ -89,7 +89,7 @@ func TestSSH(t *testing.T) {
8989
user := coderdtest.CreateFirstUser(t, client)
9090
coderdtest.NewProvisionerDaemon(t, client)
9191
agentToken := uuid.NewString()
92-
version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, &echo.Responses{
92+
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
9393
Parse: echo.ParseComplete,
9494
ProvisionDryRun: echo.ProvisionComplete,
9595
Provision: []*proto.Provision_Response{{
@@ -109,9 +109,9 @@ func TestSSH(t *testing.T) {
109109
},
110110
}},
111111
})
112-
coderdtest.AwaitProjectVersionJob(t, client, version.ID)
113-
project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID)
114-
workspace := coderdtest.CreateWorkspace(t, client, codersdk.Me, project.ID)
112+
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
113+
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
114+
workspace := coderdtest.CreateWorkspace(t, client, codersdk.Me, template.ID)
115115
go func() {
116116
// Run this async so the SSH command has to wait for
117117
// the build and agent to connect!

‎cli/start.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ func start() *cobra.Command {
217217
cliui.Styles.Field.Render("dev")+` mode. All data is in-memory! Do not use in production. Press `+cliui.Styles.Field.Render("ctrl+c")+` to clean up provisioned infrastructure.`))+
218218
`
219219
`+
220-
cliui.Styles.Paragraph.Render(cliui.Styles.Wrap.Render(cliui.Styles.Prompt.String()+`Run `+cliui.Styles.Code.Render("coder projects init")+" in a new terminal to get started.\n"))+`
220+
cliui.Styles.Paragraph.Render(cliui.Styles.Wrap.Render(cliui.Styles.Prompt.String()+`Run `+cliui.Styles.Code.Render("coder templates init")+" in a new terminal to get started.\n"))+`
221221
`)
222222
} else {
223223
// This is helpful for tests, but can be silently ignored.

‎cli/start_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,10 @@ func TestStart(t *testing.T) {
187187
coderdtest.NewProvisionerDaemon(t, client)
188188

189189
// Create a workspace so the cleanup occurs!
190-
version := coderdtest.CreateProjectVersion(t, client, orgs[0].ID, nil)
191-
coderdtest.AwaitProjectVersionJob(t, client, version.ID)
192-
project := coderdtest.CreateProject(t, client, orgs[0].ID, version.ID)
193-
workspace := coderdtest.CreateWorkspace(t, client, codersdk.Me, project.ID)
190+
version := coderdtest.CreateTemplateVersion(t, client, orgs[0].ID, nil)
191+
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
192+
template := coderdtest.CreateTemplate(t, client, orgs[0].ID, version.ID)
193+
workspace := coderdtest.CreateWorkspace(t, client, codersdk.Me, template.ID)
194194
coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
195195

196196
require.NoError(t, err)

0 commit comments

Comments
 (0)