Linting fixes

Emyrk · Emyrk · commit 9438db81173a · 2022-06-17T10:14:44.000-05:00
diff --git a/cli/templatecreate.go b/cli/templatecreate.go
@@ -256,7 +256,7 @@ func createValidTemplateVersion(cmd *cobra.Command, args createValidTemplateVers
 				// If the value is not in the param file, and can be pulled from the last template version,
 				// then don't mark it as missing.
 				parameters = append(parameters, codersdk.CreateParameterRequest{
-					CopyFromParameter: inherit.ID,
+					CloneID: inherit.ID,
 				})
 				pulled = append(pulled, fmt.Sprintf("%q", parameterSchema.Name))
 				continue
diff --git a/cli/templateupdate_test.go b/cli/templateupdate_test.go
@@ -29,6 +29,7 @@ func TestTemplateUpdate(t *testing.T) {
 	//	6. Creates a new version with 0 params
 	//	7. Asset 0 params in new version
 	t.Run("NewParameter", func(t *testing.T) {
+		t.Parallel()
 		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
 		user := coderdtest.CreateFirstUser(t, client)
 		// Create initial template version to update
@@ -107,6 +108,7 @@ func TestTemplateUpdate(t *testing.T) {
 	})
 
 	t.Run("OK", func(t *testing.T) {
+		t.Parallel()
 		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
 		user := coderdtest.CreateFirstUser(t, client)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -8,12 +8,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coder/coder/coderd/util/slice"
-
 	"github.com/google/uuid"
 	"golang.org/x/exp/slices"
 
 	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/util/slice"
 )
 
 // New returns an in-memory fake of the database.
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -640,8 +640,8 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
 		jobID := uuid.New()
 		inherits := make([]uuid.UUID, 0)
 		for _, parameterValue := range req.ParameterValues {
-			if parameterValue.CopyFromParameter != uuid.Nil {
-				inherits = append(inherits, parameterValue.CopyFromParameter)
+			if parameterValue.CloneID != uuid.Nil {
+				inherits = append(inherits, parameterValue.CloneID)
 			}
 		}
 
@@ -681,7 +681,7 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
 		}
 
 		for _, parameterValue := range req.ParameterValues {
-			if parameterValue.CopyFromParameter != uuid.Nil {
+			if parameterValue.CloneID != uuid.Nil {
 				continue
 			}
 
diff --git a/codersdk/parameters.go b/codersdk/parameters.go
@@ -78,12 +78,12 @@ type ParameterSchema struct {
 
 // CreateParameterRequest is used to create a new parameter value for a scope.
 type CreateParameterRequest struct {
-	// CopyFromParameter allows copying the value of another parameter.
+	// CloneID allows copying the value of another parameter.
 	// The other param must be related to the same template_id for this to
 	// succeed.
 	// No other fields are required if using this, as all fields will be copied
 	// from the other parameter.
-	CopyFromParameter uuid.UUID `json:"copy_from_parameter,omitempty" validate:"uuid4"`
+	CloneID uuid.UUID `json:"copy_from_parameter,omitempty" validate:"uuid4"`
 
 	Name              string                     `json:"name" validate:"required"`
 	SourceValue       string                     `json:"source_value" validate:"required"`

Original file line number	Diff line number	Diff line change
`@@ -640,8 +640,8 @@ func (api API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r ht`
`640`	`640`	`jobID := uuid.New()`
`641`	`641`	`inherits := make([]uuid.UUID, 0)`
`642`	`642`	`for _, parameterValue := range req.ParameterValues {`
`643`		`- if parameterValue.CopyFromParameter != uuid.Nil {`
`644`		`- inherits = append(inherits, parameterValue.CopyFromParameter)`
	`643`	`+ if parameterValue.CloneID != uuid.Nil {`
	`644`	`+ inherits = append(inherits, parameterValue.CloneID)`
`645`	`645`	`}`
`646`	`646`	`}`
`647`	`647`
`@@ -681,7 +681,7 @@ func (api API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r ht`
`681`	`681`	`}`
`682`	`682`
`683`	`683`	`for _, parameterValue := range req.ParameterValues {`
`684`		`- if parameterValue.CopyFromParameter != uuid.Nil {`
	`684`	`+ if parameterValue.CloneID != uuid.Nil {`
`685`	`685`	`continue`
`686`	`686`	`}`
`687`	`687`