Jul 11, 2023 · Jul 6, 2023 · Jul 6, 2023 · Jul 6, 2023 · Jul 6, 2023 · Jul 6, 2023
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
 CreatedAt:      arg.CreatedAt,
 UpdatedAt:      arg.UpdatedAt,
 Name:           arg.Name,
 Message:        arg.Message,
 Readme:         arg.Readme,
 JobID:          arg.JobID,
 CreatedBy:      arg.CreatedBy,
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
 CreatedAt:      takeFirst(orig.CreatedAt, database.Now()),
 UpdatedAt:      takeFirst(orig.UpdatedAt, database.Now()),
 Name:           takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
 Message:        orig.Message,
 Readme:         takeFirst(orig.Readme, namesgenerator.GetRandomName(1)),
 JobID:          takeFirst(orig.JobID, uuid.New()),
 CreatedBy:      takeFirst(orig.CreatedBy, uuid.New()),
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
 CreatedAt:      database.Now(),
 UpdatedAt:      database.Now(),
 Name:           req.Name,
 Message:        req.Message,
 Readme:         "",
 JobID:          provisionerJob.ID,
 CreatedBy:      apiKey.UserID,
 CreatedAt:      version.CreatedAt,
 UpdatedAt:      version.UpdatedAt,
 Name:           version.Name,
 Message:        version.Message,
 Job:            job,
 Readme:         version.Readme,
 CreatedBy:      createdBy,
diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go
 user := coderdtest.CreateFirstUser(t, client)
 authz := coderdtest.AssertRBAC(t, api, client).Reset()

 version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil, func(req *codersdk.CreateTemplateVersionRequest) {
 req.Name = "bananas"
 req.Message = "first try"
 })
 authz.AssertChecked(t, rbac.ActionCreate, rbac.ResourceTemplate.InOrg(user.OrganizationID))

 ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 tv, err := client.TemplateVersion(ctx, version.ID)
 authz.AssertChecked(t, rbac.ActionRead, tv)
 require.NoError(t, err)

 assert.Equal(t, "bananas", tv.Name)
 assert.Equal(t, "first try", tv.Message)
 })

 t.Run("MemberCanRead", func(t *testing.T) {
diff --git a/codersdk/organizations.go b/codersdk/organizations.go

 // CreateTemplateVersionRequest enables callers to create a new Template Version.
 type CreateTemplateVersionRequest struct {
 Name string `json:"name,omitempty" validate:"omitempty,template_version_name"`
 Name    string `json:"name,omitempty" validate:"omitempty,template_version_name"`
 Message string `json:"message,omitempty"`
 // TemplateID optionally associates a version with a template.
 TemplateID      uuid.UUID                `json:"template_id,omitempty" format:"uuid"`
 StorageMethod   ProvisionerStorageMethod `json:"storage_method" validate:"oneof=file,required" enums:"file"`
diff --git a/codersdk/templateversions.go b/codersdk/templateversions.go
 CreatedAt      time.Time      `json:"created_at" format:"date-time"`
 UpdatedAt      time.Time      `json:"updated_at" format:"date-time"`
 Name           string         `json:"name"`
 Message        string         `json:"message"`
 Job            ProvisionerJob `json:"job"`
 Readme         string         `json:"readme"`
 CreatedBy      User           `json:"created_by"`
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3932,6 +3932,7 @@ func (q *fakeQuerier) InsertTemplateVersion(_ context.Context, arg database.Inse
		CreatedAt: arg.CreatedAt,
		UpdatedAt: arg.UpdatedAt,
		Name: arg.Name,
		Message: arg.Message,
		Readme: arg.Readme,
		JobID: arg.JobID,
		CreatedBy: arg.CreatedBy,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -477,6 +477,7 @@ func TemplateVersion(t testing.TB, db database.Store, orig database.TemplateVers
		CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
		UpdatedAt: takeFirst(orig.UpdatedAt, database.Now()),
		Name: takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
		Message: orig.Message,
Copy link Member mtojekJul 6, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. nit: what about testing? do we need a random message generated for unit tests or maybe benchmarks in the future? Copy link MemberAuthor mafredriJul 6, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. It's a valid concern, although I didn't do it because I'm sure how we'd set an empty message if we use`takeFirst` here on a randomly generated one. Copy link Member EmyrkJul 7, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. @mafredri the empty`takeFirst` is such an annoying problem 😢
		Readme: takeFirst(orig.Readme, namesgenerator.GetRandomName(1)),
		JobID: takeFirst(orig.JobID, uuid.New()),
		CreatedBy: takeFirst(orig.CreatedBy, uuid.New()),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1306,6 +1306,7 @@ func (api API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r ht
		CreatedAt: database.Now(),
		UpdatedAt: database.Now(),
		Name: req.Name,
		Message: req.Message,
mafredri marked this conversation as resolved. Show resolvedHide resolved
		Readme: "",
		JobID: provisionerJob.ID,
		CreatedBy: apiKey.UserID,
Expand DownExpand Up		@@ -1420,6 +1421,7 @@ func convertTemplateVersion(version database.TemplateVersion, job codersdk.Provi
		CreatedAt: version.CreatedAt,
		UpdatedAt: version.UpdatedAt,
		Name: version.Name,
		Message: version.Message,
		Job: job,
		Readme: version.Readme,
		CreatedBy: createdBy,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,7 +33,10 @@ func TestTemplateVersion(t *testing.T) {
		user := coderdtest.CreateFirstUser(t, client)
		authz := coderdtest.AssertRBAC(t, api, client).Reset()

		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil, func(req *codersdk.CreateTemplateVersionRequest) {
		req.Name = "bananas"
		req.Message = "first try"
		})
		authz.AssertChecked(t, rbac.ActionCreate, rbac.ResourceTemplate.InOrg(user.OrganizationID))

		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
Expand All		@@ -43,6 +46,9 @@ func TestTemplateVersion(t *testing.T) {
		tv, err := client.TemplateVersion(ctx, version.ID)
		authz.AssertChecked(t, rbac.ActionRead, tv)
		require.NoError(t, err)

		assert.Equal(t, "bananas", tv.Name)
		assert.Equal(t, "first try", tv.Message)
		})

		t.Run("MemberCanRead", func(t *testing.T) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,7 +42,8 @@ type OrganizationMember struct {

		// CreateTemplateVersionRequest enables callers to create a new Template Version.
		type CreateTemplateVersionRequest struct {
		Name string `json:"name,omitempty" validate:"omitempty,template_version_name"`
		Name string `json:"name,omitempty" validate:"omitempty,template_version_name"`
		Message string `json:"message,omitempty"`
mafredri marked this conversation as resolved. Show resolvedHide resolved
		// TemplateID optionally associates a version with a template.
		TemplateID uuid.UUID `json:"template_id,omitempty" format:"uuid"`
		StorageMethod ProvisionerStorageMethod `json:"storage_method" validate:"oneof=file,required" enums:"file"`
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,6 +25,7 @@ type TemplateVersion struct {
		CreatedAt time.Time `json:"created_at" format:"date-time"`
		UpdatedAt time.Time `json:"updated_at" format:"date-time"`
		Name string `json:"name"`
		Message string `json:"message"`
		Job ProvisionerJob `json:"job"`
		Readme string `json:"readme"`
		CreatedBy User `json:"created_by"`
Expand Down