Skip to content

feat: evaluate provisioner tags #13333

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.

Sign up for GitHub

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 9 commits into from
May 23, 2024
Merged

feat: evaluate provisioner tags #13333

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb2c92f
feat: evaluate provisioner tags
mtojek May 21, 2024
98e623a
fix: tests
mtojek May 21, 2024
031aeb6
fix: tests
mtojek May 21, 2024
8706ac2
WIP
mtojek May 21, 2024
6fb78e4
WIP
mtojek May 21, 2024
a77a2dc
Stub for eval
mtojek May 21, 2024
00533fa
Works
mtojek May 22, 2024
92c9992
fix: panic
mtojek May 22, 2024
ac1040e
rearrange
mtojek May 23, 2024
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
Next Next commit
feat: evaluate provisioner tags
  • Loading branch information
@mtojek
mtojek committed May 21, 2024
commit fb2c92ff9f2bfe34fa859feb536f24fa65f8b5bd
81 changes: 72 additions & 9 deletions coderd/wsbuilder/wsbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"database/sql"
"encoding/json"
"fmt"
"log"
"net/http"
"time"

Expand Down Expand Up @@ -55,14 +56,17 @@ type Builder struct {
store database.Store

// cache of objects, so we only fetch once
template *database.Template
templateVersion *database.TemplateVersion
templateVersionJob *database.ProvisionerJob
templateVersionParameters *[]database.TemplateVersionParameter
lastBuild *database.WorkspaceBuild
lastBuildErr *error
lastBuildParameters *[]database.WorkspaceBuildParameter
lastBuildJob *database.ProvisionerJob
template *database.Template
templateVersion *database.TemplateVersion
templateVersionJob *database.ProvisionerJob
templateVersionParameters *[]database.TemplateVersionParameter
templateVersionWorkspaceTags *[]database.TemplateVersionWorkspaceTag
lastBuild *database.WorkspaceBuild
lastBuildErr *error
lastBuildParameters *[]database.WorkspaceBuildParameter
lastBuildJob *database.ProvisionerJob
parameterNames *[]string
parameterValues *[]string

verifyNoLegacyParametersOnce bool
}
Expand Down Expand Up @@ -297,7 +301,11 @@ func (b *Builder) buildTx(authFunc func(action policy.Action, object rbac.Object
if err != nil {
return nil, nil, BuildError{http.StatusInternalServerError, "marshal metadata", err}
}
tags := provisionersdk.MutateTags(b.workspace.OwnerID, templateVersionJob.Tags)

tags, err := b.getProvisionerTags()
if err != nil {
return nil, nil, err // already wrapped BuildError
}

now := dbtime.Now()
provisionerJob, err := b.store.InsertProvisionerJob(b.ctx, database.InsertProvisionerJobParams{
Expand Down Expand Up @@ -364,6 +372,7 @@ func (b *Builder) buildTx(authFunc func(action policy.Action, object rbac.Object
// getParameters already wraps errors in BuildError
return err
}

err = store.InsertWorkspaceBuildParameters(b.ctx, database.InsertWorkspaceBuildParametersParams{
WorkspaceBuildID: workspaceBuildID,
Name: names,
Expand Down Expand Up @@ -502,6 +511,10 @@ func (b *Builder) getState() ([]byte, error) {
}

func (b *Builder) getParameters() (names, values []string, err error) {
if b.parameterNames != nil {
return *b.parameterNames, *b.parameterValues, nil
}

templateVersionParameters, err := b.getTemplateVersionParameters()
if err != nil {
return nil, nil, BuildError{http.StatusInternalServerError, "failed to fetch template version parameters", err}
Expand Down Expand Up @@ -535,6 +548,9 @@ func (b *Builder) getParameters() (names, values []string, err error) {
names = append(names, templateVersionParameter.Name)
values = append(values, value)
}

b.parameterNames = &names
b.parameterValues = &values
return names, values, nil
}

Expand Down Expand Up @@ -632,6 +648,53 @@ func (b *Builder) getLastBuildJob() (*database.ProvisionerJob, error) {
return b.lastBuildJob, nil
}

func (b *Builder) getProvisionerTags() (map[string]string, error) {
// Step 1: Fetch required data
workspaceTags, err := b.getTemplateVersionWorkspaceTags()
if err != nil {
return nil, BuildError{http.StatusInternalServerError, "failed to fetch template version workspace tags", err}
}
parameterNames, parameterValues, err := b.getParameters()
if err != nil {
return nil, err // already wrapped BuildError
}
templateVersionJob, err := b.getTemplateVersionJob()
if err != nil {
return nil, BuildError{http.StatusInternalServerError, "failed to fetch template version job", err}
}
annotationTags := provisionersdk.MutateTags(b.workspace.OwnerID, templateVersionJob.Tags)

// Step 2: Evaluate provisioner tags
tags := map[string]string{}
for name, value := range annotationTags {
tags[name] = value
}

// FIXME evaluate and merge workspace tags
log.Println(workspaceTags, parameterNames, parameterValues)

return tags, nil
}

func (b *Builder) getTemplateVersionWorkspaceTags() ([]database.TemplateVersionWorkspaceTag, error) {
if b.templateVersionWorkspaceTags != nil {
return *b.templateVersionWorkspaceTags, nil
}

templateVersion, err := b.getTemplateVersion()
if err != nil {
return nil, xerrors.Errorf("get template version: %w", err)
}

workspaceTags, err := b.store.GetTemplateVersionWorkspaceTags(b.ctx, templateVersion.ID)
if err != nil {
return nil, xerrors.Errorf("get template version workspace tags: %w", err)
}

b.templateVersionWorkspaceTags = &workspaceTags
return *b.templateVersionWorkspaceTags, nil
}

// authorize performs build authorization pre-checks using the provided authFunc
func (b *Builder) authorize(authFunc func(action policy.Action, object rbac.Objecter) bool) error {
// Doing this up front saves a lot of work if the user doesn't have permission.
Expand Down
Loading