change tags variable

defelmnq · defelmnq · commit ee0fef67b8cc · 2024-11-25T05:01:50.000Z
diff --git a/enterprise/cli/provisionerdaemonstart.go b/enterprise/cli/provisionerdaemonstart.go
@@ -104,19 +104,14 @@ func (r *RootCmd) provisionerDaemonStart() *serpent.Command {
 				return err
 			}
 
-			displayedTags := make(map[string]string)
-			for key, val := range tags {
-				displayedTags[key] = val
-			}
-
 			if provisionerKey != "" {
 				pkDetails, err := client.GetProvisionerKey(ctx, provisionerKey)
 				if err != nil {
-					return xerrors.New("unable to get provisioner key details")
+					return xerrors.New(fmt.Sprintf("unable to get provisioner key details: %w", err))
 				}
 
 				for k, v := range pkDetails.Tags {
-					displayedTags[k] = v
+					tags[k] = v
 				}
 			}
 
@@ -147,7 +142,7 @@ func (r *RootCmd) provisionerDaemonStart() *serpent.Command {
 				defer closeLogger()
 			}
 
-			if len(displayedTags) == 0 {
+			if len(tags) == 0 {
 				logger.Info(ctx, "note: untagged provisioners can only pick up jobs from untagged templates")
 			}
 
@@ -218,7 +213,7 @@ func (r *RootCmd) provisionerDaemonStart() *serpent.Command {
 				defer closeFunc()
 			}
 
-			logger.Info(ctx, "starting provisioner daemon", slog.F("tags", displayedTags), slog.F("name", name))
+			logger.Info(ctx, "starting provisioner daemon", slog.F("tags", tags), slog.F("name", name))
 
 			connector := provisionerd.LocalProvisioners{
 				string(database.ProvisionerTypeTerraform): proto.NewDRPCProvisionerClient(terraformClient),

Original file line number	Diff line number	Diff line change
`@@ -104,19 +104,14 @@ func (r RootCmd) provisionerDaemonStart() serpent.Command {`
`104`	`104`	`return err`
`105`	`105`	`}`
`106`	`106`
`107`		`- displayedTags := make(map[string]string)`
`108`		`- for key, val := range tags {`
`109`		`- displayedTags[key] = val`
`110`		`- }`
`111`		`-`
`112`	`107`	`if provisionerKey != "" {`
`113`	`108`	`pkDetails, err := client.GetProvisionerKey(ctx, provisionerKey)`
`114`	`109`	`if err != nil {`
`115`		`- return xerrors.New("unable to get provisioner key details")`
	`110`	`+ return xerrors.New(fmt.Sprintf("unable to get provisioner key details: %w", err))`
`116`	`111`	`}`
`117`	`112`
`118`	`113`	`for k, v := range pkDetails.Tags {`
`119`		`- displayedTags[k] = v`
	`114`	`+ tags[k] = v`
`120`	`115`	`}`
`121`	`116`	`}`
`122`	`117`
`@@ -147,7 +142,7 @@ func (r RootCmd) provisionerDaemonStart() serpent.Command {`
`147`	`142`	`defer closeLogger()`
`148`	`143`	`}`
`149`	`144`
`150`		`- if len(displayedTags) == 0 {`
	`145`	`+ if len(tags) == 0 {`
`151`	`146`	`logger.Info(ctx, "note: untagged provisioners can only pick up jobs from untagged templates")`
`152`	`147`	`}`
`153`	`148`
`@@ -218,7 +213,7 @@ func (r RootCmd) provisionerDaemonStart() serpent.Command {`
`218`	`213`	`defer closeFunc()`
`219`	`214`	`}`
`220`	`215`
`221`		`- logger.Info(ctx, "starting provisioner daemon", slog.F("tags", displayedTags), slog.F("name", name))`
	`216`	`+ logger.Info(ctx, "starting provisioner daemon", slog.F("tags", tags), slog.F("name", name))`
`222`	`217`
`223`	`218`	`connector := provisionerd.LocalProvisioners{`
`224`	`219`	`string(database.ProvisionerTypeTerraform): proto.NewDRPCProvisionerClient(terraformClient),`