Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit292d7f8

Browse files
kylecarbsBrunoQuaresma
authored andcommitted
chore: Rename Projects to Templates (#880)
Customer feedback indicated projects was a confusing name.After querying the team internally, it seemed unanimousthat it is indeed a confusing name.Here's for a lil less confusion@ashmeer7 🥂
1 parent6d35838 commit292d7f8

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-
funcCreateProjectVersionSource(t*testing.T,responses*echo.Responses)string {
41+
funcCreateTemplateVersionSource(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
funcTestCli(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-
funcParameterSchema(cmd*cobra.Command,parameterSchema codersdk.ProjectVersionParameterSchema) (string,error) {
13+
funcParameterSchema(cmd*cobra.Command,parameterSchema codersdk.TemplateVersionParameterSchema) (string,error) {
1414
_,_=fmt.Fprintln(cmd.OutOrStdout(),Styles.Bold.Render("var."+parameterSchema.Name))
1515
ifparameterSchema.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 aproject: "+cliui.Styles.Code.Render("coderprojects create"))+"\n")
153+
cliui.Styles.Paragraph.Render("Get started by creating atemplate: "+cliui.Styles.Code.Render("codertemplates create"))+"\n")
154154
returnnil
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-
casecodersdk.ParameterProject:
43-
project,err:=client.ProjectByName(ctx,organization.ID,name)
42+
casecodersdk.ParameterTemplate:
43+
template,err:=client.TemplateByName(ctx,organization.ID,name)
4444
iferr!=nil {
4545
returnscope,uuid.Nil,err
4646
}
47-
scopeID=project.ID
47+
scopeID=template.ID
4848
casecodersdk.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
switchscope {
6868
casestring(codersdk.ParameterOrganization):
6969
returncodersdk.ParameterOrganization,nil
70-
casestring(codersdk.ParameterProject):
71-
returncodersdk.ParameterProject,nil
70+
casestring(codersdk.ParameterTemplate):
71+
returncodersdk.ParameterTemplate,nil
7272
casestring(codersdk.ParameterUser):
7373
returncodersdk.ParameterUser,nil
7474
casestring(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 aproject from an example.")+`
46+
`+cliui.Styles.Paragraph.Render("Get started by creating atemplate from an example.")+`
4747
48-
`+cliui.Styles.Code.Render("$ coderprojects init"),
48+
`+cliui.Styles.Code.Render("$ codertemplates 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
gofunc() {
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
gofunc() {
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("coderprojects 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("codertemplates 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)

‎cli/projectcreate.gorenamed to‎cli/templatecreate.go

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ import (
2020
"github.com/coder/coder/provisionersdk"
2121
)
2222

23-
funcprojectCreate()*cobra.Command {
23+
functemplateCreate()*cobra.Command {
2424
var (
2525
yesbool
2626
directorystring
2727
provisionerstring
2828
)
2929
cmd:=&cobra.Command{
3030
Use:"create [name]",
31-
Short:"Create aproject from the current directory",
31+
Short:"Create atemplate from the current directory",
3232
RunE:func(cmd*cobra.Command,args []string)error {
3333
client,err:=createClient(cmd)
3434
iferr!=nil {
@@ -39,15 +39,15 @@ func projectCreate() *cobra.Command {
3939
returnerr
4040
}
4141

42-
varprojectNamestring
42+
vartemplateNamestring
4343
iflen(args)==0 {
44-
projectName=filepath.Base(directory)
44+
templateName=filepath.Base(directory)
4545
}else {
46-
projectName=args[0]
46+
templateName=args[0]
4747
}
48-
_,err=client.ProjectByName(cmd.Context(),organization.ID,projectName)
48+
_,err=client.TemplateByName(cmd.Context(),organization.ID,templateName)
4949
iferr==nil {
50-
returnxerrors.Errorf("Aproject already exists named %q!",projectName)
50+
returnxerrors.Errorf("Atemplate already exists named %q!",templateName)
5151
}
5252

5353
spin:=spinner.New(spinner.CharSets[5],100*time.Millisecond)
@@ -69,14 +69,14 @@ func projectCreate() *cobra.Command {
6969
spin=spinner.New(spinner.CharSets[5],100*time.Millisecond)
7070
spin.Writer=cmd.OutOrStdout()
7171
spin.Suffix=cliui.Styles.Keyword.Render("Something")
72-
job,parameters,err:=createValidProjectVersion(cmd,client,organization,database.ProvisionerType(provisioner),resp.Hash)
72+
job,parameters,err:=createValidTemplateVersion(cmd,client,organization,database.ProvisionerType(provisioner),resp.Hash)
7373
iferr!=nil {
7474
returnerr
7575
}
7676

7777
if!yes {
7878
_,err=cliui.Prompt(cmd, cliui.PromptOptions{
79-
Text:"Createproject?",
79+
Text:"Createtemplate?",
8080
IsConfirm:true,
8181
Default:"yes",
8282
})
@@ -88,16 +88,16 @@ func projectCreate() *cobra.Command {
8888
}
8989
}
9090

91-
_,err=client.CreateProject(cmd.Context(),organization.ID, codersdk.CreateProjectRequest{
92-
Name:projectName,
91+
_,err=client.CreateTemplate(cmd.Context(),organization.ID, codersdk.CreateTemplateRequest{
92+
Name:templateName,
9393
VersionID:job.ID,
9494
ParameterValues:parameters,
9595
})
9696
iferr!=nil {
9797
returnerr
9898
}
9999

100-
_,_=fmt.Fprintf(cmd.OutOrStdout(),"The %sproject has been created!\n",projectName)
100+
_,_=fmt.Fprintf(cmd.OutOrStdout(),"The %stemplate has been created!\n",templateName)
101101
returnnil
102102
},
103103
}
@@ -113,9 +113,9 @@ func projectCreate() *cobra.Command {
113113
returncmd
114114
}
115115

116-
funccreateValidProjectVersion(cmd*cobra.Command,client*codersdk.Client,organization codersdk.Organization,provisioner database.ProvisionerType,hashstring,parameters...codersdk.CreateParameterRequest) (*codersdk.ProjectVersion, []codersdk.CreateParameterRequest,error) {
116+
funccreateValidTemplateVersion(cmd*cobra.Command,client*codersdk.Client,organization codersdk.Organization,provisioner database.ProvisionerType,hashstring,parameters...codersdk.CreateParameterRequest) (*codersdk.TemplateVersion, []codersdk.CreateParameterRequest,error) {
117117
before:=time.Now()
118-
version,err:=client.CreateProjectVersion(cmd.Context(),organization.ID, codersdk.CreateProjectVersionRequest{
118+
version,err:=client.CreateTemplateVersion(cmd.Context(),organization.ID, codersdk.CreateTemplateVersionRequest{
119119
StorageMethod:database.ProvisionerStorageMethodFile,
120120
StorageSource:hash,
121121
Provisioner:provisioner,
@@ -127,51 +127,51 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga
127127

128128
err=cliui.ProvisionerJob(cmd.Context(),cmd.OutOrStdout(), cliui.ProvisionerJobOptions{
129129
Fetch:func() (codersdk.ProvisionerJob,error) {
130-
version,err:=client.ProjectVersion(cmd.Context(),version.ID)
130+
version,err:=client.TemplateVersion(cmd.Context(),version.ID)
131131
returnversion.Job,err
132132
},
133133
Cancel:func()error {
134-
returnclient.CancelProjectVersion(cmd.Context(),version.ID)
134+
returnclient.CancelTemplateVersion(cmd.Context(),version.ID)
135135
},
136136
Logs:func() (<-chan codersdk.ProvisionerJobLog,error) {
137-
returnclient.ProjectVersionLogsAfter(cmd.Context(),version.ID,before)
137+
returnclient.TemplateVersionLogsAfter(cmd.Context(),version.ID,before)
138138
},
139139
})
140140
iferr!=nil {
141141
if!provisionerd.IsMissingParameterError(err.Error()) {
142142
returnnil,nil,err
143143
}
144144
}
145-
version,err=client.ProjectVersion(cmd.Context(),version.ID)
145+
version,err=client.TemplateVersion(cmd.Context(),version.ID)
146146
iferr!=nil {
147147
returnnil,nil,err
148148
}
149-
parameterSchemas,err:=client.ProjectVersionSchema(cmd.Context(),version.ID)
149+
parameterSchemas,err:=client.TemplateVersionSchema(cmd.Context(),version.ID)
150150
iferr!=nil {
151151
returnnil,nil,err
152152
}
153-
parameterValues,err:=client.ProjectVersionParameters(cmd.Context(),version.ID)
153+
parameterValues,err:=client.TemplateVersionParameters(cmd.Context(),version.ID)
154154
iferr!=nil {
155155
returnnil,nil,err
156156
}
157157

158158
ifprovisionerd.IsMissingParameterError(version.Job.Error) {
159-
valuesBySchemaID:=map[string]codersdk.ProjectVersionParameter{}
159+
valuesBySchemaID:=map[string]codersdk.TemplateVersionParameter{}
160160
for_,parameterValue:=rangeparameterValues {
161161
valuesBySchemaID[parameterValue.SchemaID.String()]=parameterValue
162162
}
163163
sort.Slice(parameterSchemas,func(i,jint)bool {
164164
returnparameterSchemas[i].Name<parameterSchemas[j].Name
165165
})
166-
missingSchemas:=make([]codersdk.ProjectVersionParameterSchema,0)
166+
missingSchemas:=make([]codersdk.TemplateVersionParameterSchema,0)
167167
for_,parameterSchema:=rangeparameterSchemas {
168168
_,ok:=valuesBySchemaID[parameterSchema.ID.String()]
169169
ifok {
170170
continue
171171
}
172172
missingSchemas=append(missingSchemas,parameterSchema)
173173
}
174-
_,_=fmt.Fprintln(cmd.OutOrStdout(),cliui.Styles.Paragraph.Render("Thisproject has required variables! They are scoped to theproject, and not viewable after being set.")+"\r\n")
174+
_,_=fmt.Fprintln(cmd.OutOrStdout(),cliui.Styles.Paragraph.Render("Thistemplate has required variables! They are scoped to thetemplate, and not viewable after being set.")+"\r\n")
175175
for_,parameterSchema:=rangemissingSchemas {
176176
value,err:=cliui.ParameterSchema(cmd,parameterSchema)
177177
iferr!=nil {
@@ -185,18 +185,18 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga
185185
})
186186
_,_=fmt.Fprintln(cmd.OutOrStdout())
187187
}
188-
returncreateValidProjectVersion(cmd,client,organization,provisioner,hash,parameters...)
188+
returncreateValidTemplateVersion(cmd,client,organization,provisioner,hash,parameters...)
189189
}
190190

191191
ifversion.Job.Status!=codersdk.ProvisionerJobSucceeded {
192192
returnnil,nil,xerrors.New(version.Job.Error)
193193
}
194194

195-
_,_=fmt.Fprintf(cmd.OutOrStdout(),cliui.Styles.Checkmark.String()+" Successfully importedproject source!\n")
195+
_,_=fmt.Fprintf(cmd.OutOrStdout(),cliui.Styles.Checkmark.String()+" Successfully importedtemplate source!\n")
196196

197-
resources,err:=client.ProjectVersionResources(cmd.Context(),version.ID)
197+
resources,err:=client.TemplateVersionResources(cmd.Context(),version.ID)
198198
iferr!=nil {
199199
returnnil,nil,err
200200
}
201-
return&version,parameters,displayProjectVersionInfo(cmd,resources)
201+
return&version,parameters,displayTemplateVersionInfo(cmd,resources)
202202
}

‎cli/projectcreate_test.gorenamed to‎cli/templatecreate_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ import (
1212
"github.com/coder/coder/pty/ptytest"
1313
)
1414

15-
funcTestProjectCreate(t*testing.T) {
15+
funcTestTemplateCreate(t*testing.T) {
1616
t.Parallel()
1717
t.Run("Create",func(t*testing.T) {
1818
t.Parallel()
1919
client:=coderdtest.New(t,nil)
2020
coderdtest.CreateFirstUser(t,client)
21-
source:=clitest.CreateProjectVersionSource(t,&echo.Responses{
21+
source:=clitest.CreateTemplateVersionSource(t,&echo.Responses{
2222
Parse:echo.ParseComplete,
2323
Provision:echo.ProvisionComplete,
2424
})
25-
cmd,root:=clitest.New(t,"projects","create","my-project","--directory",source,"--provisioner",string(database.ProvisionerTypeEcho))
25+
cmd,root:=clitest.New(t,"templates","create","my-template","--directory",source,"--provisioner",string(database.ProvisionerTypeEcho))
2626
clitest.SetupConfig(t,client,root)
2727
_=coderdtest.NewProvisionerDaemon(t,client)
2828
doneChan:=make(chanstruct{})
@@ -35,7 +35,7 @@ func TestProjectCreate(t *testing.T) {
3535
require.NoError(t,err)
3636
}()
3737
matches:= []string{
38-
"Createproject?","yes",
38+
"Createtemplate?","yes",
3939
}
4040
fori:=0;i<len(matches);i+=2 {
4141
match:=matches[i]

‎cli/projectedit.gorenamed to‎cli/templateedit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cli
22

33
import"github.com/spf13/cobra"
44

5-
funcprojectEdit()*cobra.Command {
5+
functemplateEdit()*cobra.Command {
66
return&cobra.Command{
77
Use:"edit",
88
RunE:func(cmd*cobra.Command,args []string)error {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp