controlclient,tailcfg,types: expose MaxKeyDuration via localapi (#10401)

Updates tailscale/corp#16016

Signed-off-by: James Sanderson <jsanderson@tailscale.com>
This commit is contained in:
James 'zofrex' Sanderson
2024-01-05 13:06:12 +01:00
committed by GitHub
parent d9aeb30281
commit 124dc10261
6 changed files with 18 additions and 4 deletions

View File

@@ -75,6 +75,9 @@ type NetworkMap struct {
DomainAuditLogID string
UserProfiles map[tailcfg.UserID]tailcfg.UserProfile
// MaxKeyDuration describes the MaxKeyDuration setting for the tailnet.
MaxKeyDuration time.Duration
}
// User returns nm.SelfNode.User if nm.SelfNode is non-nil, otherwise it returns

View File

@@ -177,5 +177,6 @@ func mapResponseContainsNonPatchFields(res *tailcfg.MapResponse) bool {
// function is called, so it should never be set anyway. But for
// completedness, and for tests, check it too:
res.PeersChanged != nil ||
res.DefaultAutoUpdate != ""
res.DefaultAutoUpdate != "" ||
res.MaxKeyDuration > 0
}

View File

@@ -32,7 +32,7 @@ func TestMapResponseContainsNonPatchFields(t *testing.T) {
}
return reflect.ValueOf("foo").Convert(t)
case reflect.Int64:
return reflect.ValueOf(int64(1))
return reflect.ValueOf(int64(1)).Convert(t)
case reflect.Slice:
return reflect.MakeSlice(t, 1, 1)
case reflect.Ptr: