fix tags with key flag

f0ssel · f0ssel · commit e54e662b83e4 · 2024-07-25T16:43:31.000Z
diff --git a/enterprise/cli/provisionerdaemonstart.go b/enterprise/cli/provisionerdaemonstart.go
@@ -154,9 +154,14 @@ func (r *RootCmd) provisionerDaemonStart() *serpent.Command {
 			// When authorizing with a PSK / provisioner key, we automatically scope the provisionerd
 			// to organization. Scoping to user with PSK / provisioner key auth is not a valid configuration.
 			if preSharedKey != "" || provisionerKey != "" {
-				logger.Info(ctx, "psk or provisioner key auth automatically sets tag "+provisionersdk.TagScope+"="+provisionersdk.ScopeOrganization)
+				logger.Info(ctx, "psk automatically sets tag "+provisionersdk.TagScope+"="+provisionersdk.ScopeOrganization)
 				tags[provisionersdk.TagScope] = provisionersdk.ScopeOrganization
 			}
+			if provisionerKey != "" {
+				logger.Info(ctx, "provisioner key auth automatically sets tag "+provisionersdk.TagScope+" empty")
+				// no scope tag will default to org scope
+				delete(tags, provisionersdk.TagScope)
+			}
 
 			err = os.MkdirAll(cacheDir, 0o700)
 			if err != nil {
