Merge pull request #398 from serverlessworkflow/fix-workflow-completed-event-output

cdavernas · web-flow · commit b860edb71d71 · 2024-09-10T17:19:00.000+02:00
Fix `WorkflowCompletedEventV1` by adding a new `output` property
diff --git a/src/api/Synapse.Api.Application/Commands/Resources/CreateResourceCommand.cs b/src/api/Synapse.Api.Application/Commands/Resources/CreateResourceCommand.cs
@@ -79,7 +79,7 @@ public class CreateResourceCommandHandler(IResourceRepository repository)
     /// <inheritdoc/>
     public virtual async Task<IOperationResult<IResource>> HandleAsync(CreateResourceCommand command, CancellationToken cancellationToken)
     {
-        if (command.Resource.GetName().Trim().EndsWith('-')) command.Resource.Metadata.Name = $"{command.Resource.GetName().Trim()}{Guid.NewGuid().ToString("N")[..15]}";
+        if (command.Resource.GetName().Trim().EndsWith('-')) command.Resource.Metadata.Name = $"{command.Resource.GetName().Trim()}{Guid.NewGuid().ToString("N")[..12]}";
         var resource = await repository.AddAsync(command.Resource, command.Group, command.Version, command.Plural, command.DryRun, cancellationToken);
         return new OperationResult<IResource>((int)HttpStatusCode.Created, resource);
     }
diff --git a/src/api/Synapse.Api.Application/Commands/Resources/Generic/CreateResourceCommand.cs b/src/api/Synapse.Api.Application/Commands/Resources/Generic/CreateResourceCommand.cs
@@ -46,7 +46,7 @@ public class CreateResourceCommandHandler<TResource>(IResourceRepository reposit
     /// <inheritdoc/>
     public virtual async Task<IOperationResult<TResource>> HandleAsync(CreateResourceCommand<TResource> command, CancellationToken cancellationToken)
     {
-        if (command.Resource.GetName().Trim().EndsWith('-')) command.Resource.Metadata.Name = $"{command.Resource.GetName().Trim()}{Guid.NewGuid().ToString("N")[..15]}";
+        if (command.Resource.GetName().Trim().EndsWith('-')) command.Resource.Metadata.Name = $"{command.Resource.GetName().Trim()}{Guid.NewGuid().ToString("N")[..12]}";
         var resource = await repository.AddAsync(command.Resource, false, cancellationToken).ConfigureAwait(false);
         return new OperationResult<TResource>((int)HttpStatusCode.Created, resource);
     }
diff --git a/src/core/Synapse.Core.Infrastructure.Containers.Docker/DockerContainerPlatform.cs b/src/core/Synapse.Core.Infrastructure.Containers.Docker/DockerContainerPlatform.cs
@@ -93,6 +93,7 @@ public virtual async Task<IContainer> CreateAsync(ContainerProcessDefinition def
         }
         var parameters = new CreateContainerParameters()
         {
+            Name = $"{System.Environment.GetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Runner.Name)}-{definition.Image}-{Guid.NewGuid().ToString("N")[..6].ToLowerInvariant()}",
             Image = definition.Image,
             Cmd = string.IsNullOrWhiteSpace(definition.Command) ? null : ["/bin/sh", "-c", definition.Command],
             Env = definition.Environment?.Select(e => $"{e.Key}={e.Value}").ToList(),
diff --git a/src/core/Synapse.Core.Infrastructure.Containers.Kubernetes/KubernetesContainer.cs b/src/core/Synapse.Core.Infrastructure.Containers.Kubernetes/KubernetesContainer.cs
@@ -107,10 +107,10 @@ protected virtual async Task WaitForReadyAsync(CancellationToken cancellationTok
     /// <inheritdoc/>
     public virtual async Task WaitForExitAsync(CancellationToken cancellationToken = default)
     {
-        var response = this.Kubernetes.CoreV1.ListNamespacedPodWithHttpMessagesAsync(this.Pod.Namespace(), fieldSelector: $"metadata.name={Pod.Name()}", cancellationToken: cancellationToken);
+        var response = this.Kubernetes.CoreV1.ListNamespacedPodWithHttpMessagesAsync(this.Pod.Namespace(), fieldSelector: $"metadata.name={Pod.Name()}", watch: true, cancellationToken: cancellationToken);
         await foreach (var (_, item) in response.WatchAsync<V1Pod, V1PodList>(cancellationToken: cancellationToken).ConfigureAwait(false))
         {
-            if (item.Status.Phase != "Succeeded" || item.Status.Phase != "Failed") continue;
+            if (item.Status.Phase != "Succeeded" && item.Status.Phase != "Failed") continue;
             var containerStatus = item.Status.ContainerStatuses.FirstOrDefault();
             this.ExitCode = containerStatus?.State.Terminated?.ExitCode ?? -1;
             break;
diff --git a/src/core/Synapse.Core.Infrastructure.Containers.Kubernetes/KubernetesContainerPlatform.cs b/src/core/Synapse.Core.Infrastructure.Containers.Kubernetes/KubernetesContainerPlatform.cs
@@ -77,17 +77,22 @@ public virtual Task<IContainer> CreateAsync(ContainerProcessDefinition definitio
         if (this.Kubernetes == null) throw new NullReferenceException("The KubernetesContainerPlatform has not been properly initialized");
         var pod = new V1Pod()
         {
+            Metadata = new()
+            {
+                NamespaceProperty = $"{System.Environment.GetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Runner.Namespace)}",
+                Name = $"{System.Environment.GetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Runner.Name)}-{definition.Image}-{Guid.NewGuid().ToString("N")[..6].ToLowerInvariant()}"
+            },
             Spec = new()
             {
+                RestartPolicy = "Never",
                 Containers = 
                 [
-                    new()
+                    new(definition.Image)
                     {
                         Image = definition.Image,
                         ImagePullPolicy = this.Options.ImagePullPolicy,
                         Command = string.IsNullOrWhiteSpace(definition.Command) ? null : ["/bin/sh", "-c", definition.Command],
-                        Env = definition.Environment?.Select(e => new V1EnvVar(e.Key, e.Value)).ToList(),
-                        RestartPolicy = "Never"
+                        Env = definition.Environment?.Select(e => new V1EnvVar(e.Key, e.Value)).ToList()
                     }
                 ]
             }
diff --git a/src/core/Synapse.Core/Events/Workflows/WorkflowCompletedEventV1.cs b/src/core/Synapse.Core/Events/Workflows/WorkflowCompletedEventV1.cs
@@ -32,4 +32,10 @@ public record WorkflowCompletedEventV1
     [DataMember(Name = "completedAt", Order = 2), JsonPropertyName("completedAt"), JsonPropertyOrder(2), YamlMember(Alias = "completedAt", Order = 2)]
     public DateTimeOffset CompletedAt { get; set; } = DateTimeOffset.Now;
 
+    /// <summary>
+    /// Gets/sets the workflow instance's output
+    /// </summary>
+    [DataMember(Name = "output", Order = 3), JsonPropertyName("output"), JsonPropertyOrder(3), YamlMember(Alias = "output", Order = 3)]
+    public object? Output { get; set; }
+
 }
diff --git a/src/core/Synapse.Core/Resources/Document.cs b/src/core/Synapse.Core/Resources/Document.cs
@@ -23,7 +23,7 @@ public record Document
 
     /// <inheritdoc/>
     [DataMember(Name = "id", Order = 1), JsonPropertyName("id"), JsonPropertyOrder(1), YamlMember(Alias = "id", Order = 1)]
-    public string Id { get; set; } = Guid.NewGuid().ToString("N")[..15];
+    public string Id { get; set; } = Guid.NewGuid().ToString("N")[..12];
 
     /// <summary>
     /// Gets/sets the document's name
diff --git a/src/core/Synapse.Core/Resources/NativeRuntimeConfiguration.cs b/src/core/Synapse.Core/Resources/NativeRuntimeConfiguration.cs
@@ -28,6 +28,10 @@ public record NativeRuntimeConfiguration
     /// Gets the default path to the runner executable file
     /// </summary>
     public const string DefaultExecutable = "Synapse.Runner";
+    /// <summary>
+    /// Gets the default path to the directory that contains the secrets made available to runners
+    /// </summary>
+    public static readonly string DefaultSecretsDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".synapse", "secrets");
 
     /// <summary>
     /// Initializes a new <see cref="NativeRuntimeConfiguration"/>
@@ -47,6 +51,8 @@ public NativeRuntimeConfiguration()
             if (!File.Exists(filePath)) throw new FileNotFoundException("The runner executable file does not exist or cannot be found", filePath);
             this.Executable = env;
         }
+        env = Environment.GetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Runtime.Native.SecretsDirectory);
+        if (!string.IsNullOrWhiteSpace(env)) this.SecretsDirectory = env;
     }
 
     /// <summary>
@@ -61,5 +67,10 @@ public NativeRuntimeConfiguration()
     [DataMember(Order = 2, Name = "executable"), JsonPropertyOrder(2), JsonPropertyName("executable"), YamlMember(Order = 2, Alias = "executable")]
     public virtual string Executable { get; set; } = DefaultExecutable;
 
+    /// <summary>
+    /// Gets/sets the path to the directory that contains the secrets made available to runners
+    /// </summary>
+    [DataMember(Order = 3, Name = "secretsDirectory"), JsonPropertyOrder(3), JsonPropertyName("secretsDirectory"), YamlMember(Order = 3, Alias = "secretsDirectory")]
+    public virtual string SecretsDirectory { get; set; } = DefaultSecretsDirectory;
 
 }
diff --git a/src/core/Synapse.Core/Resources/TaskInstance.cs b/src/core/Synapse.Core/Resources/TaskInstance.cs
@@ -24,7 +24,7 @@ public record TaskInstance
     /// Gets the task's id
     /// </summary>
     [DataMember(Name = "id", Order = 1), JsonPropertyName("id"), JsonPropertyOrder(1), YamlMember(Alias = "id", Order = 1)]
-    public virtual string Id { get; set; } = Guid.NewGuid().ToString("N")[..15];
+    public virtual string Id { get; set; } = Guid.NewGuid().ToString("N")[..12];
 
     /// <summary>
     /// Gets the task's name, if any
diff --git a/src/core/Synapse.Core/Synapse.Core.csproj b/src/core/Synapse.Core/Synapse.Core.csproj
@@ -15,6 +15,7 @@
 	<Copyright>Copyright © 2024-Present The Synapse Authors. All Rights Reserved.</Copyright>
 	<RepositoryUrl>https://github.com/serverlessworkflow/synapse</RepositoryUrl>
 	<RepositoryType>git</RepositoryType>
+	<PackageId>Synapse</PackageId>
 	<PackageProjectUrl>https://github.com/serverlessworkflow/synapse</PackageProjectUrl>
 	<PackageTags>synapse core</PackageTags>
 	<IsPackable>true</IsPackable>
diff --git a/src/core/Synapse.Core/SynapseDefaults.cs b/src/core/Synapse.Core/SynapseDefaults.cs
@@ -562,6 +562,14 @@ public static class Runner
             /// Gets the environment variable used to configure whether or not runners should publish lifecycle events
             /// </summary>
             public const string LifecycleEvents = Prefix + "LIFECYCLE_EVENTS";
+            /// <summary>
+            /// Gets the environment variable used to configure the runner's namespace
+            /// </summary>
+            public const string Namespace = Prefix + "NAMESPACE";
+            /// <summary>
+            /// Gets the environment variable used to configure the runner's name
+            /// </summary>
+            public const string Name = Prefix + "NAME";
 
         }
 
@@ -740,6 +748,10 @@ public static class Native
                 /// Gets the environment variable used to configure the path to the runner's executable file
                 /// </summary>
                 public const string Executable = Prefix + "EXECUTABLE";
+                /// <summary>
+                /// Gets the environment variable used to configure the directory that contains the secrets made available to runners
+                /// </summary>
+                public const string SecretsDirectory = Prefix + "SECRETS_DIRECTORY";
 
             }
 
diff --git a/src/correlator/Synapse.Correlator/Services/CorrelationHandler.cs b/src/correlator/Synapse.Correlator/Services/CorrelationHandler.cs
@@ -121,7 +121,7 @@ protected virtual async Task CorrelateEventAsync(CloudEvent e, CancellationToken
                         this.Logger.LogInformation("Creating a new correlation context...");
                         context = new CorrelationContext()
                         {
-                            Id = Guid.NewGuid().ToString("N")[..15],
+                            Id = Guid.NewGuid().ToString("N")[..12],
                             Events = [new(filter.Key, e)],
                             Keys = CorrelationKeys == null ? new() : new(CorrelationKeys)
                         };
@@ -150,7 +150,7 @@ protected virtual async Task CorrelateEventAsync(CloudEvent e, CancellationToken
                         this.Logger.LogInformation("Creating a new correlation context...");
                         context = new CorrelationContext()
                         {
-                            Id = Guid.NewGuid().ToString("N")[..15],
+                            Id = Guid.NewGuid().ToString("N")[..12],
                             Events = [new(filter.Key, e)],
                             Keys = CorrelationKeys == null ? new() : new(CorrelationKeys)
                         };
diff --git a/src/runner/Synapse.Runner/Services/Executors/ContainerProcessExecutor.cs b/src/runner/Synapse.Runner/Services/Executors/ContainerProcessExecutor.cs
@@ -24,7 +24,9 @@ namespace Synapse.Runner.Services.Executors;
 /// <param name="context">The current <see cref="ITaskExecutionContext"/></param>
 /// <param name="schemaHandlerProvider">The service used to provide <see cref="ISchemaHandler"/> implementations</param>
 /// <param name="serializer">The service used to serialize/deserialize objects to/from JSON</param>
-public class ContainerProcessExecutor(IServiceProvider serviceProvider, ILogger<ContainerProcessExecutor> logger, ITaskExecutionContextFactory executionContextFactory, ITaskExecutorFactory executorFactory, IContainerPlatform containers, ITaskExecutionContext<RunTaskDefinition> context, ISchemaHandlerProvider schemaHandlerProvider, IJsonSerializer serializer)
+/// <param name="options">The service used to access the current <see cref="RunnerOptions"/></param>
+public class ContainerProcessExecutor(IServiceProvider serviceProvider, ILogger<ContainerProcessExecutor> logger, ITaskExecutionContextFactory executionContextFactory, ITaskExecutorFactory executorFactory, 
+    IContainerPlatform containers, ITaskExecutionContext<RunTaskDefinition> context, ISchemaHandlerProvider schemaHandlerProvider, IJsonSerializer serializer, IOptions<RunnerOptions> options)
     : TaskExecutor<RunTaskDefinition>(serviceProvider, logger, executionContextFactory, executorFactory, context, schemaHandlerProvider, serializer)
 {
 
@@ -38,6 +40,11 @@ public class ContainerProcessExecutor(IServiceProvider serviceProvider, ILogger<
     /// </summary>
     protected ContainerProcessDefinition ProcessDefinition => this.Task.Definition.Run.Container!;
 
+    /// <summary>
+    /// Gets the current <see cref="RunnerOptions"/>
+    /// </summary>
+    protected RunnerOptions Options { get; } = options.Value;
+
     /// <summary>
     /// Gets the <see cref="IContainer"/> to run
     /// </summary>
@@ -56,7 +63,8 @@ protected override async Task DoExecuteAsync(CancellationToken cancellationToken
         {
             await this.Container!.StartAsync(cancellationToken).ConfigureAwait(false);
             await this.Container.WaitForExitAsync(cancellationToken).ConfigureAwait(false);
-            var standardOutput = (this.Container.StandardOutput == null ? null : await this.Container.StandardOutput.ReadToEndAsync(cancellationToken).ConfigureAwait(false))?.Trim()[8..];
+            var standardOutput = (this.Container.StandardOutput == null ? null : await this.Container.StandardOutput.ReadToEndAsync(cancellationToken).ConfigureAwait(false))?.Trim();
+            if (this.Options.Containers.Platform == ContainerPlatform.Docker) standardOutput = standardOutput?[8..];
             var standardError = (this.Container.StandardError == null ? null : await this.Container.StandardError.ReadToEndAsync(cancellationToken).ConfigureAwait(false))?.Trim();
             var result = standardOutput; //todo: do something with return data encoding (ex: plain-text, json);
             await this.SetResultAsync(result, this.Task.Definition.Then, cancellationToken).ConfigureAwait(false);
diff --git a/src/runner/Synapse.Runner/Services/SecretsManager.cs b/src/runner/Synapse.Runner/Services/SecretsManager.cs
@@ -51,8 +51,8 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken)
         try
         {
             var path = string.IsNullOrWhiteSpace(this.Options.Secrets.Directory)
-            ? RunnerSecretsOptions.DefaultDirectory
-            : this.Options.Secrets.Directory;
+                ? RunnerSecretsOptions.DefaultDirectory
+                : this.Options.Secrets.Directory;
             var directory = new DirectoryInfo(path);
             if (!directory.Exists) directory.Create();
             foreach (var file in directory.GetFiles())
@@ -72,14 +72,14 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken)
                 }
                 catch (Exception ex)
                 {
-                    this.Logger.LogWarning("Skipped loading secret '{secretFile}': an exception occurred while deserializing the secret object: {ex}", file.Name, ex.ToString());
+                    this.Logger.LogWarning("Skipped loading secret '{secretFile}': an exception occurred while deserializing the secret object: {ex}", file.Name, ex.Message);
                     continue;
                 }
             }
         }
         catch(Exception ex)
         {
-            this.Logger.LogWarning("Failed to load secrets because there are none or because they are improperly configured. Error: {ex}", ex);
+            this.Logger.LogWarning("Failed to load secrets because there are none or because they are improperly configured. Error: {ex}", ex.Message);
         }
         return Task.CompletedTask;
     }
diff --git a/src/runner/Synapse.Runner/Services/WorkflowExecutionContext.cs b/src/runner/Synapse.Runner/Services/WorkflowExecutionContext.cs
@@ -577,7 +577,8 @@ await this.Api.Events.PublishAsync(new CloudEvent()
                 Data = new WorkflowCompletedEventV1()
                 {
                     Name = this.Instance.GetQualifiedName(),
-                    CompletedAt = run?.EndedAt ?? DateTimeOffset.Now
+                    CompletedAt = run?.EndedAt ?? DateTimeOffset.Now,
+                    Output = this.Output
                 }
             }, cancellationToken).ConfigureAwait(false);
             await this.Api.Events.PublishAsync(new CloudEvent()
diff --git a/src/runtime/Synapse.Runtime.Docker/Services/DockerRuntime.cs b/src/runtime/Synapse.Runtime.Docker/Services/DockerRuntime.cs
@@ -78,6 +78,8 @@ public override async Task<IWorkflowProcess> CreateProcessAsync(Workflow workflo
             this.Logger.LogDebug("Creating a new Docker container for workflow instance '{workflowInstance}'...", workflowInstance.GetQualifiedName());
             if (this.Docker == null) await this.InitializeAsync(cancellationToken).ConfigureAwait(false);
             var container = this.Runner.Runtime.Docker!.ContainerTemplate.Clone()!;
+            container.SetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Runner.Namespace, workflowInstance.GetNamespace()!);
+            container.SetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Runner.Name, $"{workflowInstance.GetName()}-{Guid.NewGuid().ToString("N")[..12].ToLowerInvariant()}");
             container.SetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Api.Uri, this.Runner.Api.Uri.OriginalString);
             container.SetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Runner.ContainerPlatform, this.Runner.ContainerPlatform);
             container.SetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Runner.LifecycleEvents, (this.Runner.PublishLifecycleEvents ?? true).ToString());
@@ -111,7 +113,7 @@ public override async Task<IWorkflowProcess> CreateProcessAsync(Workflow workflo
             ];
             var parameters = new CreateContainerParameters(container)
             {
-                Name = $"{workflowInstance.GetQualifiedName()}-{Guid.NewGuid().ToString("N")[..15].ToLowerInvariant()}",
+                Name = $"{workflowInstance.GetQualifiedName()}-{Guid.NewGuid().ToString("N")[..12].ToLowerInvariant()}",
                 HostConfig = hostConfig
             };
             var result = await this.Docker!.Containers.CreateContainerAsync(parameters, cancellationToken).ConfigureAwait(false);
diff --git a/src/runtime/Synapse.Runtime.Kubernetes/Services/KubernetesRuntime.cs b/src/runtime/Synapse.Runtime.Kubernetes/Services/KubernetesRuntime.cs
@@ -87,7 +87,7 @@ public override async Task<IWorkflowProcess> CreateProcessAsync(Workflow workflo
             var workflowDefinition = workflow.Spec.Versions.Get(workflowInstance.Spec.Definition.Version) ?? throw new NullReferenceException($"Failed to find version '{workflowInstance.Spec.Definition.Version}' of workflow '{workflow.GetQualifiedName()}'");
             var pod = this.Runner.Runtime.Kubernetes!.PodTemplate.Clone()!;
             pod.Metadata ??= new();
-            pod.Metadata.Name = $"{workflowInstance.GetQualifiedName()}-{Guid.NewGuid().ToString("N")[..15].ToLowerInvariant()}";
+            pod.Metadata.Name = $"{workflowInstance.GetQualifiedName()}-{Guid.NewGuid().ToString("N")[..12].ToLowerInvariant()}";
             if (!string.IsNullOrWhiteSpace(this.Runner.Runtime.Kubernetes.Namespace)) pod.Metadata.NamespaceProperty = this.Runner.Runtime.Kubernetes.Namespace;
             if (pod.Spec == null || pod.Spec.Containers == null || !pod.Spec.Containers.Any()) throw new InvalidOperationException("The specified Kubernetes runtime pod template is not valid");
             var volumeMounts = new List<V1VolumeMount>();
@@ -119,6 +119,8 @@ public override async Task<IWorkflowProcess> CreateProcessAsync(Workflow workflo
             foreach (var container in pod.Spec.Containers)
             {
                 container.Env ??= [];
+                container.Env.Add(new(SynapseDefaults.EnvironmentVariables.Runner.Namespace, valueFrom: new(fieldRef: new("metadata.namespace"))));
+                container.Env.Add(new(SynapseDefaults.EnvironmentVariables.Runner.Name, valueFrom: new(fieldRef: new("metadata.name"))));
                 container.SetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Api.Uri, this.Runner.Api.Uri.OriginalString);
                 container.SetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Runner.ContainerPlatform, this.Runner.ContainerPlatform);
                 container.SetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Runner.LifecycleEvents, (this.Runner.PublishLifecycleEvents ?? true).ToString());
diff --git a/src/runtime/Synapse.Runtime.Kubernetes/Services/KubernetesWorkflowProcess.cs b/src/runtime/Synapse.Runtime.Kubernetes/Services/KubernetesWorkflowProcess.cs
diff --git a/src/runtime/Synapse.Runtime.Native/Services/NativeRuntime.cs b/src/runtime/Synapse.Runtime.Native/Services/NativeRuntime.cs
diff --git a/tests/Synapse.UnitTests/Cases/Conformance/ConformanceTestsBase.cs b/tests/Synapse.UnitTests/Cases/Conformance/ConformanceTestsBase.cs
diff --git a/tests/Synapse.UnitTests/Services/MockWorkflowExecutionContextFactory.cs b/tests/Synapse.UnitTests/Services/MockWorkflowExecutionContextFactory.cs

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public class CreateResourceCommandHandler(IResourceRepository repository)`
`79`	`79`	`/// <inheritdoc/>`
`80`	`80`	`public virtual async Task<IOperationResult<IResource>> HandleAsync(CreateResourceCommand command, CancellationToken cancellationToken)`
`81`	`81`	`{`
`82`		`- if (command.Resource.GetName().Trim().EndsWith('-')) command.Resource.Metadata.Name = $"{command.Resource.GetName().Trim()}{Guid.NewGuid().ToString("N")[..15]}";`
	`82`	`+ if (command.Resource.GetName().Trim().EndsWith('-')) command.Resource.Metadata.Name = $"{command.Resource.GetName().Trim()}{Guid.NewGuid().ToString("N")[..12]}";`
`83`	`83`	`var resource = await repository.AddAsync(command.Resource, command.Group, command.Version, command.Plural, command.DryRun, cancellationToken);`
`84`	`84`	`return new OperationResult<IResource>((int)HttpStatusCode.Created, resource);`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public class CreateResourceCommandHandler<TResource>(IResourceRepository reposit`
`46`	`46`	`/// <inheritdoc/>`
`47`	`47`	`public virtual async Task<IOperationResult<TResource>> HandleAsync(CreateResourceCommand<TResource> command, CancellationToken cancellationToken)`
`48`	`48`	`{`
`49`		`- if (command.Resource.GetName().Trim().EndsWith('-')) command.Resource.Metadata.Name = $"{command.Resource.GetName().Trim()}{Guid.NewGuid().ToString("N")[..15]}";`
	`49`	`+ if (command.Resource.GetName().Trim().EndsWith('-')) command.Resource.Metadata.Name = $"{command.Resource.GetName().Trim()}{Guid.NewGuid().ToString("N")[..12]}";`
`50`	`50`	`var resource = await repository.AddAsync(command.Resource, false, cancellationToken).ConfigureAwait(false);`
`51`	`51`	`return new OperationResult<TResource>((int)HttpStatusCode.Created, resource);`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ public virtual async Task<IContainer> CreateAsync(ContainerProcessDefinition def`
`93`	`93`	`}`
`94`	`94`	`var parameters = new CreateContainerParameters()`
`95`	`95`	`{`
	`96`	`+ Name = $"{System.Environment.GetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Runner.Name)}-{definition.Image}-{Guid.NewGuid().ToString("N")[..6].ToLowerInvariant()}",`
`96`	`97`	`Image = definition.Image,`
`97`	`98`	`Cmd = string.IsNullOrWhiteSpace(definition.Command) ? null : ["/bin/sh", "-c", definition.Command],`
`98`	`99`	`Env = definition.Environment?.Select(e => $"{e.Key}={e.Value}").ToList(),`
Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,10 @@ protected virtual async Task WaitForReadyAsync(CancellationToken cancellationTok`
`107`	`107`	`/// <inheritdoc/>`
`108`	`108`	`public virtual async Task WaitForExitAsync(CancellationToken cancellationToken = default)`
`109`	`109`	`{`
`110`		`- var response = this.Kubernetes.CoreV1.ListNamespacedPodWithHttpMessagesAsync(this.Pod.Namespace(), fieldSelector: $"metadata.name={Pod.Name()}", cancellationToken: cancellationToken);`
	`110`	`+ var response = this.Kubernetes.CoreV1.ListNamespacedPodWithHttpMessagesAsync(this.Pod.Namespace(), fieldSelector: $"metadata.name={Pod.Name()}", watch: true, cancellationToken: cancellationToken);`
`111`	`111`	`await foreach (var (_, item) in response.WatchAsync<V1Pod, V1PodList>(cancellationToken: cancellationToken).ConfigureAwait(false))`
`112`	`112`	`{`
`113`		`- if (item.Status.Phase != "Succeeded" \|\| item.Status.Phase != "Failed") continue;`
	`113`	`+ if (item.Status.Phase != "Succeeded" && item.Status.Phase != "Failed") continue;`
`114`	`114`	`var containerStatus = item.Status.ContainerStatuses.FirstOrDefault();`
`115`	`115`	`this.ExitCode = containerStatus?.State.Terminated?.ExitCode ?? -1;`
`116`	`116`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -77,17 +77,22 @@ public virtual Task<IContainer> CreateAsync(ContainerProcessDefinition definitio`
`77`	`77`	`if (this.Kubernetes == null) throw new NullReferenceException("The KubernetesContainerPlatform has not been properly initialized");`
`78`	`78`	`var pod = new V1Pod()`
`79`	`79`	`{`
	`80`	`+ Metadata = new()`
	`81`	`+ {`
	`82`	`+ NamespaceProperty = $"{System.Environment.GetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Runner.Namespace)}",`
	`83`	`+ Name = $"{System.Environment.GetEnvironmentVariable(SynapseDefaults.EnvironmentVariables.Runner.Name)}-{definition.Image}-{Guid.NewGuid().ToString("N")[..6].ToLowerInvariant()}"`
	`84`	`+ },`
`80`	`85`	`Spec = new()`
`81`	`86`	`{`
	`87`	`+ RestartPolicy = "Never",`
`82`	`88`	`Containers =`
`83`	`89`	`[`
`84`		`- new()`
	`90`	`+ new(definition.Image)`
`85`	`91`	`{`
`86`	`92`	`Image = definition.Image,`
`87`	`93`	`ImagePullPolicy = this.Options.ImagePullPolicy,`
`88`	`94`	`Command = string.IsNullOrWhiteSpace(definition.Command) ? null : ["/bin/sh", "-c", definition.Command],`
`89`		`- Env = definition.Environment?.Select(e => new V1EnvVar(e.Key, e.Value)).ToList(),`
`90`		`- RestartPolicy = "Never"`
	`95`	`+ Env = definition.Environment?.Select(e => new V1EnvVar(e.Key, e.Value)).ToList()`
`91`	`96`	`}`
`92`	`97`	`]`
`93`	`98`	`}`