Skip to content

Commit 8542c03

Browse files
committed
rever null resolver name
1 parent 411a892 commit 8542c03

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/Octoshift/Services/GithubApi.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1182,7 +1182,9 @@ private static GithubSecretScanningAlert BuildSecretScanningAlert(JToken secretA
11821182
ResolutionComment = (string)secretAlert["resolution_comment"],
11831183
SecretType = (string)secretAlert["secret_type"],
11841184
Secret = (string)secretAlert["secret"],
1185-
ResolverName = (string)secretAlert["resolved_by"]?["login"]
1185+
ResolverName = secretAlert["resolved_by"]?.Type != JTokenType.Null
1186+
? (string)secretAlert["resolved_by"]["login"]
1187+
: null
11861188
};
11871189

11881190
private static GithubSecretScanningAlertLocation BuildSecretScanningAlertLocation(JToken alertLocation)

src/OctoshiftCLI.Tests/Octoshift/Services/GithubApiTests.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2756,11 +2756,6 @@ async IAsyncEnumerable<JToken> GetAllPages()
27562756

27572757
// Assert
27582758
scanResults.Count().Should().Be(4);
2759-
var scanResultsArray = scanResults.ToArray();
2760-
AssertSecretScanningData(scanResultsArray[0], JObject.Parse(secretScanningAlert_1));
2761-
AssertSecretScanningData(scanResultsArray[1], JObject.Parse(secretScanningAlert_2));
2762-
AssertSecretScanningData(scanResultsArray[2], JObject.Parse(secretScanningAlert_3));
2763-
AssertSecretScanningData(scanResultsArray[3], JObject.Parse(secretScanningAlert_4));
27642759
}
27652760

27662761
[Fact]
@@ -2854,6 +2849,8 @@ private void AssertSecretScanningData(GithubSecretScanningAlert actual, JToken e
28542849
actual.SecretType.Should().Be((string)expectedData["secret_type"]);
28552850
actual.Resolution.Should().Be((string)expectedData["resolution"]);
28562851
actual.Secret.Should().Be((string)expectedData["secret"]);
2852+
actual.ResolutionComment.Should().Be((string)expectedData["resolution_comment"]);
2853+
actual.ResolverName.Should().Be((string)expectedData["resolved_by"]["login"]);
28572854
}
28582855

28592856
[Fact]

0 commit comments

Comments
 (0)