Merge branch '16678-login-tokens-lifetime-config'

Closes #16678

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --cc lib/config/config.default.yml
Simple merge

diff --cc lib/config/export.go
index 5cdc3dae6a11b3dd5464743aee7213a2bd5d21d6,76f00c765251693040d68242f4bb2726e1411990..b203dff26a1b80272be29f41dd747c8108beb272
--- 1/lib/config/export.go
--- 2/lib/config/export.go
+++ b/lib/config/export.go
@@@ -170,9 -170,7 +170,10 @@@ var whitelist = map[string]bool
        "Login.SSO.Enable":                             true,
        "Login.SSO.ProviderAppID":                      false,
        "Login.SSO.ProviderAppSecret":                  false,
 +      "Login.Test":                                   true,
 +      "Login.Test.Enable":                            true,
 +      "Login.Test.Users":                             false,
+       "Login.TokenLifetime":                          false,
        "Mail":                                         true,
        "Mail.EmailFrom":                               false,
        "Mail.IssueReporterEmailFrom":                  false,

diff --cc lib/config/generated_config.go
Simple merge

diff --cc sdk/go/arvados/config.go
index c87f880e5e56365e4bbec06c211a72cee9e0ee7c,86673320da3c41fc394fc8381e0221a47fd2e436..d98ffd18ed154c6882eb64c16f3af47bbc8c4b94
--- 1/sdk/go/arvados/config.go
--- 2/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@@ -177,12 -177,9 +177,13 @@@ type Cluster struct 
                        ProviderAppID     string
                        ProviderAppSecret string
                }
 +              Test struct {
 +                      Enable bool
 +                      Users  map[string]TestUser
 +              }
                LoginCluster       string
                RemoteTokenRefresh Duration
+               TokenLifetime      Duration
        }
        Mail struct {
                MailchimpAPIKey                string