Merge branch 'main' into 15397-remove-obsolete-apis

[arvados.git] / sdk / go / arvados / config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 7b63ca0ed7b3972f49c53e94fc55bd41486dbab0..f5e0188a5ddbb71c5f909d5b1d1336290d8fe3aa 100644 (file)
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -213,15 +213,6 @@ type Cluster struct {
                TrustPrivateNetworks bool
                IssueTrustedTokens   bool
        }
-       Mail struct {
-               MailchimpAPIKey                string
-               MailchimpListID                string
-               SendUserSetupNotificationEmail bool
-               IssueReporterEmailFrom         string
-               IssueReporterEmailTo           string
-               SupportEmailAddress            string
-               EmailFrom                      string
-       }
        SystemLogs struct {
                LogLevel                  string
                Format                    string
@@ -249,6 +240,8 @@ type Cluster struct {
                NewInactiveUserNotificationRecipients StringSet
                NewUserNotificationRecipients         StringSet
                NewUsersAreActive                     bool
+               SendUserSetupNotificationEmail        bool
+               SupportEmailAddress                   string
                UserNotifierEmailFrom                 string
                UserNotifierEmailBcc                  StringSet
                UserProfileNotificationAddress        string
@@ -501,9 +494,6 @@ type ContainersConfig struct {
        LocalKeepBlobBuffersPerVCPU   int
        LocalKeepLogsToContainerLog   string
 
-       JobsAPI struct {
-               Enable string
-       }
        Logging struct {
                LogUpdatePeriod Duration
                LogUpdateSize   ByteSize