Tidy GitHubSettings.cs

thomhurst · Jun 27, 2024 · b8bcd49 · b8bcd49
1 parent d69c927
commit b8bcd49
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 39 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -70,10 +70,6 @@ jobs:
           GitHub__Repository__Id: ${{ github.repository_id }}
           GitHub__StandardToken: ${{ secrets.DOTNET_FORMAT_PUSH_TOKEN }}
           GitHub__AdminToken: ${{ secrets.ADMIN_TOKEN }}
-          GitHub__PullRequest__Number: ${{ github.event.number }}
-          GitHub__PullRequest__Branch: ${{ github.event.pull_request.head.ref }}
-          GitHub__PullRequest__Sha: ${{ github.event.pull_request.head.sha }}
-          GitHub__PullRequest__Author: ${{ github.event.pull_request.user.login }}
           Publish__ShouldPublish: ${{ github.event.inputs.publish-packages || false}}
           Publish__IsAlpha: ${{ github.event.inputs.is-alpha || true}}
           Codacy__ApiKey: ${{ secrets.CODACY_APIKEY }}

diff --git a/src/ModularPipelines.Build/GitHelpers.cs b/src/ModularPipelines.Build/GitHelpers.cs
@@ -3,6 +3,7 @@
 using ModularPipelines.Context;
 using ModularPipelines.Git.Extensions;
 using ModularPipelines.Git.Options;
+using ModularPipelines.GitHub.Extensions;
 
 namespace ModularPipelines.Build;
 
@@ -71,8 +72,8 @@ await context.Git().Commands.Commit(new GitCommitOptions
         {
             Message = message,
         }, token: cancellationToken);
-
-        var author = context.Get<IOptions<GitHubSettings>>()?.Value?.PullRequest?.Author ?? "thomhurst";
+        
+        var author = context.GitHub().EnvironmentVariables.Actor ?? "thomhurst";
 
         var arguments = new List<string> { $"https://x-access-token:{token}@github.com/{author}/ModularPipelines.git" };
 

diff --git a/src/ModularPipelines.Build/Modules/CodeFormattedNicelyModule.cs b/src/ModularPipelines.Build/Modules/CodeFormattedNicelyModule.cs
@@ -5,8 +5,10 @@
 using ModularPipelines.Context;
 using ModularPipelines.DotNet.Extensions;
 using ModularPipelines.DotNet.Options;
+using ModularPipelines.Extensions;
 using ModularPipelines.Git.Extensions;
 using ModularPipelines.GitHub.Attributes;
+using ModularPipelines.GitHub.Extensions;
 using ModularPipelines.Models;
 using ModularPipelines.Modules;
 
@@ -29,6 +31,21 @@ public CodeFormattedNicelyModule(IOptions<GitHubSettings> githubSettings)
         _githubSettings = githubSettings;
     }
 
+    protected override Task<SkipDecision> ShouldSkip(IPipelineContext context)
+    {
+        if (context.GitHub().EnvironmentVariables.EventName != "pull_request")
+        {
+            return SkipDecision.Skip("Not a pull request").AsTask();
+        }
+
+        if (string.IsNullOrEmpty(_githubSettings.Value.StandardToken))
+        {
+            return SkipDecision.Skip("No authentication token for git").AsTask();
+        }
+
+        return SkipDecision.DoNotSkip.AsTask();
+    }
+
     /// <inheritdoc/>
     protected override async Task<CommandResult?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
     {
@@ -80,7 +97,7 @@ await context.DotNet().Format(new DotNetFormatOptions
                 Severity = "info",
             }, cancellationToken);
 
-            var branchTriggeringPullRequest = _githubSettings.Value.PullRequest?.Branch!;
+            var branchTriggeringPullRequest = context.GitHub().EnvironmentVariables.RefName!;
 
             await GitHelpers.SetUserCommitInformation(context, cancellationToken);
 

diff --git a/src/ModularPipelines.Build/Modules/FormatMarkdownModule.cs b/src/ModularPipelines.Build/Modules/FormatMarkdownModule.cs
@@ -6,6 +6,7 @@
 using ModularPipelines.Extensions;
 using ModularPipelines.Git.Extensions;
 using ModularPipelines.GitHub.Attributes;
+using ModularPipelines.GitHub.Extensions;
 using ModularPipelines.Models;
 using ModularPipelines.Modules;
 using ModularPipelines.Node.Extensions;
@@ -32,7 +33,7 @@ public FormatMarkdownModule(IOptions<GitHubSettings> gitHubSettings)
     /// <inheritdoc/>
     protected override Task<SkipDecision> ShouldSkip(IPipelineContext context)
     {
-        if (string.IsNullOrEmpty(_gitHubSettings.Value.PullRequest?.Branch))
+        if (context.GitHub().EnvironmentVariables.EventName != "pull_request")
         {
             return SkipDecision.Skip("Not a pull request").AsTask();
         }
@@ -88,7 +89,7 @@ await context.Node().Npx.ExecuteAsync(new NpxOptions
             return await NothingAsync();
         }
 
-        var branchTriggeringPullRequest = _gitHubSettings.Value.PullRequest!.Branch!;
+        var branchTriggeringPullRequest = context.GitHub().EnvironmentVariables.RefName!;
 
         await GitHelpers.SetUserCommitInformation(context, cancellationToken);
 

diff --git a/src/ModularPipelines.Build/Modules/UpdateReleaseNotesModule.cs b/src/ModularPipelines.Build/Modules/UpdateReleaseNotesModule.cs
@@ -6,6 +6,7 @@
 using ModularPipelines.Git.Attributes;
 using ModularPipelines.Git.Extensions;
 using ModularPipelines.GitHub.Attributes;
+using ModularPipelines.GitHub.Extensions;
 using ModularPipelines.Models;
 using ModularPipelines.Modules;
 using Octokit;
@@ -69,7 +70,7 @@ protected override async Task<SkipDecision> ShouldSkip(IPipelineContext context)
 
         if (!string.IsNullOrWhiteSpace(releaseNotesContents.Trim()))
         {
-            await _gitHubClient.Repository.Release.Create(_githubSettings.Value.Repository!.Id!.Value,
+            await _gitHubClient.Repository.Release.Create(long.Parse(context.GitHub().EnvironmentVariables.RepositoryId!),
                 new NewRelease(versionInfoResult.Value)
                 {
                     Name = versionInfoResult.Value,
@@ -86,7 +87,7 @@ private async Task<string> GetReleaseNotesContents(CancellationToken cancellatio
     {
         var customNotes = await releaseNotesFile.ReadAsync(cancellationToken);
 
-        if (string.Equals("null", customNotes, StringComparison.OrdinalIgnoreCase))
+        if (string.Equals("null", customNotes.Trim(), StringComparison.OrdinalIgnoreCase))
         {
             customNotes = string.Empty;
         }

diff --git a/src/ModularPipelines.Build/Modules/WaitForOtherOperatingSystemBuilds.cs b/src/ModularPipelines.Build/Modules/WaitForOtherOperatingSystemBuilds.cs
@@ -22,13 +22,10 @@ namespace ModularPipelines.Build.Modules;
 [DependsOn<PackProjectsModule>]
 public class WaitForOtherOperatingSystemBuilds : Module<List<WorkflowRun>>
 {
-    private readonly IOptions<GitHubSettings> _gitHubSettings;
     private readonly IGitHubClient _gitHubClient;
 
-    public WaitForOtherOperatingSystemBuilds(IOptions<GitHubSettings> gitHubSettings,
-        IGitHubClient gitHubClient)
+    public WaitForOtherOperatingSystemBuilds(IGitHubClient gitHubClient)
     {
-        _gitHubSettings = gitHubSettings;
         _gitHubClient = gitHubClient;
     }
 

diff --git a/src/ModularPipelines.Build/Settings/GitHubPullRequest.cs b/src/ModularPipelines.Build/Settings/GitHubPullRequest.cs
diff --git a/src/ModularPipelines.Build/Settings/GitHubRepository.cs b/src/ModularPipelines.Build/Settings/GitHubRepository.cs
diff --git a/src/ModularPipelines.Build/Settings/GitHubSettings.cs b/src/ModularPipelines.Build/Settings/GitHubSettings.cs
@@ -9,10 +9,4 @@ public record GitHubSettings
 
     [SecretValue]
     public string? AdminToken { get; init; }
-
-    public string? Actor { get; init; }
-
-    public GitHubPullRequest? PullRequest { get; init; }
-
-    public GitHubRepository? Repository { get; init; }
 }