Skip to content

Move Argo file changes stuff into Calamari contracts#1914

Merged
flin-8 merged 10 commits into
release/2026.2from
frank/contracts
Jun 3, 2026
Merged

Move Argo file changes stuff into Calamari contracts#1914
flin-8 merged 10 commits into
release/2026.2from
frank/contracts

Conversation

@flin-8
Copy link
Copy Markdown
Contributor

@flin-8 flin-8 commented May 6, 2026

This is so we can share the service message names etc. with Server

Relates to MD-1901: Support the same application name in different namespaces

@flin-8 flin-8 self-assigned this May 6, 2026
flin-8 added 4 commits May 7, 2026 21:42
…amari into frank/contracts

# Conflicts:
#	source/Calamari.Contracts/ArgoCD/ArgoCDCustomPropertiesDto.cs
@flin-8 flin-8 changed the base branch from main to release/2026.2 June 2, 2026 12:25
}

List<TrackedSourceDetail> ConvertPathsToPosix(List<TrackedSourceDetail> inputs)
static SourceFileChanges MapSource(TrackedSourceDetail trackedSourceDetail)
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Decouple the service message source details from the TrackedSourceDetail (we will add more stuff to TrackedSourceDetail in a later PR)

@flin-8 flin-8 changed the title Move stuff into Calamari contracts Move Argo file changes stuff into Calamari contracts Jun 2, 2026
using NSubstitute;
using NUnit.Framework;
using Octopus.Calamari.Contracts.ArgoCD;
using FileJsonPatch = Calamari.ArgoCD.FileJsonPatch;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why use the old one and not the new contracts one?

Copy link
Copy Markdown
Contributor

@zentron zentron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a non-blocking question about the using statement

using NSubstitute;
using NUnit.Framework;
using Octopus.Calamari.Contracts.ArgoCD;
using FileJsonPatch = Calamari.ArgoCD.FileJsonPatch;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to set this using? shouldnt the change result in only one FileJsonPatch in the solution?

@flin-8 flin-8 merged commit 0f17395 into release/2026.2 Jun 3, 2026
31 checks passed
@flin-8 flin-8 deleted the frank/contracts branch June 3, 2026 01:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants