From 0779d4bb48b48969796a3648601431e9e58a4159 Mon Sep 17 00:00:00 2001 From: Vincent Boots Date: Wed, 29 Jan 2025 21:44:17 +0100 Subject: [PATCH 01/23] feat: .NET release upgrade - Change main versions - Fix Regex .NET Issues - Update packages - Update default dashboard version - Update pipeline --- .github/workflows/main.yaml | 2 +- Directory.Packages.props | 18 +++++++++--------- src/Aspirate.Cli/Aspirate.Cli.csproj | 2 +- src/Aspirate.Commands/Aspirate.Commands.csproj | 2 +- .../Aspirate.Processors.csproj | 2 +- .../Json/JsonExpressionProcessor.cs | 7 ++----- src/Aspirate.Secrets/Aspirate.Secrets.csproj | 2 +- src/Aspirate.Services/Aspirate.Services.csproj | 2 +- .../ContainerCompositionService.cs | 1 - .../Implementations/KubeCtlService.cs | 7 ++----- src/Aspirate.Shared/Aspirate.Shared.csproj | 2 +- .../Extensions/ComposeExtensions.cs | 2 ++ .../Services/IShellExecutionService.cs | 2 +- src/Aspirate.Shared/Literals/AspireLiterals.cs | 2 +- .../ActionsTests/ActionExecutorTests.cs | 4 ++++ .../ActionsTests/BaseActionTests.cs | 2 ++ .../InitializeConfigurationActionTests.cs | 3 +++ .../LoadConfigurationActionTests.cs | 2 ++ ...teContainerDetailsForProjectsActionTests.cs | 5 +++++ .../ApplyManifestsToClusterActionTests.cs | 4 ++++ .../GenerateAspireManifestActionTests.cs | 5 +++++ ...GenerateDockerComposeManifestActionTests.cs | 2 ++ .../GenerateKustomizeManifestsActionTests.cs | 2 ++ .../Manifests/LoadAspireManifestActionTests.cs | 5 +++++ .../RemoveManifestsToClusterActionTests.cs | 4 ++++ .../Secrets/PopulateInputsActionTests.cs | 4 ++++ .../Secrets/SaveSecretsActionTests.cs | 4 ++++ tests/Aspirate.Tests/Aspirate.Tests.csproj | 2 +- .../DockerComposeBuilderTests.cs | 4 ++++ .../KubernetesDeploymentDataExtensionTests.cs | 4 +++- .../ProcessorTests/ContainerProcessorTests.cs | 3 +++ .../SecretTests/SecretProviderTests.cs | 3 +++ .../AspirateConfigurationServiceTest.cs | 3 +++ .../ServiceTests/BaseServiceTests.cs | 2 ++ .../ContainerCompositionServiceTest.cs | 6 ++++++ .../ContainerDetailsServiceTests.cs | 5 +++++ .../ServiceTests/ContainerOptionsTests.cs | 5 +++++ .../ServiceTests/KubeCtlServiceTests.cs | 3 +++ .../ManifestFileParserServiceTests.cs | 6 ++++++ .../ProjectPropertyServiceTests.cs | 3 +++ .../ServiceTests/SecretServiceTests.cs | 2 ++ tests/Aspirate.Tests/TestData/TestApp.csproj | 2 +- 42 files changed, 120 insertions(+), 32 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c7074d7..ca47c7f 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.x' + dotnet-version: '9.0.x' - name: Build, Test and Pack run: | diff --git a/Directory.Packages.props b/Directory.Packages.props index 9c1e74e..346ba73 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,22 +1,22 @@ - - - - + + + + - + - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/Aspirate.Cli/Aspirate.Cli.csproj b/src/Aspirate.Cli/Aspirate.Cli.csproj index b4eeb40..0467772 100644 --- a/src/Aspirate.Cli/Aspirate.Cli.csproj +++ b/src/Aspirate.Cli/Aspirate.Cli.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 aspirate true aspirate diff --git a/src/Aspirate.Commands/Aspirate.Commands.csproj b/src/Aspirate.Commands/Aspirate.Commands.csproj index b68c3a8..839e700 100644 --- a/src/Aspirate.Commands/Aspirate.Commands.csproj +++ b/src/Aspirate.Commands/Aspirate.Commands.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false diff --git a/src/Aspirate.Processors/Aspirate.Processors.csproj b/src/Aspirate.Processors/Aspirate.Processors.csproj index 64684a6..6333daa 100644 --- a/src/Aspirate.Processors/Aspirate.Processors.csproj +++ b/src/Aspirate.Processors/Aspirate.Processors.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false diff --git a/src/Aspirate.Processors/Transformation/Json/JsonExpressionProcessor.cs b/src/Aspirate.Processors/Transformation/Json/JsonExpressionProcessor.cs index 175a39b..2ca648f 100644 --- a/src/Aspirate.Processors/Transformation/Json/JsonExpressionProcessor.cs +++ b/src/Aspirate.Processors/Transformation/Json/JsonExpressionProcessor.cs @@ -25,10 +25,6 @@ public void ResolveJsonExpressions(JsonNode? jsonNode, JsonNode rootNode) } } while (_unresolvedExpressionPointers.Count > 0); } - - [GeneratedRegex(@"\{([\w\.-]+)\}")] - private static partial Regex PlaceholderPatternRegex(); - public static IJsonExpressionProcessor CreateDefaultExpressionProcessor() => new JsonExpressionProcessor(BindingProcessor.CreateDefaultExpressionProcessor()); @@ -99,7 +95,8 @@ private void ReplaceWithResolvedExpression(JsonNode rootNode, JsonNode jsonValue return; } - var matches = PlaceholderPatternRegex().Matches(input); + var regex = new Regex(@"\{([\w\.-]+)\}"); + var matches = regex.Matches(input); for (var i = 0; i < matches.Count; i++) { var match = matches[i]; diff --git a/src/Aspirate.Secrets/Aspirate.Secrets.csproj b/src/Aspirate.Secrets/Aspirate.Secrets.csproj index 54316f6..5752699 100644 --- a/src/Aspirate.Secrets/Aspirate.Secrets.csproj +++ b/src/Aspirate.Secrets/Aspirate.Secrets.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false diff --git a/src/Aspirate.Services/Aspirate.Services.csproj b/src/Aspirate.Services/Aspirate.Services.csproj index 88fa66c..5752d6a 100644 --- a/src/Aspirate.Services/Aspirate.Services.csproj +++ b/src/Aspirate.Services/Aspirate.Services.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false diff --git a/src/Aspirate.Services/Implementations/ContainerCompositionService.cs b/src/Aspirate.Services/Implementations/ContainerCompositionService.cs index f5d5fce..9f30898 100644 --- a/src/Aspirate.Services/Implementations/ContainerCompositionService.cs +++ b/src/Aspirate.Services/Implementations/ContainerCompositionService.cs @@ -1,4 +1,3 @@ - namespace Aspirate.Services.Implementations; public sealed class ContainerCompositionService( diff --git a/src/Aspirate.Services/Implementations/KubeCtlService.cs b/src/Aspirate.Services/Implementations/KubeCtlService.cs index 7cc5d5a..82ac055 100644 --- a/src/Aspirate.Services/Implementations/KubeCtlService.cs +++ b/src/Aspirate.Services/Implementations/KubeCtlService.cs @@ -2,9 +2,6 @@ namespace Aspirate.Services.Implementations; public partial class KubeCtlService(IFileSystem filesystem, IAnsiConsole console, IShellExecutionService shellExecutionService) : IKubeCtlService { - [GeneratedRegex("name: (.*)")] - private static partial Regex NamespaceMatcher(); - public async Task SelectKubernetesContextForDeployment() { var contexts = await GatherContexts(); @@ -176,8 +173,8 @@ private async Task ParseNamespace(string fullOutputPath) } var namespaceContent = await filesystem.File.ReadAllTextAsync(namespaceFile); - - var namespaceMatch = NamespaceMatcher().Match(namespaceContent); + var regex = new Regex("name: (.*)"); + var namespaceMatch = regex.Match(namespaceContent); return namespaceMatch.Success ? namespaceMatch.Groups[1].Value : KubeCtlLiterals.KubeCtlDefaultNamespace; } diff --git a/src/Aspirate.Shared/Aspirate.Shared.csproj b/src/Aspirate.Shared/Aspirate.Shared.csproj index 9e73faa..8a8b495 100644 --- a/src/Aspirate.Shared/Aspirate.Shared.csproj +++ b/src/Aspirate.Shared/Aspirate.Shared.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false diff --git a/src/Aspirate.Shared/Extensions/ComposeExtensions.cs b/src/Aspirate.Shared/Extensions/ComposeExtensions.cs index 13f7d35..200ef24 100644 --- a/src/Aspirate.Shared/Extensions/ComposeExtensions.cs +++ b/src/Aspirate.Shared/Extensions/ComposeExtensions.cs @@ -1,3 +1,5 @@ +using DockerComposeBuilder.Converters; + namespace Aspirate.Shared.Extensions; public static class ComposeExtensions diff --git a/src/Aspirate.Shared/Interfaces/Services/IShellExecutionService.cs b/src/Aspirate.Shared/Interfaces/Services/IShellExecutionService.cs index 17f7f6d..8a85173 100644 --- a/src/Aspirate.Shared/Interfaces/Services/IShellExecutionService.cs +++ b/src/Aspirate.Shared/Interfaces/Services/IShellExecutionService.cs @@ -10,7 +10,7 @@ public interface IShellExecutionService /// /// The options for the shell command. /// - /// A representing the asynchronous operation. + /// A representing the asynchronous operation. /// The task will contain the result of the command execution, encapsulated in a object. /// Task ExecuteCommand(ShellCommandOptions options); diff --git a/src/Aspirate.Shared/Literals/AspireLiterals.cs b/src/Aspirate.Shared/Literals/AspireLiterals.cs index 1f78059..72852fd 100644 --- a/src/Aspirate.Shared/Literals/AspireLiterals.cs +++ b/src/Aspirate.Shared/Literals/AspireLiterals.cs @@ -9,5 +9,5 @@ public static class AspireLiterals public const string ManifestPublisherArgument = "manifest"; - public const string DashboardImage = "mcr.microsoft.com/dotnet/aspire-dashboard:8.0"; + public const string DashboardImage = "mcr.microsoft.com/dotnet/aspire-dashboard:9.0"; } diff --git a/tests/Aspirate.Tests/ActionsTests/ActionExecutorTests.cs b/tests/Aspirate.Tests/ActionsTests/ActionExecutorTests.cs index 2c8761c..f883869 100644 --- a/tests/Aspirate.Tests/ActionsTests/ActionExecutorTests.cs +++ b/tests/Aspirate.Tests/ActionsTests/ActionExecutorTests.cs @@ -1,3 +1,7 @@ +using System; +using System.Threading.Tasks; +using Xunit; + namespace Aspirate.Tests.ActionsTests; public class ActionExecutorTests diff --git a/tests/Aspirate.Tests/ActionsTests/BaseActionTests.cs b/tests/Aspirate.Tests/ActionsTests/BaseActionTests.cs index 4fcbee4..549b572 100644 --- a/tests/Aspirate.Tests/ActionsTests/BaseActionTests.cs +++ b/tests/Aspirate.Tests/ActionsTests/BaseActionTests.cs @@ -1,3 +1,5 @@ +using System; + namespace Aspirate.Tests.ActionsTests; public abstract class BaseActionTests : AspirateTestBase diff --git a/tests/Aspirate.Tests/ActionsTests/Configuration/InitializeConfigurationActionTests.cs b/tests/Aspirate.Tests/ActionsTests/Configuration/InitializeConfigurationActionTests.cs index 2b1ec34..6c135a4 100644 --- a/tests/Aspirate.Tests/ActionsTests/Configuration/InitializeConfigurationActionTests.cs +++ b/tests/Aspirate.Tests/ActionsTests/Configuration/InitializeConfigurationActionTests.cs @@ -1,4 +1,7 @@ +using System; +using System.Threading.Tasks; using Aspirate.Commands.Actions.Configuration; +using Xunit; namespace Aspirate.Tests.ActionsTests.Configuration; diff --git a/tests/Aspirate.Tests/ActionsTests/Configuration/LoadConfigurationActionTests.cs b/tests/Aspirate.Tests/ActionsTests/Configuration/LoadConfigurationActionTests.cs index 7c4e1cb..8bfdb9a 100644 --- a/tests/Aspirate.Tests/ActionsTests/Configuration/LoadConfigurationActionTests.cs +++ b/tests/Aspirate.Tests/ActionsTests/Configuration/LoadConfigurationActionTests.cs @@ -1,4 +1,6 @@ +using System.Threading.Tasks; using Aspirate.Commands.Actions.Configuration; +using Xunit; namespace Aspirate.Tests.ActionsTests.Configuration; diff --git a/tests/Aspirate.Tests/ActionsTests/Containers/PopulateContainerDetailsForProjectsActionTests.cs b/tests/Aspirate.Tests/ActionsTests/Containers/PopulateContainerDetailsForProjectsActionTests.cs index 6981df4..05c62fd 100644 --- a/tests/Aspirate.Tests/ActionsTests/Containers/PopulateContainerDetailsForProjectsActionTests.cs +++ b/tests/Aspirate.Tests/ActionsTests/Containers/PopulateContainerDetailsForProjectsActionTests.cs @@ -1,3 +1,8 @@ +using System; +using System.IO; +using System.Threading.Tasks; +using Xunit; + namespace Aspirate.Tests.ActionsTests.Containers; public class PopulateContainerDetailsForProjectsActionTests : BaseActionTests diff --git a/tests/Aspirate.Tests/ActionsTests/Manifests/ApplyManifestsToClusterActionTests.cs b/tests/Aspirate.Tests/ActionsTests/Manifests/ApplyManifestsToClusterActionTests.cs index 1e75ce3..674bd6e 100644 --- a/tests/Aspirate.Tests/ActionsTests/Manifests/ApplyManifestsToClusterActionTests.cs +++ b/tests/Aspirate.Tests/ActionsTests/Manifests/ApplyManifestsToClusterActionTests.cs @@ -1,3 +1,7 @@ +using System; +using System.Threading.Tasks; +using Xunit; + namespace Aspirate.Tests.ActionsTests.Manifests; public class ApplyManifestsToClusterActionTests : BaseActionTests diff --git a/tests/Aspirate.Tests/ActionsTests/Manifests/GenerateAspireManifestActionTests.cs b/tests/Aspirate.Tests/ActionsTests/Manifests/GenerateAspireManifestActionTests.cs index 38df993..7fb49d7 100644 --- a/tests/Aspirate.Tests/ActionsTests/Manifests/GenerateAspireManifestActionTests.cs +++ b/tests/Aspirate.Tests/ActionsTests/Manifests/GenerateAspireManifestActionTests.cs @@ -1,3 +1,8 @@ +using System; +using System.IO; +using System.Threading.Tasks; +using Xunit; + namespace Aspirate.Tests.ActionsTests.Manifests; public class GenerateAspireManifestActionTests : BaseActionTests diff --git a/tests/Aspirate.Tests/ActionsTests/Manifests/GenerateDockerComposeManifestActionTests.cs b/tests/Aspirate.Tests/ActionsTests/Manifests/GenerateDockerComposeManifestActionTests.cs index 0bda62b..8ddbc09 100644 --- a/tests/Aspirate.Tests/ActionsTests/Manifests/GenerateDockerComposeManifestActionTests.cs +++ b/tests/Aspirate.Tests/ActionsTests/Manifests/GenerateDockerComposeManifestActionTests.cs @@ -1,4 +1,6 @@ +using System.Threading.Tasks; using Aspirate.Shared.Enums; +using Xunit; namespace Aspirate.Tests.ActionsTests.Manifests; diff --git a/tests/Aspirate.Tests/ActionsTests/Manifests/GenerateKustomizeManifestsActionTests.cs b/tests/Aspirate.Tests/ActionsTests/Manifests/GenerateKustomizeManifestsActionTests.cs index 00fba46..3292887 100644 --- a/tests/Aspirate.Tests/ActionsTests/Manifests/GenerateKustomizeManifestsActionTests.cs +++ b/tests/Aspirate.Tests/ActionsTests/Manifests/GenerateKustomizeManifestsActionTests.cs @@ -1,4 +1,6 @@ +using System.Threading.Tasks; using Aspirate.Shared.Enums; +using Xunit; namespace Aspirate.Tests.ActionsTests.Manifests; diff --git a/tests/Aspirate.Tests/ActionsTests/Manifests/LoadAspireManifestActionTests.cs b/tests/Aspirate.Tests/ActionsTests/Manifests/LoadAspireManifestActionTests.cs index acc69df..9a923b8 100644 --- a/tests/Aspirate.Tests/ActionsTests/Manifests/LoadAspireManifestActionTests.cs +++ b/tests/Aspirate.Tests/ActionsTests/Manifests/LoadAspireManifestActionTests.cs @@ -1,3 +1,8 @@ +using System; +using System.IO; +using System.Threading.Tasks; +using Xunit; + namespace Aspirate.Tests.ActionsTests.Manifests; public class LoadAspireManifestActionTests : BaseActionTests diff --git a/tests/Aspirate.Tests/ActionsTests/Manifests/RemoveManifestsToClusterActionTests.cs b/tests/Aspirate.Tests/ActionsTests/Manifests/RemoveManifestsToClusterActionTests.cs index d3caada..0bf1196 100644 --- a/tests/Aspirate.Tests/ActionsTests/Manifests/RemoveManifestsToClusterActionTests.cs +++ b/tests/Aspirate.Tests/ActionsTests/Manifests/RemoveManifestsToClusterActionTests.cs @@ -1,3 +1,7 @@ +using System; +using System.Threading.Tasks; +using Xunit; + namespace Aspirate.Tests.ActionsTests.Manifests; public class RemoveManifestsToClusterActionTests : BaseActionTests diff --git a/tests/Aspirate.Tests/ActionsTests/Secrets/PopulateInputsActionTests.cs b/tests/Aspirate.Tests/ActionsTests/Secrets/PopulateInputsActionTests.cs index 88cfef2..85c8eaf 100644 --- a/tests/Aspirate.Tests/ActionsTests/Secrets/PopulateInputsActionTests.cs +++ b/tests/Aspirate.Tests/ActionsTests/Secrets/PopulateInputsActionTests.cs @@ -1,3 +1,7 @@ +using System; +using System.Threading.Tasks; +using Xunit; + namespace Aspirate.Tests.ActionsTests.Secrets; public class PopulateInputsActionTests : BaseActionTests diff --git a/tests/Aspirate.Tests/ActionsTests/Secrets/SaveSecretsActionTests.cs b/tests/Aspirate.Tests/ActionsTests/Secrets/SaveSecretsActionTests.cs index bf0692f..265865c 100644 --- a/tests/Aspirate.Tests/ActionsTests/Secrets/SaveSecretsActionTests.cs +++ b/tests/Aspirate.Tests/ActionsTests/Secrets/SaveSecretsActionTests.cs @@ -1,3 +1,7 @@ +using System; +using System.Threading.Tasks; +using Xunit; + namespace Aspirate.Tests.ActionsTests.Secrets; public class SaveSecretsActionTests : BaseActionTests diff --git a/tests/Aspirate.Tests/Aspirate.Tests.csproj b/tests/Aspirate.Tests/Aspirate.Tests.csproj index bc36ccb..8a66556 100644 --- a/tests/Aspirate.Tests/Aspirate.Tests.csproj +++ b/tests/Aspirate.Tests/Aspirate.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 false true diff --git a/tests/Aspirate.Tests/DockerComposeTests/DockerComposeBuilderTests.cs b/tests/Aspirate.Tests/DockerComposeTests/DockerComposeBuilderTests.cs index c5abc50..86fa473 100644 --- a/tests/Aspirate.Tests/DockerComposeTests/DockerComposeBuilderTests.cs +++ b/tests/Aspirate.Tests/DockerComposeTests/DockerComposeBuilderTests.cs @@ -1,3 +1,7 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Xunit; + namespace Aspirate.Tests.DockerComposeTests; public class DockerComposeBuilderTests diff --git a/tests/Aspirate.Tests/ExtensionTests/KubernetesDeploymentDataExtensionTests.cs b/tests/Aspirate.Tests/ExtensionTests/KubernetesDeploymentDataExtensionTests.cs index ec7dcce..9204a2d 100644 --- a/tests/Aspirate.Tests/ExtensionTests/KubernetesDeploymentDataExtensionTests.cs +++ b/tests/Aspirate.Tests/ExtensionTests/KubernetesDeploymentDataExtensionTests.cs @@ -1,4 +1,6 @@ -using System.Text; +using System.Collections.Generic; +using System.Linq; +using Xunit; namespace Aspirate.Tests.ExtensionTests; diff --git a/tests/Aspirate.Tests/ProcessorTests/ContainerProcessorTests.cs b/tests/Aspirate.Tests/ProcessorTests/ContainerProcessorTests.cs index 5d414a8..497a4f1 100644 --- a/tests/Aspirate.Tests/ProcessorTests/ContainerProcessorTests.cs +++ b/tests/Aspirate.Tests/ProcessorTests/ContainerProcessorTests.cs @@ -1,3 +1,6 @@ +using System.Collections.Generic; +using Xunit; + namespace Aspirate.Tests.ProcessorTests; public class ContainerProcessorTests diff --git a/tests/Aspirate.Tests/SecretTests/SecretProviderTests.cs b/tests/Aspirate.Tests/SecretTests/SecretProviderTests.cs index cdf9657..c8dff57 100644 --- a/tests/Aspirate.Tests/SecretTests/SecretProviderTests.cs +++ b/tests/Aspirate.Tests/SecretTests/SecretProviderTests.cs @@ -1,3 +1,6 @@ +using System.Collections.Generic; +using Xunit; + namespace Aspirate.Tests.SecretTests; public class SecretProviderTests diff --git a/tests/Aspirate.Tests/ServiceTests/AspirateConfigurationServiceTest.cs b/tests/Aspirate.Tests/ServiceTests/AspirateConfigurationServiceTest.cs index 7ca2f55..59207be 100644 --- a/tests/Aspirate.Tests/ServiceTests/AspirateConfigurationServiceTest.cs +++ b/tests/Aspirate.Tests/ServiceTests/AspirateConfigurationServiceTest.cs @@ -1,3 +1,6 @@ +using System.Threading.Tasks; +using Xunit; + namespace Aspirate.Tests.ServiceTests; public class AspirateConfigurationServiceTest diff --git a/tests/Aspirate.Tests/ServiceTests/BaseServiceTests.cs b/tests/Aspirate.Tests/ServiceTests/BaseServiceTests.cs index 69678c2..d84e414 100644 --- a/tests/Aspirate.Tests/ServiceTests/BaseServiceTests.cs +++ b/tests/Aspirate.Tests/ServiceTests/BaseServiceTests.cs @@ -1,3 +1,5 @@ +using System; + namespace Aspirate.Tests.ServiceTests; public abstract class BaseServiceTests : AspirateTestBase diff --git a/tests/Aspirate.Tests/ServiceTests/ContainerCompositionServiceTest.cs b/tests/Aspirate.Tests/ServiceTests/ContainerCompositionServiceTest.cs index 4e81859..c1204d5 100644 --- a/tests/Aspirate.Tests/ServiceTests/ContainerCompositionServiceTest.cs +++ b/tests/Aspirate.Tests/ServiceTests/ContainerCompositionServiceTest.cs @@ -1,3 +1,9 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Xunit; + namespace Aspirate.Tests.ServiceTests; public class ContainerCompositionServiceTest diff --git a/tests/Aspirate.Tests/ServiceTests/ContainerDetailsServiceTests.cs b/tests/Aspirate.Tests/ServiceTests/ContainerDetailsServiceTests.cs index 595b75f..7fd3040 100644 --- a/tests/Aspirate.Tests/ServiceTests/ContainerDetailsServiceTests.cs +++ b/tests/Aspirate.Tests/ServiceTests/ContainerDetailsServiceTests.cs @@ -1,3 +1,8 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using VerifyTests; +using Xunit; + namespace Aspirate.Tests.ServiceTests; public class ContainerDetailsServiceTests diff --git a/tests/Aspirate.Tests/ServiceTests/ContainerOptionsTests.cs b/tests/Aspirate.Tests/ServiceTests/ContainerOptionsTests.cs index 26fc661..da077ac 100644 --- a/tests/Aspirate.Tests/ServiceTests/ContainerOptionsTests.cs +++ b/tests/Aspirate.Tests/ServiceTests/ContainerOptionsTests.cs @@ -1,3 +1,8 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using VerifyTests; +using Xunit; + namespace Aspirate.Tests.ServiceTests; public class ContainerOptionsTests diff --git a/tests/Aspirate.Tests/ServiceTests/KubeCtlServiceTests.cs b/tests/Aspirate.Tests/ServiceTests/KubeCtlServiceTests.cs index f1b1828..e1a8dbe 100644 --- a/tests/Aspirate.Tests/ServiceTests/KubeCtlServiceTests.cs +++ b/tests/Aspirate.Tests/ServiceTests/KubeCtlServiceTests.cs @@ -1,3 +1,6 @@ +using System.Threading.Tasks; +using Xunit; + namespace Aspirate.Tests.ServiceTests; public class KubeCtlServiceTests diff --git a/tests/Aspirate.Tests/ServiceTests/ManifestFileParserServiceTests.cs b/tests/Aspirate.Tests/ServiceTests/ManifestFileParserServiceTests.cs index 86b4fb3..178830c 100644 --- a/tests/Aspirate.Tests/ServiceTests/ManifestFileParserServiceTests.cs +++ b/tests/Aspirate.Tests/ServiceTests/ManifestFileParserServiceTests.cs @@ -1,4 +1,10 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; using Aspirate.Cli; +using Xunit; namespace Aspirate.Tests.ServiceTests; diff --git a/tests/Aspirate.Tests/ServiceTests/ProjectPropertyServiceTests.cs b/tests/Aspirate.Tests/ServiceTests/ProjectPropertyServiceTests.cs index c7ab21a..f96611b 100644 --- a/tests/Aspirate.Tests/ServiceTests/ProjectPropertyServiceTests.cs +++ b/tests/Aspirate.Tests/ServiceTests/ProjectPropertyServiceTests.cs @@ -1,3 +1,6 @@ +using System.Threading.Tasks; +using Xunit; + namespace Aspirate.Tests.ServiceTests; public class ProjectPropertyServiceTest diff --git a/tests/Aspirate.Tests/ServiceTests/SecretServiceTests.cs b/tests/Aspirate.Tests/ServiceTests/SecretServiceTests.cs index 4b65862..67bd761 100644 --- a/tests/Aspirate.Tests/ServiceTests/SecretServiceTests.cs +++ b/tests/Aspirate.Tests/ServiceTests/SecretServiceTests.cs @@ -1,3 +1,5 @@ +using Xunit; + namespace Aspirate.Tests.ServiceTests; public class SecretServiceTests : BaseServiceTests diff --git a/tests/Aspirate.Tests/TestData/TestApp.csproj b/tests/Aspirate.Tests/TestData/TestApp.csproj index 2150e37..fd4bd08 100644 --- a/tests/Aspirate.Tests/TestData/TestApp.csproj +++ b/tests/Aspirate.Tests/TestData/TestApp.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable enable From 3d225de7b74233179d5643562ed2b348fc693c22 Mon Sep 17 00:00:00 2001 From: Vincent Boots Date: Wed, 29 Jan 2025 22:20:20 +0100 Subject: [PATCH 02/23] fix: static handling of regex --- .../Transformation/Json/JsonExpressionProcessor.cs | 5 +++-- src/Aspirate.Services/Implementations/KubeCtlService.cs | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Aspirate.Processors/Transformation/Json/JsonExpressionProcessor.cs b/src/Aspirate.Processors/Transformation/Json/JsonExpressionProcessor.cs index 2ca648f..2d95a53 100644 --- a/src/Aspirate.Processors/Transformation/Json/JsonExpressionProcessor.cs +++ b/src/Aspirate.Processors/Transformation/Json/JsonExpressionProcessor.cs @@ -51,6 +51,7 @@ private void ResolveJsonExpressionsRecursive(JsonNode? jsonNode, JsonNode rootNo } } + private void HandleJsonObject(JsonNode rootNode, JsonObject jsonObject) { var keys = new List(((IDictionary)jsonObject).Keys); @@ -80,6 +81,7 @@ private void HandleJsonArray(JsonNode rootNode, JsonArray jsonArray) private void HandleJsonValue(JsonNode rootNode, JsonNode jsonValue) => ReplaceWithResolvedExpression(rootNode, jsonValue); + private static readonly Regex PlaceholderPatternRegex = new(@"{([\w.-]+)}", RegexOptions.Compiled); private void ReplaceWithResolvedExpression(JsonNode rootNode, JsonNode jsonValue) { var input = jsonValue.ToString(); @@ -95,8 +97,7 @@ private void ReplaceWithResolvedExpression(JsonNode rootNode, JsonNode jsonValue return; } - var regex = new Regex(@"\{([\w\.-]+)\}"); - var matches = regex.Matches(input); + var matches = PlaceholderPatternRegex.Matches(input); for (var i = 0; i < matches.Count; i++) { var match = matches[i]; diff --git a/src/Aspirate.Services/Implementations/KubeCtlService.cs b/src/Aspirate.Services/Implementations/KubeCtlService.cs index 82ac055..57db34c 100644 --- a/src/Aspirate.Services/Implementations/KubeCtlService.cs +++ b/src/Aspirate.Services/Implementations/KubeCtlService.cs @@ -2,6 +2,8 @@ namespace Aspirate.Services.Implementations; public partial class KubeCtlService(IFileSystem filesystem, IAnsiConsole console, IShellExecutionService shellExecutionService) : IKubeCtlService { + + private static readonly Regex NamespaceMatcher = new("name: (.*)", RegexOptions.Compiled); public async Task SelectKubernetesContextForDeployment() { var contexts = await GatherContexts(); @@ -173,12 +175,12 @@ private async Task ParseNamespace(string fullOutputPath) } var namespaceContent = await filesystem.File.ReadAllTextAsync(namespaceFile); - var regex = new Regex("name: (.*)"); - var namespaceMatch = regex.Match(namespaceContent); + var namespaceMatch = NamespaceMatcher.Match(namespaceContent); return namespaceMatch.Success ? namespaceMatch.Groups[1].Value : KubeCtlLiterals.KubeCtlDefaultNamespace; } + private static List ParseResponseAsContextList(string jsonString) { try From 203c6ab58f8d606ec5a010ad00bd23596936d1e5 Mon Sep 17 00:00:00 2001 From: Vincent Boots Date: Sat, 1 Feb 2025 19:13:54 +0100 Subject: [PATCH 03/23] update: minor version updates. --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 346ba73..90e587f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,9 +7,9 @@ - + - + all From 59b215a5eabefc647e0341c261c71335375a1667 Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 11:36:24 +0100 Subject: [PATCH 04/23] Update pull-requests.yaml --- .github/workflows/pull-requests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests.yaml b/.github/workflows/pull-requests.yaml index 0fd00e5..61c0c19 100644 --- a/.github/workflows/pull-requests.yaml +++ b/.github/workflows/pull-requests.yaml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.x' + dotnet-version: '9.0.x' - name: Build and Test run: | From 2d73f4d6a356c1cbc04ab37b8ac777b6532c0731 Mon Sep 17 00:00:00 2001 From: Vincent Boots Date: Sun, 2 Feb 2025 11:49:48 +0100 Subject: [PATCH 05/23] update project files --- docs/Writerside/topics/Getting-Started.md | 2 +- .../topics/Installing-as-a-Global-Tool.md | 4 ++-- src/Aspirate.Cli/Aspirate.Cli.csproj | 13 ++++++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/docs/Writerside/topics/Getting-Started.md b/docs/Writerside/topics/Getting-Started.md index 309d63d..38ef1dc 100644 --- a/docs/Writerside/topics/Getting-Started.md +++ b/docs/Writerside/topics/Getting-Started.md @@ -7,4 +7,4 @@ Generate deployment yaml for a .NET Aspire AppHost project. - Aspirate - David Sekula / Prom3theu5 - Automatic kustomize manifest generation for applications powered by the Microsoft .Net Aspire Cloud framework. - https://github.com/prom3theu5/aspirational-manifests + Vincent Boots + Automatic kustomize manifest generation for applications powered by the Microsoft .Net Aspire Cloud framework. +fork from: https://github.com/prom3theu5/aspirational-manifests + https://github.com/vdboots/aspirational-manifests MIT - https://github.com/prom3theu5/aspirational-manifests.git + https://github.com/vdboots/aspirational-manifests.git Git aspire;kubernetes;aspirate;kustomize;manifests Initial Release From 411d5d23a0d49b8b5c82d9d9dd49e39914c0aa9f Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 12:02:53 +0100 Subject: [PATCH 06/23] Update docs.yaml --- .github/workflows/docs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 221b87e..805812e 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -28,7 +28,7 @@ jobs: location: ${{ env.DOCS_FOLDER }} - name: Upload documentation - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: docs path: | @@ -77,4 +77,4 @@ jobs: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 \ No newline at end of file + uses: actions/deploy-pages@v1 From 99062568c16fea3c074e040aa3be239266b96600 Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 12:04:56 +0100 Subject: [PATCH 07/23] Update docs.yaml fix: depriection version in flow --- .github/workflows/docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 805812e..d4c1168 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -42,7 +42,7 @@ jobs: steps: - name: Download artifacts - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v2 with: name: docs path: artifacts From 072eb3163a2328baaecdb3d8174f3f4ec00e5bd0 Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 12:09:31 +0100 Subject: [PATCH 08/23] Update docs.yaml From 797548f93d53fbde4423fc71c1e556ad4b7d83c5 Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 12:11:51 +0100 Subject: [PATCH 09/23] Update docs.yaml fix: to version4 --- .github/workflows/docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index d4c1168..ede8b24 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -42,7 +42,7 @@ jobs: steps: - name: Download artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: docs path: artifacts From ab056fa349f5e1b5febf40bff9ef2ca79c7a9171 Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 12:19:39 +0100 Subject: [PATCH 10/23] Update docs.yaml --- .github/workflows/docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index ede8b24..9f509cf 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -60,7 +60,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: docs From 74516c66e445d15c810ea23a8acddfc97cee16ea Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 12:30:51 +0100 Subject: [PATCH 11/23] Update docs.yaml --- .github/workflows/docs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 9f509cf..5755dcb 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -68,10 +68,10 @@ jobs: run: unzip -O UTF-8 -qq ${{ env.ARTIFACT }} -d dir - name: Setup Pages - uses: actions/configure-pages@v2 + uses: actions/configure-pages@v3 - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 with: path: dir From 78384b1e63522fae8d29101079dd6ac4d6db1485 Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 14:22:42 +0100 Subject: [PATCH 12/23] Update docs.yaml --- .github/workflows/docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 5755dcb..4831a3a 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -77,4 +77,4 @@ jobs: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 + uses: actions/deploy-pages@v4 From 4b9415cae5cc56b56f96892fe71830959e604c5a Mon Sep 17 00:00:00 2001 From: Vincent Boots Date: Sun, 2 Feb 2025 18:03:20 +0100 Subject: [PATCH 13/23] fix: readme --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ebba8ae..fb0ded7 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,13 @@ ![nuget-icon](https://github.com/prom3theu5/aspirational-manifests/assets/1518610/5f4402e9-6f2c-4ca4-b457-206fb8233155) # Aspirate (Aspir8) +## note: this project is forked from prom3theu5 and if maintainer continues to maintain the project, this fork will be deleted. + ### Handle deployment yaml generation for a .NET Aspire AppHost - + -Documentation: https://prom3theu5.github.io/aspirational-manifests/ +Documentation: https://vdboots.github.io/aspirational-manifests/ # Table of Contents 1. [Installation as a global tool](#to-install-as-a-global-tool) @@ -174,7 +176,7 @@ Aspirate can be used in a devcontainer by installing the feature: ```json features": { - "ghcr.io/prom3theu5/aspirational-manifests/aspirate:latest": {} + "ghcr.io/vdboots/aspirational-manifests/aspirate:latest": {} } ``` From 722fb5dd68faaf82d48834c5ccce0a9a76743d91 Mon Sep 17 00:00:00 2001 From: Vincent Boots Date: Sun, 2 Feb 2025 18:53:17 +0100 Subject: [PATCH 14/23] fix: fix installation to new version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb0ded7..484f627 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Documentation: https://vdboots.github.io/aspirational-manifests/ ## To Install as a global tool ```bash -dotnet tool install -g aspirate +dotnet tool install -g aspirate.vnext --prerelease ``` > NOTE: Add the `--prelease` option, to install the latest preview version. From 61d8ddbc9472b8765a85efe89e05b6058214da17 Mon Sep 17 00:00:00 2001 From: Vincent Boots Date: Sun, 2 Feb 2025 18:57:29 +0100 Subject: [PATCH 15/23] fix: some document reviews --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 484f627..6c93bde 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,7 @@ When using this flag, all configuration arguments must be passed on the command Aspirate can be uninstalled as a global tool by running: ```bash -dotnet tool uninstall -g aspirate +dotnet tool uninstall -g aspirate.vnext ``` ## Configuring the Windows Terminal For Unicode and Emoji Support @@ -180,4 +180,4 @@ features": { } ``` -An Example of a devcontainer can be found on the documentation page: [Here](https://prom3theu5.github.io/aspirational-manifests/installation-as-a-devcontainer-feature.html#example-dev-container-configuration) +An Example of a devcontainer can be found on the documentation page: [Here](https://vdboots.github.io/aspirational-manifests/installation-as-a-devcontainer-feature.html#example-dev-container-configuration) From 2cdb555ce7ce2fc1321d09a9959c6fdeb88c837b Mon Sep 17 00:00:00 2001 From: Vincent Boots Date: Sun, 2 Feb 2025 19:06:06 +0100 Subject: [PATCH 16/23] fix: change version check --- src/Aspirate.Services/Implementations/VersionCheckService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Aspirate.Services/Implementations/VersionCheckService.cs b/src/Aspirate.Services/Implementations/VersionCheckService.cs index 0ecf96f..3a7d316 100644 --- a/src/Aspirate.Services/Implementations/VersionCheckService.cs +++ b/src/Aspirate.Services/Implementations/VersionCheckService.cs @@ -122,7 +122,7 @@ private async Task PerformUpdateCheck(string lastVersionCheckedFilePath) var resource = await repository.GetResourceAsync(); var metadata = await resource.GetMetadataAsync( - "aspirate", + "aspirate.vnext", includePrerelease: true, includeUnlisted: false, new SourceCacheContext(), From b9cbd509cfcace9c402d132b333204d03a22a376 Mon Sep 17 00:00:00 2001 From: Vincent Boots Date: Sun, 2 Feb 2025 19:56:55 +0100 Subject: [PATCH 17/23] fix: issue where application crashes if application cannot access nuget --- .../Implementations/VersionCheckService.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Aspirate.Services/Implementations/VersionCheckService.cs b/src/Aspirate.Services/Implementations/VersionCheckService.cs index 3a7d316..110b4b4 100644 --- a/src/Aspirate.Services/Implementations/VersionCheckService.cs +++ b/src/Aspirate.Services/Implementations/VersionCheckService.cs @@ -144,12 +144,16 @@ private async Task PerformUpdateCheck(string lastVersionCheckedFilePath) logger.MarkupLine($"[bold][yellow]A new version of Aspirate is available: [blue]{latestVersion}[/].[/][/]"); logger.MarkupLine($"[bold][yellow]You are currently using: [blue]{currentVersion}[/].[/][/]"); logger.MarkupLine( - $"[italic][yellow]You can update with: [blue]dotnet tool install -g aspirate --prerelease[/].[/][/]"); + $"[italic][yellow]You can update with: [blue]dotnet tool install -g aspirate.vnext --prerelease[/].[/][/]"); } } + catch (HttpRequestException) + { + logger.MarkupLine($"[red]Network error: Unable to reach api.nuget.org. Please check your internet connection. Continuing without connection [/]"); + } catch (Exception e) { - logger.ValidationFailed(e.Message); + logger.ValidationFailed(e.Message); } } From 05693b30518c4ed56633f4499f7e9ff98a5bd078 Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 20:02:37 +0100 Subject: [PATCH 18/23] Update main.yaml --- .github/workflows/main.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index ca47c7f..63dc2cb 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -9,6 +9,7 @@ env: CAKE_SETTINGS_SKIPVERIFICATION: true on: + workflow_dispatch: push: tags: - "*" @@ -33,4 +34,4 @@ jobs: - name: Push to nuget working-directory: artifacts/ - run: dotnet nuget push *.nupkg -s $NUGET_SERVER -k $NUGET_API_KEY \ No newline at end of file + run: dotnet nuget push *.nupkg -s $NUGET_SERVER -k $NUGET_API_KEY From 1bc03a142ecca5aeed3a364d0a0ff230c122f154 Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 21:50:39 +0100 Subject: [PATCH 19/23] Update install.sh --- ext/devcontainer/src/aspirate/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/devcontainer/src/aspirate/install.sh b/ext/devcontainer/src/aspirate/install.sh index 1cc47e7..44a6617 100755 --- a/ext/devcontainer/src/aspirate/install.sh +++ b/ext/devcontainer/src/aspirate/install.sh @@ -2,4 +2,4 @@ echo "(*) Installing Aspir8" -dotnet tool update aspirate --prerelease --tool-path /usr/local/bin \ No newline at end of file +dotnet tool update aspirate.vnext --prerelease --tool-path /usr/local/bin From cb30c6e9652abfdb4ea0c327957ecdfba044150a Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 21:51:14 +0100 Subject: [PATCH 20/23] Update devcontainer-feature.json --- ext/devcontainer/src/aspirate/devcontainer-feature.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/devcontainer/src/aspirate/devcontainer-feature.json b/ext/devcontainer/src/aspirate/devcontainer-feature.json index da38117..afd49ac 100644 --- a/ext/devcontainer/src/aspirate/devcontainer-feature.json +++ b/ext/devcontainer/src/aspirate/devcontainer-feature.json @@ -1,8 +1,8 @@ { - "id": "aspirate", + "id": "aspirate.vnext", "version": "0.1.0", "name": "Aspir8 Aspirate to Kubernetes", - "documentationURL": "https://prom3theu5.github.io/aspirational-manifests/", + "documentationURL": "https://vdboots.github.io/aspirational-manifests/", "description": "Installs Aspir8.", "installsAfter": [ "ghcr.io/devcontainers/features/dotnet" From df9a874b26666b9560d5f44890dcb5d2eacf7301 Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 21:51:32 +0100 Subject: [PATCH 21/23] Update README.md --- ext/devcontainer/src/aspirate/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/devcontainer/src/aspirate/README.md b/ext/devcontainer/src/aspirate/README.md index de464a8..ade51cf 100644 --- a/ext/devcontainer/src/aspirate/README.md +++ b/ext/devcontainer/src/aspirate/README.md @@ -11,7 +11,7 @@ Installs [Aspir8](https://github.com/prom3theu5/aspirational-manifests) ```json "features": { "ghcr.io/devcontainers/features/dotnet:2": {} - "ghcr.io/prom3theu5/aspirational-manifests/aspirate:latest": {} + "ghcr.io/vdboots/aspirational-manifests/aspirate:latest": {} } ``` @@ -19,6 +19,6 @@ Installs [Aspir8](https://github.com/prom3theu5/aspirational-manifests) ```json "features": { - "ghcr.io/prom3theu5/aspirational-manifests/aspirate:latest": {} + "ghcr.io/vdboots/aspirational-manifests/aspirate:latest": {} } -``` \ No newline at end of file +``` From 9329f6a71727297570b796bbb2426f150874222e Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 23:01:29 +0100 Subject: [PATCH 22/23] Update devcontainer-feature.json --- ext/devcontainer/src/aspirate/devcontainer-feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/devcontainer/src/aspirate/devcontainer-feature.json b/ext/devcontainer/src/aspirate/devcontainer-feature.json index afd49ac..284c54e 100644 --- a/ext/devcontainer/src/aspirate/devcontainer-feature.json +++ b/ext/devcontainer/src/aspirate/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "aspirate.vnext", - "version": "0.1.0", + "version": "9.0.1", "name": "Aspir8 Aspirate to Kubernetes", "documentationURL": "https://vdboots.github.io/aspirational-manifests/", "description": "Installs Aspir8.", From a6a4817e6b0e9e8c60895c72b7bf6a89a3b61eea Mon Sep 17 00:00:00 2001 From: Vincent Boots <9152628+vdboots@users.noreply.github.com> Date: Sun, 2 Feb 2025 23:05:03 +0100 Subject: [PATCH 23/23] Update devcontainer-feature.json --- ext/devcontainer/src/aspirate/devcontainer-feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/devcontainer/src/aspirate/devcontainer-feature.json b/ext/devcontainer/src/aspirate/devcontainer-feature.json index 284c54e..a8336f4 100644 --- a/ext/devcontainer/src/aspirate/devcontainer-feature.json +++ b/ext/devcontainer/src/aspirate/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "aspirate.vnext", - "version": "9.0.1", + "version": "9.0.1-preview", "name": "Aspir8 Aspirate to Kubernetes", "documentationURL": "https://vdboots.github.io/aspirational-manifests/", "description": "Installs Aspir8.",