Working implementation of inherited params

coder · Emyrk · Jun 17, 2022 · Jun 14, 2022 · Jun 15, 2022 · Jun 15, 2022
commit aceca623a9b8604ea27c009bf399962edd781e43
diff --git a/cli/parameterslist.go b/cli/parameterslist.go
@@ -46,15 +46,15 @@ func parameterList() *cobra.Command {
 				}
 				scopeID = template.ID
 
-			case codersdk.ParameterScopeImportJob, "template_version":
-				scope = string(codersdk.ParameterScopeImportJob)
+			case codersdk.ParameterImportJob, "template_version":
+				scope = string(codersdk.ParameterImportJob)
 				scopeID, err = uuid.Parse(name)
 				if err != nil {
 					return xerrors.Errorf("%q must be a uuid for this scope type", name)
 				}
 			default:
 				return xerrors.Errorf("%q is an unsupported scope, use %v", scope, []codersdk.ParameterScope{
-					codersdk.ParameterWorkspace, codersdk.ParameterTemplate, codersdk.ParameterScopeImportJob,
+					codersdk.ParameterWorkspace, codersdk.ParameterTemplate, codersdk.ParameterImportJob,
 				})
 			}
 

diff --git a/cli/templatecreate.go b/cli/templatecreate.go
@@ -196,11 +196,37 @@ func createValidTemplateVersion(cmd *cobra.Command, args createValidTemplateVers
 		return nil, nil, err
 	}
 
+	// lastParameterValues are pulled from the current active template version if
+	// templateID is provided. This allows pulling params from the last
+	// version if we are updating template versions.
+	lastParameterValues := make(map[string]codersdk.Parameter)
+	if args.TemplateID != uuid.Nil {
+		template, err := client.Template(cmd.Context(), args.TemplateID)
+		if err != nil {
+			return nil, nil, xerrors.Errorf("Fetch template: %w", err)
+		}
+
+		activeVersion, err := client.TemplateVersion(cmd.Context(), template.ActiveVersionID)
+		if err != nil {
+			return nil, nil, xerrors.Errorf("Fetch current active template version: %w", err)
+		}
+
+		// We don't want to compute the params, we only want to copy from this scope
+		values, err := client.Parameters(cmd.Context(), codersdk.ParameterImportJob, activeVersion.Job.ID)
+		if err != nil {
+			return nil, nil, xerrors.Errorf("Fetch previous version parameters: %w", err)
+		}
+		for _, value := range values {
+			lastParameterValues[value.Name] = value
+		}
+	}
+
 	if provisionerd.IsMissingParameterError(version.Job.Error) {
 		valuesBySchemaID := map[string]codersdk.TemplateVersionParameter{}
 		for _, parameterValue := range parameterValues {
 			valuesBySchemaID[parameterValue.SchemaID.String()] = parameterValue
 		}
+
 		sort.Slice(parameterSchemas, func(i, j int) bool {
 			return parameterSchemas[i].Name < parameterSchemas[j].Name
 		})
@@ -224,6 +250,12 @@ func createValidTemplateVersion(cmd *cobra.Command, args createValidTemplateVers
 			}
 		}
 		for _, parameterSchema := range missingSchemas {
+			if inherit, ok := lastParameterValues[parameterSchema.Name]; ok {
+				parameters = append(parameters, codersdk.CreateParameterRequest{
+					CopyFromParameter: inherit.ID,
+				})
+				continue
+			}
 			parameterValue, err := getParameterValueFromMapOrInput(cmd, parameterMapFromFile, parameterSchema)
 			if err != nil {
 				return nil, nil, err

diff --git a/cli/templateupdate.go b/cli/templateupdate.go
@@ -68,9 +68,7 @@ func templateUpdate() *cobra.Command {
 			}
 			spin.Stop()
 
-			//before := time.Now()
-
-			job, parameters, err := createValidTemplateVersion(cmd, createValidTemplateVersionArgs{
+			job, _, err := createValidTemplateVersion(cmd, createValidTemplateVersionArgs{
 				Client:        client,
 				Organization:  organization,
 				Provisioner:   database.ProvisionerType(provisioner),
@@ -95,8 +93,7 @@ func templateUpdate() *cobra.Command {
 			}
 
 			err = client.UpdateActiveTemplateVersion(cmd.Context(), template.ID, codersdk.UpdateActiveTemplateVersion{
-				ID:              job.ID,
-				ParameterValues: parameters,
+				ID: job.ID,
 			})
 			if err != nil {
 				return err

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -101,6 +101,20 @@ func (q *fakeQuerier) AcquireProvisionerJob(_ context.Context, arg database.Acqu
 	return database.ProvisionerJob{}, sql.ErrNoRows
 }
 
+func (q *fakeQuerier) ParameterValue(_ context.Context, id uuid.UUID) (database.ParameterValue, error) {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for _, parameterValue := range q.parameterValues {
+		if parameterValue.ID.String() != id.String() {
+			continue
+		}
+		return parameterValue, nil
+
+	}
+	return database.ParameterValue{}, sql.ErrNoRows
+}
+
 func (q *fakeQuerier) DeleteParameterValueByID(_ context.Context, id uuid.UUID) error {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
@@ -716,17 +730,26 @@ func (q *fakeQuerier) GetOrganizationsByUserID(_ context.Context, userID uuid.UU
 	return organizations, nil
 }
 
-func (q *fakeQuerier) GetParameterValuesByScope(_ context.Context, arg database.GetParameterValuesByScopeParams) ([]database.ParameterValue, error) {
+func (q *fakeQuerier) ParameterValues(_ context.Context, arg database.ParameterValuesParams) ([]database.ParameterValue, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
 
 	parameterValues := make([]database.ParameterValue, 0)
 	for _, parameterValue := range q.parameterValues {
-		if parameterValue.Scope != arg.Scope {
+		if arg.Scope != "" && parameterValue.Scope != arg.Scope {
 			continue
 		}
-		if parameterValue.ScopeID != arg.ScopeID {
-			continue
+
+		if len(arg.ScopeIds) > 0 {
+			if !contains(arg.ScopeIds, parameterValue.ScopeID) {
+				continue
+			}
+		}
+
+		if len(arg.Ids) > 0 {
+			if !contains(arg.Ids, parameterValue.ID) {
+				continue
+			}
 		}
 		parameterValues = append(parameterValues, parameterValue)
 	}
@@ -1980,3 +2003,12 @@ func (q *fakeQuerier) InsertAuditLog(_ context.Context, arg database.InsertAudit
 
 	return alog, nil
 }
+
+func contains[T comparable](haystack []T, needle T) bool {
+	for _, hay := range haystack {
+		if needle == hay {
+			return true
+		}
+	}
+	return false
+}
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/parametervalues.sql b/coderd/database/queries/parametervalues.sql
@@ -1,17 +1,43 @@
+-- name: ParameterValue :one
+SELECT * FROM
+	parameter_values
+WHERE
+	id = $1;
+
+
 -- name: DeleteParameterValueByID :exec
 DELETE FROM
 	parameter_values
 WHERE
 	id = $1;
 
--- name: GetParameterValuesByScope :many
+-- name: ParameterValues :many
 SELECT
 	*
 FROM
 	parameter_values
 WHERE
-	scope = $1
-	AND scope_id = $2;
+	CASE
+		WHEN @scope :: parameter_scope != '' THEN
+			scope = @scope
+		ELSE true
+	END
+    AND CASE
+		WHEN cardinality(@scope_ids :: uuid[]) > 0 THEN
+			scope_id = ANY(@scope_ids :: uuid[])
+		ELSE true
+	END
+  	AND CASE
+		WHEN cardinality(@ids :: uuid[]) > 0 THEN
+			id = ANY(@ids :: uuid[])
+		ELSE true
+	END
+  	AND CASE
+		  WHEN cardinality(@names :: text[]) > 0 THEN
+				  "name" = ANY(@names :: text[])
+		  ELSE true
+	END
+;
 
 -- name: GetParameterValueByScopeAndName :one
 SELECT