-
Notifications
You must be signed in to change notification settings - Fork 117
Send git commit information as service message from ArgoCD steps #1749
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
530b7a3
Add ArgoCD deployment service message reporting
sathvikkumar-octo 03008bc
Extract duplicate convention constructors into helper methods
sathvikkumar-octo b296dc6
Test cleanup
sathvikkumar-octo b1049e7
Simplify ProcessApplicationResult construction in conventions
sathvikkumar-octo cb21a96
Remove dead code
sathvikkumar-octo 10b510a
Set all ProcessApplicationResult properties in constructor
sathvikkumar-octo 21ca568
Add test cases to conventions test
sathvikkumar-octo 4918391
PR feedback
sathvikkumar-octo 0a18b0a
rename message
sathvikkumar-octo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
180 changes: 180 additions & 0 deletions
180
source/Calamari.Tests/ArgoCD/ArgoCDDeploymentReporterTests.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,180 @@ | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text.Json; | ||
| using Calamari.ArgoCD; | ||
| using Calamari.ArgoCD.Models; | ||
| using Calamari.Common.Plumbing.Logging; | ||
| using Calamari.Common.Plumbing.ServiceMessages; | ||
| using Calamari.Testing.Helpers; | ||
| using FluentAssertions; | ||
| using NUnit.Framework; | ||
|
|
||
| namespace Calamari.Tests.ArgoCD | ||
| { | ||
| [TestFixture] | ||
| public class ArgoCDDeploymentReporterTests | ||
| { | ||
| [Test] | ||
| public void ReportDeployments_WithNoUpdatedApplications_WritesNoServiceMessages() | ||
| { | ||
| var log = new InMemoryLog(); | ||
| var reporter = new ArgoCDDeploymentReporter(log); | ||
|
|
||
| var applicationResults = new List<ProcessApplicationResult> | ||
| { | ||
| new ProcessApplicationResult("gateway1", new ApplicationName("app1")) | ||
| { | ||
| TotalSourceCount = 2, | ||
| MatchingSourceCount = 2 | ||
| } | ||
| }; | ||
|
|
||
| reporter.ReportDeployments(applicationResults); | ||
|
|
||
| var messages = log.ServiceMessages; | ||
| messages.Should().BeEmpty(); | ||
| } | ||
|
|
||
| [Test] | ||
| public void ReportDeployments_WithSingleUpdatedApplication_WritesOneServiceMessage() | ||
| { | ||
| var log = new InMemoryLog(); | ||
| var reporter = new ArgoCDDeploymentReporter(log); | ||
|
|
||
| var applicationResults = new List<ProcessApplicationResult> | ||
| { | ||
| new ProcessApplicationResult("gateway1", new ApplicationName("app1")) | ||
| { | ||
| TotalSourceCount = 2, | ||
| MatchingSourceCount = 2, | ||
| UpdatedSourceDetails = | ||
| { | ||
| new UpdatedSourceDetail("abc123", 0, [], []) | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| reporter.ReportDeployments(applicationResults); | ||
|
|
||
| var messages = log.ServiceMessages; | ||
| messages.Should().HaveCount(1); | ||
|
|
||
| var message = messages.First(); | ||
| message.Name.Should().Be("argocd-deployment"); | ||
| message.Properties["gatewayId"].Should().Be("gateway1"); | ||
| message.Properties["applicationName"].Should().Be("app1"); | ||
| } | ||
|
|
||
| [Test] | ||
| public void ReportDeployments_WithMultipleUpdatedApplications_WritesMultipleServiceMessages() | ||
| { | ||
| var log = new InMemoryLog(); | ||
| var reporter = new ArgoCDDeploymentReporter(log); | ||
|
|
||
| var applicationResults = new List<ProcessApplicationResult> | ||
| { | ||
| new ProcessApplicationResult("gateway1", new ApplicationName("app1")) | ||
| { | ||
| TotalSourceCount = 2, | ||
| MatchingSourceCount = 2, | ||
| UpdatedSourceDetails = | ||
| { | ||
| new UpdatedSourceDetail("abc123", 0, [], []) | ||
| } | ||
| }, | ||
| new ProcessApplicationResult("gateway2", new ApplicationName("app2")) | ||
| { | ||
| TotalSourceCount = 1, | ||
| MatchingSourceCount = 1, | ||
| UpdatedSourceDetails = | ||
| { | ||
| new UpdatedSourceDetail("def456", 0, [], []) | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| reporter.ReportDeployments(applicationResults); | ||
|
|
||
| var messages = log.ServiceMessages; | ||
| messages.Should().HaveCount(2); | ||
|
|
||
| messages[0].Properties["gatewayId"].Should().Be("gateway1"); | ||
| messages[0].Properties["applicationName"].Should().Be("app1"); | ||
|
|
||
| messages[1].Properties["gatewayId"].Should().Be("gateway2"); | ||
| messages[1].Properties["applicationName"].Should().Be("app2"); | ||
| } | ||
|
|
||
| [Test] | ||
| public void ReportDeployments_SerializesSourcesCorrectly() | ||
| { | ||
| var log = new InMemoryLog(); | ||
| var reporter = new ArgoCDDeploymentReporter(log); | ||
|
|
||
| var applicationResults = new List<ProcessApplicationResult> | ||
| { | ||
| new ProcessApplicationResult("gateway1", new ApplicationName("app1")) | ||
| { | ||
| TotalSourceCount = 2, | ||
| MatchingSourceCount = 2, | ||
| UpdatedSourceDetails = | ||
| { | ||
| new UpdatedSourceDetail("abc123", 0, [], []), | ||
| new UpdatedSourceDetail("def456", 1, [], []) | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| reporter.ReportDeployments(applicationResults); | ||
|
|
||
| var messages = log.ServiceMessages; | ||
| messages.Should().HaveCount(1); | ||
|
|
||
| var sourcesJson = messages.First().Properties["sources"]; | ||
| var sources = JsonSerializer.Deserialize<List<UpdatedSourceDetail>>(sourcesJson); | ||
|
|
||
| sources.Should().HaveCount(2); | ||
| sources[0].CommitSha.Should().Be("abc123"); | ||
| sources[0].SourceIndex.Should().Be(0); | ||
| sources[1].CommitSha.Should().Be("def456"); | ||
| sources[1].SourceIndex.Should().Be(1); | ||
| } | ||
|
|
||
| [Test] | ||
| public void ReportDeployments_WithMixedUpdatedAndNonUpdatedApplications_WritesOnlyUpdatedMessages() | ||
| { | ||
| var log = new InMemoryLog(); | ||
| var reporter = new ArgoCDDeploymentReporter(log); | ||
|
|
||
| var applicationResults = new List<ProcessApplicationResult> | ||
| { | ||
| new ProcessApplicationResult("gateway1", new ApplicationName("app1")) | ||
| { | ||
| TotalSourceCount = 2, | ||
| MatchingSourceCount = 2 | ||
| }, | ||
| new ProcessApplicationResult("gateway2", new ApplicationName("app2")) | ||
| { | ||
| TotalSourceCount = 1, | ||
| MatchingSourceCount = 1, | ||
| UpdatedSourceDetails = | ||
| { | ||
| new UpdatedSourceDetail("abc123", 0, [], []) | ||
| } | ||
| }, | ||
| new ProcessApplicationResult("gateway3", new ApplicationName("app3")) | ||
| { | ||
| TotalSourceCount = 1, | ||
| MatchingSourceCount = 1 | ||
| } | ||
| }; | ||
|
|
||
| reporter.ReportDeployments(applicationResults); | ||
|
|
||
| var messages = log.ServiceMessages; | ||
| messages.Should().HaveCount(1); | ||
| messages[0].Properties["gatewayId"].Should().Be("gateway2"); | ||
| messages[0].Properties["applicationName"].Should().Be("app2"); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.