synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-21 01:28:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow example files to be reused and not error (#5402)

Browse Source
This commit is contained in:
Garrett Delfosse
2022-12-13 11:27:37 -05:00
committed by GitHub
parent 50d1c7191a
commit 560c8ce0f6
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
coderd/templateversions.go
View File

@ -878,6 +878,21 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
// upload a copy of the template tar as a file in the database // upload a copy of the template tar as a file in the database
hashBytes := sha256.Sum256(tar) hashBytes := sha256.Sum256(tar)
hash := hex.EncodeToString(hashBytes[:]) hash := hex.EncodeToString(hashBytes[:])
// Check if the file already exists.
file, err := api.Database.GetFileByHashAndCreator(ctx, database.GetFileByHashAndCreatorParams{
Hash: hash,
CreatedBy: apiKey.UserID,
})
if err != nil {
if !errors.Is(err, sql.ErrNoRows) {
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error fetching file.",
Detail: err.Error(),
})
return
}
// If the example tar file doesn't exist, create it.
file, err = api.Database.InsertFile(ctx, database.InsertFileParams{ file, err = api.Database.InsertFile(ctx, database.InsertFileParams{
ID: uuid.New(), ID: uuid.New(),
Hash: hash, Hash: hash,
@ -895,6 +910,9 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
} }
} }
req.FileID = file.ID
}
if req.FileID != uuid.Nil { if req.FileID != uuid.Nil {
file, err = api.Database.GetFileByID(ctx, req.FileID) file, err = api.Database.GetFileByID(ctx, req.FileID)
if errors.Is(err, sql.ErrNoRows) { if errors.Is(err, sql.ErrNoRows) {

9
coderd/templateversions_test.go
View File

@ -179,6 +179,15 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
tar, err := examples.Archive(ls[0].ID) tar, err := examples.Archive(ls[0].ID)
require.NoError(t, err) require.NoError(t, err)
require.EqualValues(t, tar, fl) require.EqualValues(t, tar, fl)
// ensure we don't get file conflicts on multiple uses of the same example
tv, err = client.CreateTemplateVersion(ctx, user.OrganizationID, codersdk.CreateTemplateVersionRequest{
Name: "my-example",
StorageMethod: codersdk.ProvisionerStorageMethodFile,
ExampleID: ls[0].ID,
Provisioner: codersdk.ProvisionerTypeEcho,
})
require.NoError(t, err)
}) })
} }