@@ -517,7 +517,7 @@ func (r *Runner) runTemplateImport(ctx context.Context) (*proto.CompletedJob, *p
517
517
Stage :"Parsing template parameters" ,
518
518
CreatedAt :time .Now ().UnixMilli (),
519
519
})
520
- templateVariables ,readme ,err := r .runTemplateImportParse (ctx )
520
+ _ , templateVariables ,readme ,err := r .runTemplateImportParse (ctx )// TODO workspace_tags
521
521
if err != nil {
522
522
return nil ,r .failedJobf ("run parse: %s" ,err )
523
523
}
@@ -586,19 +586,19 @@ func (r *Runner) runTemplateImport(ctx context.Context) (*proto.CompletedJob, *p
586
586
587
587
// Parses template variables and README from source.
588
588
func (r * Runner )runTemplateImportParse (ctx context.Context ) (
589
- vars []* sdkproto.TemplateVariable ,readme []byte ,err error ,
589
+ workspaceTags map [ string ] string , vars []* sdkproto.TemplateVariable ,readme []byte ,err error ,
590
590
) {
591
591
ctx ,span := r .startTrace (ctx ,tracing .FuncName ())
592
592
defer span .End ()
593
593
594
594
err = r .session .Send (& sdkproto.Request {Type :& sdkproto.Request_Parse {Parse :& sdkproto.ParseRequest {}}})
595
595
if err != nil {
596
- return nil ,nil ,xerrors .Errorf ("parse source: %w" ,err )
596
+ return nil ,nil ,nil , xerrors .Errorf ("parse source: %w" ,err )
597
597
}
598
598
for {
599
599
msg ,err := r .session .Recv ()
600
600
if err != nil {
601
- return nil ,nil ,xerrors .Errorf ("recv parse source: %w" ,err )
601
+ return nil ,nil ,nil , xerrors .Errorf ("recv parse source: %w" ,err )
602
602
}
603
603
switch msgType := msg .Type .(type ) {
604
604
case * sdkproto.Response_Log :
@@ -617,17 +617,18 @@ func (r *Runner) runTemplateImportParse(ctx context.Context) (
617
617
case * sdkproto.Response_Parse :
618
618
pc := msgType .Parse
619
619
r .logger .Debug (context .Background (),"parse complete" ,
620
+ slog .F ("workspace_tags" ,pc .WorkspaceTags ),
620
621
slog .F ("template_variables" ,pc .TemplateVariables ),
621
622
slog .F ("readme_len" ,len (pc .Readme )),
622
623
slog .F ("error" ,pc .Error ),
623
624
)
624
625
if pc .Error != "" {
625
- return nil ,nil ,xerrors .Errorf ("parse error: %s" ,pc .Error )
626
+ return nil ,nil ,nil , xerrors .Errorf ("parse error: %s" ,pc .Error )
626
627
}
627
628
628
- return msgType .Parse .TemplateVariables ,msgType .Parse .Readme ,nil
629
+ return msgType .Parse .WorkspaceTags , msgType . Parse . TemplateVariables ,msgType .Parse .Readme ,nil
629
630
default :
630
- return nil ,nil ,xerrors .Errorf ("invalid message type %q received from provisioner" ,
631
+ return nil ,nil ,nil , xerrors .Errorf ("invalid message type %q received from provisioner" ,
631
632
reflect .TypeOf (msg .Type ).String ())
632
633
}
633
634
}