Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

chore: append template metadata to protobuf config#20558

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Draft
Emyrk wants to merge10 commits intostevenmasley/tf_workingdirectory
base:stevenmasley/tf_workingdirectory
Choose a base branch
Loading
fromstevenmasley/provisioner_tmpl_ver_metadata
Draft
Show file tree
Hide file tree
Changes fromall commits
Commits
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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
"last_seen_at": "====[timestamp]=====",
"name": "test-daemon",
"version": "v0.0.0-devel",
"api_version": "1.11",
"api_version": "1.12",
"provisioners": [
"echo"
],
Expand Down
1 change: 1 addition & 0 deletionscoderd/database/dbfake/dbfake.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -623,6 +623,7 @@ func (t TemplateVersionBuilder) Do() TemplateVersionResponse {
}

payload, err := json.Marshal(provisionerdserver.TemplateVersionImportJob{
TemplateID: t.seed.TemplateID.UUID,
TemplateVersionID: t.seed.ID,
})
require.NoError(t.t, err)
Expand Down
7 changes: 7 additions & 0 deletionscoderd/provisionerdserver/provisionerdserver.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -704,6 +704,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
PreviousParameterValues: convertRichParameterValues(lastWorkspaceBuildParameters),
VariableValues: asVariableValues(templateVariables),
ExternalAuthProviders: externalAuthProviders,
TerraformWorkspaceReuse: false, // TODO: Toggle based on experiment
Metadata: &sdkproto.Metadata{
CoderUrl: s.AccessURL.String(),
WorkspaceTransition: transition,
Expand DownExpand Up@@ -781,6 +782,8 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
// There is no owner for a template import, but we can assume
// the "Everyone" group as a placeholder.
WorkspaceOwnerGroups: []string{database.EveryoneGroup},
TemplateId: input.TemplateID.String(),
TemplateVersionId: input.TemplateVersionID.String(),
},
},
}
Expand DownExpand Up@@ -3249,6 +3252,10 @@ func auditActionFromTransition(transition database.WorkspaceTransition) database
}

type TemplateVersionImportJob struct {
// TemplateID is not guaranteed to be set. Template versions can be created
// without being associated with a template. Resulting in a template id of
// `uuid.Nil`
TemplateID uuid.UUID `json:"template_id"`
TemplateVersionID uuid.UUID `json:"template_version_id"`
UserVariableValues []codersdk.VariableValue `json:"user_variable_values"`
}
Expand Down
4 changes: 4 additions & 0 deletionscoderd/provisionerdserver/provisionerdserver_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -629,6 +629,8 @@ func TestAcquireJob(t *testing.T) {
Metadata: &sdkproto.Metadata{
CoderUrl: (&url.URL{}).String(),
WorkspaceOwnerGroups: []string{database.EveryoneGroup},
TemplateVersionId: uuid.Nil.String(),
TemplateId: uuid.Nil.String(),
},
},
})
Expand DownExpand Up@@ -677,6 +679,8 @@ func TestAcquireJob(t *testing.T) {
Metadata: &sdkproto.Metadata{
CoderUrl: (&url.URL{}).String(),
WorkspaceOwnerGroups: []string{database.EveryoneGroup},
TemplateVersionId: version.ID.String(),
TemplateId: uuid.Nil.String(),
},
},
})
Expand Down
3 changes: 2 additions & 1 deletioncoderd/templateversions.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1609,9 +1609,10 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
var matchedProvisioners codersdk.MatchedProvisioners
err = api.Database.InTx(func(tx database.Store) error {
jobID := uuid.New()

templateVersionID := uuid.New()

jobInput, err := json.Marshal(provisionerdserver.TemplateVersionImportJob{
TemplateID: req.TemplateID,
TemplateVersionID: templateVersionID,
UserVariableValues: req.UserVariableValues,
})
Expand Down
524 changes: 268 additions & 256 deletionsprovisionerd/proto/provisionerd.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletionsprovisionerd/proto/provisionerd.proto
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ message AcquiredJob {
// workspace build. Omit these values if the workspace is being created
// for the first time.
repeated provisioner.RichParameterValue previous_parameter_values = 10;
bool terraform_workspace_reuse = 11;
}
message TemplateImport {
provisioner.Metadata metadata = 1;
Expand Down
8 changes: 7 additions & 1 deletionprovisionerd/proto/version.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,9 +57,15 @@ import "github.com/coder/coder/v2/apiversion"
// API v1.11:
// - Added new fields `task_id` and `task_prompt` to `Manifest`.
// - Added new field `app_id` to `AITask`
//
// API v1.12:
// - Added new field `template_version_id` to `provisioner.Metadata`
// - Added new field `terraform_workspace_reuse` to `provisioner.Job.TemplateImport`
// - Added new field `terraform_workspace_reuse` to `provisioner.Job.WorkspaceBuild`
// - Added fields `template_version_id`, `template_id`, and `terraform_workspace_reuse` to `provisioner.Config`
const (
CurrentMajor = 1
CurrentMinor =11
CurrentMinor =12
)

// CurrentVersion is the current provisionerd API version.
Expand Down
14 changes: 10 additions & 4 deletionsprovisionerd/runner/runner.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -514,7 +514,10 @@ func (r *Runner) runTemplateImport(ctx context.Context) (*proto.CompletedJob, *p
defer span.End()

failedJob := r.configure(&sdkproto.Config{
TemplateSourceArchive: r.job.GetTemplateSourceArchive(),
TemplateSourceArchive: r.job.GetTemplateSourceArchive(),
TemplateId: r.job.GetTemplateImport().Metadata.TemplateId,
TemplateVersionId: r.job.GetTemplateImport().Metadata.TemplateVersionId,
TerraformWorkspaceReuse: false,
})
if failedJob != nil {
return nil, failedJob
Expand DownExpand Up@@ -1010,9 +1013,12 @@ func (r *Runner) runWorkspaceBuild(ctx context.Context) (*proto.CompletedJob, *p
}

failedJob := r.configure(&sdkproto.Config{
TemplateSourceArchive: r.job.GetTemplateSourceArchive(),
State: r.job.GetWorkspaceBuild().State,
ProvisionerLogLevel: r.job.GetWorkspaceBuild().LogLevel,
TemplateSourceArchive: r.job.GetTemplateSourceArchive(),
State: r.job.GetWorkspaceBuild().State,
ProvisionerLogLevel: r.job.GetWorkspaceBuild().LogLevel,
TemplateId: r.job.GetWorkspaceBuild().Metadata.TemplateId,
TemplateVersionId: r.job.GetWorkspaceBuild().Metadata.TemplateVersionId,
TerraformWorkspaceReuse: r.job.GetWorkspaceBuild().TerraformWorkspaceReuse,
})
if failedJob != nil {
return nil, failedJob
Expand Down
Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp