Skip to content

Commit 72fcb93

Browse files
authored
cli: ensure tagged-devices is included in profile list (#2991)
1 parent f5c7796 commit 72fcb93

File tree

15 files changed

+184
-47
lines changed

15 files changed

+184
-47
lines changed

.github/workflows/test-integration.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ jobs:
165165
- TestPreAuthKeyCommandWithoutExpiry
166166
- TestPreAuthKeyCommandReusableEphemeral
167167
- TestPreAuthKeyCorrectUserLoggedInCommand
168+
- TestTaggedNodesCLIOutput
168169
- TestApiKeyCommand
169170
- TestNodeCommand
170171
- TestNodeExpireCommand

gen/go/headscale/v1/apikey.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/go/headscale/v1/device.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/go/headscale/v1/headscale.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/go/headscale/v1/headscale_grpc.pb.go

Lines changed: 27 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/go/headscale/v1/node.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/go/headscale/v1/policy.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/go/headscale/v1/preauthkey.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/go/headscale/v1/user.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hscontrol/auth.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ func nodeToRegisterResponse(node types.NodeView) *tailcfg.RegisterResponse {
247247
if node.IsTagged() {
248248
resp.User = types.TaggedDevices.View().TailscaleUser()
249249
resp.Login = types.TaggedDevices.View().TailscaleLogin()
250-
} else if node.UserView().Valid() {
251-
resp.User = node.UserView().TailscaleUser()
252-
resp.Login = node.UserView().TailscaleLogin()
250+
} else if node.Owner().Valid() {
251+
resp.User = node.Owner().TailscaleUser()
252+
resp.Login = node.Owner().TailscaleLogin()
253253
}
254254

255255
return resp
@@ -389,8 +389,8 @@ func (h *Headscale) handleRegisterWithAuthKey(
389389
resp := &tailcfg.RegisterResponse{
390390
MachineAuthorized: true,
391391
NodeKeyExpired: node.IsExpired(),
392-
User: node.UserView().TailscaleUser(),
393-
Login: node.UserView().TailscaleLogin(),
392+
User: node.Owner().TailscaleUser(),
393+
Login: node.Owner().TailscaleLogin(),
394394
}
395395

396396
log.Trace().

0 commit comments

Comments
 (0)