Delete GitHubUpgrader

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>

Author: derrickstolee

Scalar.Common/ProductUpgrader.cs

@@ -92,68 +92,62 @@ public static bool TryCreateUpgrader(
             bool containsUpgradePackageName = entries.ContainsKey(ScalarConstants.LocalScalarConfig.UpgradeFeedPackageName);
             bool containsOrgInfoServerUrl = entries.ContainsKey(ScalarConstants.LocalScalarConfig.OrgInfoServerUrl);
 
-            if (containsUpgradeFeedUrl || containsUpgradePackageName)
+            if (!containsUpgradeFeedUrl && !containsUpgradePackageName)
             {
-                // We are configured for NuGet - determine if we are using OrgNuGetUpgrader or not
-                if (containsOrgInfoServerUrl)
+                error = "Custom upgrade feed is not configured";
+                tracer.RelatedWarning(error);
+                newUpgrader = null;
+                return false;
+            }
+
+            // We are configured for NuGet - determine if we are using OrgNuGetUpgrader or not
+            if (containsOrgInfoServerUrl)
+            {
+                if (OrgNuGetUpgrader.TryCreate(
+                    tracer,
+                    fileSystem,
+                    scalarConfig,
+                    new HttpClient(),
+                    credentialStore,
+                    dryRun,
+                    noVerify,
+                    out OrgNuGetUpgrader orgNuGetUpgrader,
+                    out error))
                 {
-                    if (OrgNuGetUpgrader.TryCreate(
-                        tracer,
-                        fileSystem,
-                        scalarConfig,
-                        new HttpClient(),
-                        credentialStore,
-                        dryRun,
-                        noVerify,
-                        out OrgNuGetUpgrader orgNuGetUpgrader,
-                        out error))
-                    {
-                        // We were successfully able to load a NuGetUpgrader - use that.
-                        newUpgrader = orgNuGetUpgrader;
-                        return true;
-                    }
-                    else
-                    {
-                        tracer.RelatedError($"{nameof(TryCreateUpgrader)}: Could not create organization based upgrader. {error}");
-                        newUpgrader = null;
-                        return false;
-                    }
+                    // We were successfully able to load a NuGetUpgrader - use that.
+                    newUpgrader = orgNuGetUpgrader;
+                    return true;
                 }
                 else
                 {
-                    if (NuGetUpgrader.TryCreate(
-                        tracer,
-                        fileSystem,
-                        scalarConfig,
-                        credentialStore,
-                        dryRun,
-                        noVerify,
-                        out NuGetUpgrader nuGetUpgrader,
-                        out bool isConfigured,
-                        out error))
-                    {
-                        // We were successfully able to load a NuGetUpgrader - use that.
-                        newUpgrader = nuGetUpgrader;
-                        return true;
-                    }
-                    else
-                    {
-                        tracer.RelatedError($"{nameof(TryCreateUpgrader)}: Could not create NuGet based upgrader. {error}");
-                        newUpgrader = null;
-                        return false;
-                    }
+                    tracer.RelatedError($"{nameof(TryCreateUpgrader)}: Could not create organization based upgrader. {error}");
+                    newUpgrader = null;
+                    return false;
                 }
             }
             else
             {
-                newUpgrader = GitHubUpgrader.Create(tracer, fileSystem, scalarConfig, dryRun, noVerify, out error);
-                if (newUpgrader == null)
+                if (NuGetUpgrader.TryCreate(
+                    tracer,
+                    fileSystem,
+                    scalarConfig,
+                    credentialStore,
+                    dryRun,
+                    noVerify,
+                    out NuGetUpgrader nuGetUpgrader,
+                    out bool isConfigured,
+                    out error))
                 {
-                    tracer.RelatedError($"{nameof(TryCreateUpgrader)}: Could not create GitHub based upgrader. {error}");
+                    // We were successfully able to load a NuGetUpgrader - use that.
+                    newUpgrader = nuGetUpgrader;
+                    return true;
+                }
+                else
+                {
+                    tracer.RelatedError($"{nameof(TryCreateUpgrader)}: Could not create NuGet based upgrader. {error}");
+                    newUpgrader = null;
                     return false;
                 }
-
-                return true;
             }
         }
 

Scalar.Service/ProductUpgradeTimer.cs

@@ -1,12 +1,10 @@
 using Scalar.Common;
 using Scalar.Common.FileSystem;
 using Scalar.Common.NamedPipes;
-using Scalar.Common.NuGetUpgrade;
 using Scalar.Common.Tracing;
 using Scalar.Service.Handlers;
 using Scalar.Upgrader;
 using System;
-using System.IO;
 using System.Threading;
 
 namespace Scalar.Service
@@ -113,57 +111,6 @@ private void TimerCallback(object unusedState)
                         return;
                     }
 
-                    if (!productUpgrader.SupportsAnonymousVersionQuery)
-                    {
-                        // If this is a NuGetUpgrader that does not support anonymous version query,
-                        // fall back to using the GitHubUpgrader, to preserve existing behavior.
-                        // Once we have completely transitioned to using the anonymous endpoint,
-                        // we can remove this code.
-                        if (productUpgrader is NuGetUpgrader)
-                        {
-                            productUpgrader = GitHubUpgrader.Create(
-                                this.tracer,
-                                this.fileSystem,
-                                new LocalScalarConfig(),
-                                dryRun: false,
-                                noVerify: false,
-                                error: out errorMessage);
-
-                            if (productUpgrader == null)
-                            {
-                                string gitHubUpgraderFailedMessage = string.Format(
-                                    "{0}.{1}: GitHubUpgrader.Create failed to create upgrader: {2}",
-                                    nameof(ProductUpgradeTimer),
-                                    nameof(this.TimerCallback),
-                                    errorMessage);
-
-                                activity.RelatedWarning(
-                                    metadata: new EventMetadata(),
-                                    message: gitHubUpgraderFailedMessage,
-                                    keywords: Keywords.Telemetry);
-
-                                info.RecordHighestAvailableVersion(highestAvailableVersion: null);
-                                return;
-                            }
-                        }
-                        else
-                        {
-                            errorMessage = string.Format(
-                                "{0}.{1}: Configured Product Upgrader does not support anonymous version queries.",
-                                nameof(ProductUpgradeTimer),
-                                nameof(this.TimerCallback),
-                                errorMessage);
-
-                            activity.RelatedWarning(
-                                metadata: new EventMetadata(),
-                                message: errorMessage,
-                                keywords: Keywords.Telemetry);
-
-                            info.RecordHighestAvailableVersion(highestAvailableVersion: null);
-                            return;
-                        }
-                    }
-
                     InstallerPreRunChecker prerunChecker = new InstallerPreRunChecker(this.tracer, string.Empty);
                     if (!prerunChecker.TryRunPreUpgradeChecks(out errorMessage))
                     {

Scalar.UnitTests/Common/TryCreateProductUpgraderTests.cs

@@ -88,9 +88,9 @@ public void CreatesNuGetUpgraderWhenConfiguredWithNoRing()
         }
 
         [TestCase]
-        public void CreatesGitHubUpgraderWhenConfigured()
+        public void FailsWithDefaultConfiguration()
         {
-            MockLocalScalarConfig scalarConfig = this.ConstructDefaultGitHubConfigBuilder()
+            MockLocalScalarConfig scalarConfig = this.ConstructDefaultConfigBuilder()
                 .Build();
 
             bool success = ProductUpgrader.TryCreateUpgrader(
@@ -103,10 +103,9 @@ public void CreatesGitHubUpgraderWhenConfigured()
                 out ProductUpgrader productUpgrader,
                 out string error);
 
-            success.ShouldBeTrue();
-            productUpgrader.ShouldNotBeNull();
-            productUpgrader.ShouldBeOfType<GitHubUpgrader>();
-            error.ShouldBeNull();
+            success.ShouldBeFalse();
+            productUpgrader.ShouldBeNull();
+            error.ShouldNotBeNull();
         }
 
         [TestCase]
@@ -240,7 +239,7 @@ private MockLocalScalarConfigBuilder ConstructDefaultMockOrgNuGetConfigBuilder()
             return configBuilder;
         }
 
-        private MockLocalScalarConfigBuilder ConstructDefaultGitHubConfigBuilder()
+        private MockLocalScalarConfigBuilder ConstructDefaultConfigBuilder()
         {
             MockLocalScalarConfigBuilder configBuilder = this.ConstructMockLocalScalarConfigBuilder()
                             .WithUpgradeRing();