SMTP cleanup (#728)

* Gallery.CredentialExpiration * Destroying last references to anything "Smtp".
NuGet · Mar 19, 2019 · 7804739 · 7804739
1 parent 9126a8d
commit 7804739
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 58 deletions.
diff --git a/src/Gallery.CredentialExpiration/Scripts/Gallery.CredentialExpiration.cmd b/src/Gallery.CredentialExpiration/Scripts/Gallery.CredentialExpiration.cmd
@@ -7,8 +7,6 @@ cd bin
 
 	title #{Jobs.gallery.credentialexpiration.Title}
 
-	REM SmtpUri is expected to be of the format: smtps://username:password@host:port. Note that if username contains an "@", you need to URI encode it!
-
 	start /w gallery.credentialexpiration.exe -Configuration "#{Jobs.gallery.credentialexpiration.Configuration}" -InstrumentationKey "#{Jobs.gallery.credentialexpiration.InstrumentationKey}" -verbose true -Interval #{Jobs.gallery.credentialexpiration.Interval}
 
 	echo "Finished #{Jobs.gallery.credentialexpiration.Title}"

diff --git a/src/Gallery.CredentialExpiration/Settings/int.json b/src/Gallery.CredentialExpiration/Settings/int.json
@@ -7,7 +7,6 @@
     "GalleryAccountUrl": "https://int.nugettest.org/account/ApiKeys",
     "GalleryBrand": "NuGet Gallery",
     "MailFrom": "[email protected]",
-    "SmtpUri": "#{Jobs.gallery.credentialexpiration.SmtpUri}",
     "WarnDaysBeforeExpiration": 7,
     "WhatIf": true
   },

diff --git a/src/Gallery.CredentialExpiration/Settings/prod.json b/src/Gallery.CredentialExpiration/Settings/prod.json
@@ -7,7 +7,6 @@
     "GalleryAccountUrl": "https://www.nuget.org/account/ApiKeys",
     "GalleryBrand": "NuGet Gallery",
     "MailFrom": "[email protected]",
-    "SmtpUri": "#{Jobs.gallery.credentialexpiration.SmtpUri}",
     "WarnDaysBeforeExpiration": 7,
     "WhatIf": false
   },

diff --git a/src/NuGet.Jobs.Common/Configuration/JobArgumentNames.cs b/src/NuGet.Jobs.Common/Configuration/JobArgumentNames.cs
@@ -111,7 +111,6 @@ public static class JobArgumentNames
 
         // Arguments specific to e-mail
         public const string MailFrom = "MailFrom";
-        public const string SmtpUri = "SmtpUri";
 
         // Arguments specific to StatusAggregator
         public const string StatusStorageAccount = "StatusStorageAccount";

diff --git a/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj b/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj
@@ -63,7 +63,6 @@
     <Compile Include="JsonConfigurationJob.cs" />
     <Compile Include="SecretReader\ISecretReaderFactory.cs" />
     <Compile Include="SecretReader\SecretReaderFactory.cs" />
-    <Compile Include="SmtpUri.cs" />
     <Compile Include="Configuration\JobConfigurationManager.cs" />
     <Compile Include="Extensions\DapperExtensions.cs" />
     <Compile Include="JobBase.cs" />

diff --git a/src/NuGet.Jobs.Common/SmtpUri.cs b/src/NuGet.Jobs.Common/SmtpUri.cs
diff --git a/src/NuGet.Services.Validation.Orchestrator/settings.json b/src/NuGet.Services.Validation.Orchestrator/settings.json
@@ -85,9 +85,6 @@
     "TopicPath": "",
     "SubscriptionName": ""
   },
-  "Smtp": {
-    "SmtpUri": ""
-  },
   "Email": {
     "GalleryOwner": "NuGet Gallery <[email protected]>",
     "GalleryNoReplyAddress": "NuGet Gallery <[email protected]>",

diff --git a/src/NuGet.Services.Validation.Orchestrator/symbolsettings.json b/src/NuGet.Services.Validation.Orchestrator/symbolsettings.json
@@ -86,9 +86,6 @@
     "TopicPath": "symbol-orchestrator",
     "SubscriptionName": "orchestrator"
   },
-  "Smtp": {
-    "SmtpUri": ""
-  },
   "Email": {
     "GalleryOwner": "NuGet Gallery <[email protected]>",
     "GalleryNoReplyAddress": "NuGet Gallery <[email protected]>",

diff --git a/src/NuGet.SupportRequests.Notifications/JobArgumentNames.cs b/src/NuGet.SupportRequests.Notifications/JobArgumentNames.cs
@@ -10,6 +10,5 @@ internal static class JobArgumentNames
         // avoids value duplication, avoids annoying namespace conflicts in this job
         public const string InstrumentationKey = Jobs.JobArgumentNames.InstrumentationKey;
         public const string SourceDatabase = Jobs.JobArgumentNames.SourceDatabase;
-        public const string SmtpUri = Jobs.JobArgumentNames.SmtpUri;
     }
 }