X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/415910149bed2eef6ae818b7c059d413934df06e..62c33a15f68895d6a388f68d2827e9fd5705c5df:/lib/config/export.go diff --git a/lib/config/export.go b/lib/config/export.go index b6d0236bb0..26782c8ba6 100644 --- a/lib/config/export.go +++ b/lib/config/export.go @@ -11,7 +11,7 @@ import ( "io" "strings" - "git.curoverse.com/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/arvados" ) // ExportJSON writes a JSON object with the safe (non-secret) portions @@ -63,8 +63,10 @@ var whitelist = map[string]bool{ "API": true, "API.AsyncPermissionsUpdateInterval": false, "API.DisabledAPIs": false, + "API.MaxConcurrentRequests": false, "API.MaxIndexDatabaseRead": false, "API.MaxItemsPerResponse": true, + "API.MaxKeepBlobBuffers": false, "API.MaxRequestAmplification": false, "API.MaxRequestSize": true, "API.RailsSessionSecretToken": false, @@ -72,6 +74,7 @@ var whitelist = map[string]bool{ "API.WebsocketClientEventQueue": false, "API.SendTimeout": true, "API.WebsocketServerEventQueue": false, + "API.KeepServiceRequestTimeout": false, "AuditLogs": false, "AuditLogs.MaxAge": false, "AuditLogs.MaxDeleteBatch": false, @@ -80,15 +83,27 @@ var whitelist = map[string]bool{ "Collections.BlobSigning": true, "Collections.BlobSigningKey": false, "Collections.BlobSigningTTL": true, + "Collections.BlobTrash": false, + "Collections.BlobTrashLifetime": false, + "Collections.BlobTrashConcurrency": false, + "Collections.BlobTrashCheckInterval": false, + "Collections.BlobDeleteConcurrency": false, + "Collections.BlobReplicateConcurrency": false, "Collections.CollectionVersioning": false, "Collections.DefaultReplication": true, "Collections.DefaultTrashLifetime": true, + "Collections.ForwardSlashNameSubstitution": true, "Collections.ManagedProperties": true, "Collections.ManagedProperties.*": true, "Collections.ManagedProperties.*.*": true, "Collections.PreserveVersionIfIdle": true, "Collections.TrashSweepInterval": false, "Collections.TrustAllContent": false, + "Collections.WebDAVCache": false, + "Collections.BalanceCollectionBatch": false, + "Collections.BalancePeriod": false, + "Collections.BlobMissingReport": false, + "Collections.BalanceCollectionBuffers": false, "Containers": true, "Containers.CloudVMs": false, "Containers.CrunchRunCommand": false, @@ -110,13 +125,49 @@ var whitelist = map[string]bool{ "Containers.SupportedDockerImageFormats": true, "Containers.SupportedDockerImageFormats.*": true, "Containers.UsePreemptibleInstances": true, - "EnableBetaController14287": false, + "ForceLegacyAPI14": false, "Git": false, "InstanceTypes": true, "InstanceTypes.*": true, "InstanceTypes.*.*": true, - "Login": false, - "Mail": false, + "Login": true, + "Login.Google": true, + "Login.Google.AlternateEmailAddresses": false, + "Login.Google.ClientID": false, + "Login.Google.ClientSecret": false, + "Login.Google.Enable": true, + "Login.LDAP": true, + "Login.LDAP.AppendDomain": false, + "Login.LDAP.EmailAttribute": false, + "Login.LDAP.Enable": true, + "Login.LDAP.InsecureTLS": false, + "Login.LDAP.SearchAttribute": false, + "Login.LDAP.SearchBase": false, + "Login.LDAP.SearchBindPassword": false, + "Login.LDAP.SearchBindUser": false, + "Login.LDAP.SearchFilters": false, + "Login.LDAP.StartTLS": false, + "Login.LDAP.StripDomain": false, + "Login.LDAP.URL": false, + "Login.LDAP.UsernameAttribute": false, + "Login.LoginCluster": true, + "Login.PAM": true, + "Login.PAM.DefaultEmailDomain": false, + "Login.PAM.Enable": true, + "Login.PAM.Service": false, + "Login.SSO": true, + "Login.SSO.Enable": true, + "Login.SSO.ProviderAppID": false, + "Login.SSO.ProviderAppSecret": false, + "Login.RemoteTokenRefresh": true, + "Mail": true, + "Mail.MailchimpAPIKey": false, + "Mail.MailchimpListID": false, + "Mail.SendUserSetupNotificationEmail": false, + "Mail.IssueReporterEmailFrom": false, + "Mail.IssueReporterEmailTo": false, + "Mail.SupportEmailAddress": true, + "Mail.EmailFrom": false, "ManagementToken": false, "PostgreSQL": false, "RemoteClusters": true, @@ -146,8 +197,19 @@ var whitelist = map[string]bool{ "Users.NewInactiveUserNotificationRecipients": false, "Users.NewUserNotificationRecipients": false, "Users.NewUsersAreActive": false, + "Users.PreferDomainForUsername": false, "Users.UserNotifierEmailFrom": false, "Users.UserProfileNotificationAddress": false, + "Volumes": true, + "Volumes.*": true, + "Volumes.*.*": false, + "Volumes.*.AccessViaHosts": true, + "Volumes.*.AccessViaHosts.*": true, + "Volumes.*.AccessViaHosts.*.ReadOnly": true, + "Volumes.*.ReadOnly": true, + "Volumes.*.Replication": true, + "Volumes.*.StorageClasses": true, + "Volumes.*.StorageClasses.*": false, "Workbench": true, "Workbench.ActivationContactLink": false, "Workbench.APIClientConnectTimeout": true, @@ -179,6 +241,10 @@ var whitelist = map[string]bool{ "Workbench.UserProfileFormFields.*.*.*": true, "Workbench.UserProfileFormMessage": true, "Workbench.VocabularyURL": true, + "Workbench.WelcomePageHTML": true, + "Workbench.InactivePageHTML": true, + "Workbench.SSHHelpPageHTML": true, + "Workbench.SSHHelpHostSuffix": true, } func redactUnsafe(m map[string]interface{}, mPrefix, lookupPrefix string) error {