Use GITHUB_TOKEN to limit GitHub API rate-limiting (#834)

microsoft · Feb 18, 2025 · c91e6e0 · c91e6e0
1 parent b1032c3
commit c91e6e0
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/src/build-push-acr/AcrBuild.cs b/src/build-push-acr/AcrBuild.cs
@@ -72,7 +72,7 @@ public static IArchive GetGitHubArchive(BuildType buildType, string @ref, Micros
                         ? new Microsoft.Kiota.Abstractions.Authentication.AnonymousAuthenticationProvider()
                         : new GitHub.Octokit.Client.Authentication.TokenAuthProvider(tokenProvider))
                     .WithUserAgent("microsoft-ga4gh-tes", string.Empty)
-                    .WithRequestTimeout(TimeSpan.FromSeconds(100))
+                    .WithRequestTimeout(TimeSpan.FromHours(1.5))
                     //.WithBaseUrl("https://api.github.com")
                     .Build()),
                 "microsoft",

diff --git a/src/build-push-acr/GitHubArchive.cs b/src/build-push-acr/GitHubArchive.cs
@@ -4,6 +4,7 @@
 using System.IO.Compression;
 using System.Net;
 using CommonUtilities;
+using Microsoft.Kiota.Abstractions.Authentication;
 
 namespace BuildPushAcr
 {
@@ -24,6 +25,28 @@ public sealed class GitHubArchive(GitHub.GitHubClient client, string owner, stri
         private string? srcRoot;
         private string? root;
 
+        public static IAccessTokenProvider? GetAccessTokenProvider()
+        {
+            var pat = Environment.GetEnvironmentVariable("GITHUB_TOKEN");
+
+            if (string.IsNullOrWhiteSpace(pat))
+            {
+                return default;
+            }
+
+            return new AccessTokenProvider(pat);
+        }
+
+        private class AccessTokenProvider(string pat) : IAccessTokenProvider
+        {
+            private readonly string pat = pat;
+
+            AllowedHostsValidator IAccessTokenProvider.AllowedHostsValidator { get; } = new(["api.github.com"]);
+
+            Task<string> IAccessTokenProvider.GetAuthorizationTokenAsync(Uri uri, Dictionary<string, object>? additionalAuthenticationContext, CancellationToken cancellationToken)
+                => Task.FromResult(pat);
+        }
+
         async ValueTask<Version> IArchive.GetTagAsync(CancellationToken cancellationToken)
         {
             List<GitHub.Models.Tag> tags = [];

diff --git a/src/build-push-acr/Program.cs b/src/build-push-acr/Program.cs
@@ -100,7 +100,9 @@ IArchive GetLocalGitArchive(System.CommandLine.Invocation.InvocationContext cont
     => AcrBuild.GetLocalGitArchiveAsync(context.ParseResult.GetValueForOption(directoryOption)!);
 
 IArchive GetGitHubArchive(System.CommandLine.Invocation.InvocationContext context)
-    => AcrBuild.GetGitHubArchive(context.ParseResult.GetValueForOption(buildTypeOption), context.ParseResult.GetValueForOption(tagOption)!.ToString(3));
+    => AcrBuild.GetGitHubArchive(context.ParseResult.GetValueForOption(buildTypeOption),
+        context.ParseResult.GetValueForOption(tagOption)!.ToString(3),
+        GitHubArchive.GetAccessTokenProvider());
 
 githubCommand.SetHandler(context => Handler(context, GetGitHubArchive));
 localCommand.SetHandler(context => Handler(context, GetLocalGitArchive));

diff --git a/src/deploy-tes-on-azure/Deployer.cs b/src/deploy-tes-on-azure/Deployer.cs
@@ -1335,7 +1335,7 @@ private async Task BuildPushAcrAsync(Dictionary<string, string> settings, string
 
                             if (string.IsNullOrWhiteSpace(configuration.SolutionDir))
                             {
-                                tar = AcrBuild.GetGitHubArchive(BuildType.Tes, string.IsNullOrWhiteSpace(configuration.GitHubCommit) ? new Version(targetVersion).ToString(3) : configuration.GitHubCommit);
+                                tar = AcrBuild.GetGitHubArchive(BuildType.Tes, string.IsNullOrWhiteSpace(configuration.GitHubCommit) ? new Version(targetVersion).ToString(3) : configuration.GitHubCommit, GitHubArchive.GetAccessTokenProvider());
                                 tarDisposable = tar as IAsyncDisposable;
                             }
                             else

diff --git a/src/deploy-tes-on-azure/deploy-tes-on-azure.csproj b/src/deploy-tes-on-azure/deploy-tes-on-azure.csproj
@@ -66,4 +66,19 @@
     <ProjectReference Include="..\build-push-acr\build-push-acr.csproj" />
   </ItemGroup>
 
+  <!-- Not needed in NET SDK 9 -->
+  <Target Name="RemoveSingleFileHostsFromDependencies" BeforeTargets="_ComputeCopyToPublishDirectoryItems">
+    <PropertyGroup>
+      <SingleFileHostIntermediatePath Condition=" '$(SingleFileHostIntermediatePath)' == '' ">$(AppHostIntermediatePath)</SingleFileHostIntermediatePath>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <__ItemsToRemove Remove="@(__ItemsToRemove)" />
+      <__ItemsToRemove Condition=" '%(Filename)' == '$(_DotNetSingleFileHostExecutableNameWithoutExtension)' And '%(FullPath)' != '$(SingleFileHostIntermediatePath)' "
+                       Include="@(_SourceItemsToCopyToPublishDirectoryAlways)" />
+      <_SourceItemsToCopyToPublishDirectoryAlways Remove="@(__ItemsToRemove)" />
+      <__ItemsToRemove Remove="@(__ItemsToRemove)" />
+    </ItemGroup>
+  </Target>
+
 </Project>