Skip to content

feat: Expose managed variables via API #6134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 44 commits into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
58fc371
WIP
mtojek Feb 9, 2023
84f6fe5
hcl
mtojek Feb 9, 2023
b29ab11
useManagedVariables
mtojek Feb 9, 2023
2124c54
fix
mtojek Feb 9, 2023
9f89e17
Fix
mtojek Feb 9, 2023
fc583ae
Fix
mtojek Feb 9, 2023
86a1c1c
Merge branch 'main' into 5980-manage-temp-variables
mtojek Feb 9, 2023
183fdb7
fix
mtojek Feb 9, 2023
3e9dd7e
go:build
mtojek Feb 9, 2023
42f8d41
Fix
mtojek Feb 9, 2023
c194087
fix: bool flag
mtojek Feb 10, 2023
f84fbf6
Insert template variables
mtojek Feb 10, 2023
33e75d9
API
mtojek Feb 10, 2023
85bc72f
fix
mtojek Feb 10, 2023
99c5fde
Expose via API
mtojek Feb 10, 2023
e4ee7f9
More wiring
mtojek Feb 10, 2023
2a60174
CLI for testing purposes
mtojek Feb 10, 2023
ffb0b94
WIP
mtojek Feb 13, 2023
c0ba41b
Delete FIXME
mtojek Feb 13, 2023
9e23196
planVars
mtojek Feb 13, 2023
80fdf07
Merge branch 'main' into 5980-manage-temp-variables
mtojek Feb 13, 2023
3a510ea
WIP
mtojek Feb 13, 2023
72f76b1
WIP
mtojek Feb 13, 2023
78d7252
UserVariableValues
mtojek Feb 13, 2023
845dd92
no dry run
mtojek Feb 13, 2023
e021e52
Dry run
mtojek Feb 13, 2023
54dc685
Done FIXME
mtojek Feb 13, 2023
81490a2
Fix
mtojek Feb 14, 2023
6aa97ab
Fix: CLI
mtojek Feb 14, 2023
920bf7c
Merge branch 'main' into 5980-manage-temp-variables
mtojek Feb 14, 2023
56f08f9
Fix: migration
mtojek Feb 14, 2023
2c57c96
API tests
mtojek Feb 14, 2023
bc18624
Test info
mtojek Feb 14, 2023
ae6f072
Tests
mtojek Feb 14, 2023
f9b4349
More tests
mtojek Feb 14, 2023
af4adec
fix: lint
mtojek Feb 14, 2023
864052c
Merge branch 'main' into 5980-manage-temp-variables
mtojek Feb 14, 2023
4bac517
Fix: authz
mtojek Feb 14, 2023
930624a
Merge branch 'main' into 5980-manage-temp-variables
mtojek Feb 14, 2023
23226fa
Address PR comments
mtojek Feb 15, 2023
ca23476
Fix
mtojek Feb 15, 2023
953b9a7
Merge branch 'main' into 5980-manage-temp-variables
mtojek Feb 15, 2023
bb8b500
fix
mtojek Feb 15, 2023
78ac8f5
fix
mtojek Feb 15, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Insert template variables
  • Loading branch information
mtojek committed Feb 10, 2023
commit f84fbf610401eac93ac9a11d56268eb31d598b40
38 changes: 38 additions & 0 deletions coderd/database/dbfake/databasefake.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ type data struct {
replicas []database.Replica
templateVersions []database.TemplateVersion
templateVersionParameters []database.TemplateVersionParameter
templateVersionVariables []database.TemplateVersionVariable
templates []database.Template
workspaceAgents []database.WorkspaceAgent
workspaceApps []database.WorkspaceApp
Expand Down Expand Up @@ -1797,6 +1798,20 @@ func (q *fakeQuerier) GetTemplateVersionParameters(_ context.Context, templateVe
return parameters, nil
}

func (q *fakeQuerier) GetTemplateVersionVariables(_ context.Context, templateVersionID uuid.UUID) ([]database.TemplateVersionVariable, error) {
q.mutex.RLock()
defer q.mutex.RUnlock()

variables := make([]database.TemplateVersionVariable, 0)
for _, variable := range q.templateVersionVariables {
if variable.TemplateVersionID != templateVersionID {
continue
}
variables = append(variables, variable)
}
return variables, nil
}

func (q *fakeQuerier) GetTemplateVersionByID(_ context.Context, templateVersionID uuid.UUID) (database.TemplateVersion, error) {
q.mutex.RLock()
defer q.mutex.RUnlock()
Expand Down Expand Up @@ -2591,6 +2606,29 @@ func (q *fakeQuerier) InsertTemplateVersionParameter(_ context.Context, arg data
return param, nil
}

func (q *fakeQuerier) InsertTemplateVersionVariable(_ context.Context, arg database.InsertTemplateVersionVariableParams) (database.TemplateVersionVariable, error) {
if err := validateDatabaseType(arg); err != nil {
return database.TemplateVersionVariable{}, err
}

q.mutex.Lock()
defer q.mutex.Unlock()

//nolint:gosimple
variable := database.TemplateVersionVariable{
TemplateVersionID: arg.TemplateVersionID,
Name: arg.Name,
Description: arg.Description,
Type: arg.Type,
Value: arg.Value,
DefaultValue: arg.DefaultValue,
Required: arg.Required,
Sensitive: arg.Sensitive,
}
q.templateVersionVariables = append(q.templateVersionVariables, variable)
return variable, nil
}

func (q *fakeQuerier) InsertProvisionerJobLogs(_ context.Context, arg database.InsertProvisionerJobLogsParams) ([]database.ProvisionerJobLog, error) {
if err := validateDatabaseType(arg); err != nil {
return nil, err
Expand Down
2 changes: 2 additions & 0 deletions coderd/database/querier.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

97 changes: 97 additions & 0 deletions coderd/database/queries.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions coderd/database/queries/templateversionvariables.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
-- name: InsertTemplateVersionVariable :one
INSERT INTO
template_version_variables (
template_version_id,
name,
description,
type,
value,
default_value,
required,
sensitive
)
VALUES
(
$1,
$2,
$3,
$4,
$5,
$6,
$7,
$8
) RETURNING *;

-- name: GetTemplateVersionVariables :many
SELECT * FROM template_version_variables WHERE template_version_id = $1;
25 changes: 25 additions & 0 deletions coderd/provisionerdserver/provisionerdserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,31 @@ func (server *Server) UpdateJob(ctx context.Context, request *proto.UpdateJobReq
}
}

if len(request.TemplateVariables) > 0 {
templateVersion, err := server.Database.GetTemplateVersionByJobID(ctx, job.ID)
if err != nil {
return nil, xerrors.Errorf("get template version by job id: %w", err)
}

for _, templateVariable := range request.TemplateVariables {
server.Logger.Debug(ctx, "insert template variable", slog.F("template_version_id", templateVersion.ID), slog.F("template_variable", templateVariable))

_, err = server.Database.InsertTemplateVersionVariable(ctx, database.InsertTemplateVersionVariableParams{
TemplateVersionID: templateVersion.ID,
Name: templateVariable.Name,
Description: templateVariable.Description,
Type: templateVariable.Type,
DefaultValue: templateVariable.DefaultValue,
Required: templateVariable.Required,
Sensitive: templateVariable.Sensitive,
// FIXME value
})
if err != nil {
return nil, xerrors.Errorf("insert parameter schema: %w", err)
}
}
}

if len(request.ParameterSchemas) > 0 {
for index, protoParameter := range request.ParameterSchemas {
validationTypeSystem, err := convertValidationTypeSystem(protoParameter.ValidationTypeSystem)
Expand Down
Loading