From 3b87489f9e298e1e55ec5569ef432927a60b20fc Mon Sep 17 00:00:00 2001 From: Eddie Wassef Date: Mon, 13 May 2024 13:00:07 -0500 Subject: [PATCH] Adding guid to generated filename This will allow the different components to be separated into different projects. This can be helpful in the case where you have the entities in a different project to be published in a nuget package --- .../Generators/ControllerRegistrationGenerator.cs | 2 +- src/KubeOps.Generator/Generators/EntityDefinitionGenerator.cs | 2 +- .../Generators/FinalizerRegistrationGenerator.cs | 2 +- src/KubeOps.Generator/Generators/OperatorBuilderGenerator.cs | 2 +- .../ControllerRegistrationGenerator.Test.cs | 2 +- test/KubeOps.Generator.Test/EntityDefinitionGenerator.Test.cs | 2 +- .../KubeOps.Generator.Test/EntityInitializerGenerator.Test.cs | 4 ++-- .../FinalizerRegistrationGenerator.Test.cs | 2 +- test/KubeOps.Generator.Test/OperatorBuilderGenerator.Test.cs | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/KubeOps.Generator/Generators/ControllerRegistrationGenerator.cs b/src/KubeOps.Generator/Generators/ControllerRegistrationGenerator.cs index 6792cde2..f9161ad1 100644 --- a/src/KubeOps.Generator/Generators/ControllerRegistrationGenerator.cs +++ b/src/KubeOps.Generator/Generators/ControllerRegistrationGenerator.cs @@ -79,7 +79,7 @@ public void Execute(GeneratorExecutionContext context) .NormalizeWhitespace(); context.AddSource( - "ControllerRegistrations.g.cs", + $"ControllerRegistrations.{Guid.NewGuid()}.g.cs", SourceText.From(declaration.ToString(), Encoding.UTF8, SourceHashAlgorithm.Sha256)); } } diff --git a/src/KubeOps.Generator/Generators/EntityDefinitionGenerator.cs b/src/KubeOps.Generator/Generators/EntityDefinitionGenerator.cs index a643dca3..9de82aab 100644 --- a/src/KubeOps.Generator/Generators/EntityDefinitionGenerator.cs +++ b/src/KubeOps.Generator/Generators/EntityDefinitionGenerator.cs @@ -82,7 +82,7 @@ public void Execute(GeneratorExecutionContext context) .NormalizeWhitespace(); context.AddSource( - "EntityDefinitions.g.cs", + $"EntityDefinitions.{Guid.NewGuid()}.g.cs", SourceText.From(declaration.ToString(), Encoding.UTF8, SourceHashAlgorithm.Sha256)); } } diff --git a/src/KubeOps.Generator/Generators/FinalizerRegistrationGenerator.cs b/src/KubeOps.Generator/Generators/FinalizerRegistrationGenerator.cs index 8bef2d6b..71fe9666 100644 --- a/src/KubeOps.Generator/Generators/FinalizerRegistrationGenerator.cs +++ b/src/KubeOps.Generator/Generators/FinalizerRegistrationGenerator.cs @@ -102,7 +102,7 @@ public void Execute(GeneratorExecutionContext context) .NormalizeWhitespace(); context.AddSource( - "FinalizerRegistrations.g.cs", + $"FinalizerRegistrations.{Guid.NewGuid()}.g.cs", SourceText.From(declaration.ToString(), Encoding.UTF8, SourceHashAlgorithm.Sha256)); } diff --git a/src/KubeOps.Generator/Generators/OperatorBuilderGenerator.cs b/src/KubeOps.Generator/Generators/OperatorBuilderGenerator.cs index 4bea12db..2fb57dfe 100644 --- a/src/KubeOps.Generator/Generators/OperatorBuilderGenerator.cs +++ b/src/KubeOps.Generator/Generators/OperatorBuilderGenerator.cs @@ -54,7 +54,7 @@ public void Execute(GeneratorExecutionContext context) .NormalizeWhitespace(); context.AddSource( - "OperatorBuilder.g.cs", + $"OperatorBuilder.{Guid.NewGuid()}.g.cs", SourceText.From(declaration.ToString(), Encoding.UTF8, SourceHashAlgorithm.Sha256)); } } diff --git a/test/KubeOps.Generator.Test/ControllerRegistrationGenerator.Test.cs b/test/KubeOps.Generator.Test/ControllerRegistrationGenerator.Test.cs index 63ec20cc..b303cf39 100644 --- a/test/KubeOps.Generator.Test/ControllerRegistrationGenerator.Test.cs +++ b/test/KubeOps.Generator.Test/ControllerRegistrationGenerator.Test.cs @@ -50,7 +50,7 @@ public void Should_Generate_Correct_Code(string input, string expectedResult) driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out var output, out var diag); var result = output.SyntaxTrees - .First(s => s.FilePath.Contains("ControllerRegistrations.g.cs")) + .First(s => s.FilePath.Contains("ControllerRegistrations.")) .ToString().ReplaceLineEndings(); result.Should().Be(expectedResult); } diff --git a/test/KubeOps.Generator.Test/EntityDefinitionGenerator.Test.cs b/test/KubeOps.Generator.Test/EntityDefinitionGenerator.Test.cs index d9fa67b2..048c4387 100644 --- a/test/KubeOps.Generator.Test/EntityDefinitionGenerator.Test.cs +++ b/test/KubeOps.Generator.Test/EntityDefinitionGenerator.Test.cs @@ -60,7 +60,7 @@ public void Should_Generate_Correct_Code(string input, string expectedResult) driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out var output, out var diag); var result = output.SyntaxTrees - .First(s => s.FilePath.Contains("EntityDefinitions.g.cs")) + .First(s => s.FilePath.Contains("EntityDefinitions.")) .ToString().ReplaceLineEndings(); result.Should().Be(expectedResult); } diff --git a/test/KubeOps.Generator.Test/EntityInitializerGenerator.Test.cs b/test/KubeOps.Generator.Test/EntityInitializerGenerator.Test.cs index b719e951..2e3f0dda 100644 --- a/test/KubeOps.Generator.Test/EntityInitializerGenerator.Test.cs +++ b/test/KubeOps.Generator.Test/EntityInitializerGenerator.Test.cs @@ -22,7 +22,7 @@ public static class EntityInitializer driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out var output, out var diag); var result = output.SyntaxTrees - .First(s => s.FilePath.Contains("EntityInitializer.g.cs")) + .First(s => s.FilePath.Contains("EntityInitializer.")) .ToString().ReplaceLineEndings(); result.Should().Be(expectedResult); } @@ -66,7 +66,7 @@ public static class EntityInitializer output.SyntaxTrees.Any(s => s.FilePath.Contains("V1TestEntity")).Should().BeFalse(); output.SyntaxTrees.Any(s => s.FilePath.Contains("V2TestEntity")).Should().BeFalse(); var result = output.SyntaxTrees - .First(s => s.FilePath.Contains("EntityInitializer.g.cs")) + .First(s => s.FilePath.Contains("EntityInitializer.")) .ToString().ReplaceLineEndings(); result.Should().Be(expectedResult); } diff --git a/test/KubeOps.Generator.Test/FinalizerRegistrationGenerator.Test.cs b/test/KubeOps.Generator.Test/FinalizerRegistrationGenerator.Test.cs index da88e296..09c5240a 100644 --- a/test/KubeOps.Generator.Test/FinalizerRegistrationGenerator.Test.cs +++ b/test/KubeOps.Generator.Test/FinalizerRegistrationGenerator.Test.cs @@ -79,7 +79,7 @@ public void Should_Generate_Correct_Code(string input, string expectedResult) driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out var output, out var diag); var result = output.SyntaxTrees - .First(s => s.FilePath.Contains("FinalizerRegistrations.g.cs")) + .First(s => s.FilePath.Contains("FinalizerRegistrations.")) .ToString().ReplaceLineEndings(); result.Should().Be(expectedResult); } diff --git a/test/KubeOps.Generator.Test/OperatorBuilderGenerator.Test.cs b/test/KubeOps.Generator.Test/OperatorBuilderGenerator.Test.cs index 5da30164..02ac04da 100644 --- a/test/KubeOps.Generator.Test/OperatorBuilderGenerator.Test.cs +++ b/test/KubeOps.Generator.Test/OperatorBuilderGenerator.Test.cs @@ -31,7 +31,7 @@ public static IOperatorBuilder RegisterComponents(this IOperatorBuilder builder) driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out var output, out var diag); var result = output.SyntaxTrees - .First(s => s.FilePath.Contains("OperatorBuilder.g.cs")) + .First(s => s.FilePath.Contains("OperatorBuilder.")) .ToString().ReplaceLineEndings(); result.Should().Be(expectedResult); }