fixes

src/model/build-parameters.ts

@@ -1,7 +1,7 @@
 import { customAlphabet } from 'nanoid';
 import AndroidVersioning from './android-versioning';
-import CloudRunnerConstants from './cloud-runner/services/cloud-runner-constants';
-import CloudRunnerBuildGuid from './cloud-runner/services/cloud-runner-guid';
+import CloudRunnerConstants from './cloud-runner/options/cloud-runner-constants';
+import CloudRunnerBuildGuid from './cloud-runner/options/cloud-runner-guid';
 import Input from './input';
 import Platform from './platform';
 import UnityVersioning from './unity-versioning';
@@ -10,7 +10,7 @@ import { GitRepoReader } from './input-readers/git-repo';
 import { GithubCliReader } from './input-readers/github-cli';
 import { Cli } from './cli/cli';
 import GitHub from './github';
-import CloudRunnerOptions from './cloud-runner/cloud-runner-options';
+import CloudRunnerOptions from './cloud-runner/options/cloud-runner-options';
 import CloudRunner from './cloud-runner/cloud-runner';
 
 class BuildParameters {

src/model/cli/cli.ts

@@ -2,16 +2,16 @@ import { Command } from 'commander-ts';
 import { BuildParameters, CloudRunner, ImageTag, Input } from '..';
 import * as core from '@actions/core';
 import { ActionYamlReader } from '../input-readers/action-yaml';
-import CloudRunnerLogger from '../cloud-runner/services/cloud-runner-logger';
-import CloudRunnerQueryOverride from '../cloud-runner/services/cloud-runner-query-override';
+import CloudRunnerLogger from '../cloud-runner/services/core/cloud-runner-logger';
+import CloudRunnerQueryOverride from '../cloud-runner/options/cloud-runner-query-override';
 import { CliFunction, CliFunctionsRepository } from './cli-functions-repository';
 import { Caching } from '../cloud-runner/remote-client/caching';
-import { LfsHashing } from '../cloud-runner/services/lfs-hashing';
+import { LfsHashing } from '../cloud-runner/services/utility/lfs-hashing';
 import { RemoteClient } from '../cloud-runner/remote-client';
-import CloudRunnerOptionsReader from '../cloud-runner/services/cloud-runner-options-reader';
+import CloudRunnerOptionsReader from '../cloud-runner/options/cloud-runner-options-reader';
 import GitHub from '../github';
-import { CloudRunnerFolders } from '../cloud-runner/services/cloud-runner-folders';
-import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system';
+import { CloudRunnerFolders } from '../cloud-runner/options/cloud-runner-folders';
+import { CloudRunnerSystem } from '../cloud-runner/services/core/cloud-runner-system';
 import { OptionValues } from 'commander';
 import { InputKey } from '../input';
 

src/model/cloud-runner/cloud-runner.ts

@@ -1,21 +1,21 @@
 import AwsBuildPlatform from './providers/aws';
 import { BuildParameters, Input } from '..';
 import Kubernetes from './providers/k8s';
-import CloudRunnerLogger from './services/cloud-runner-logger';
-import { CloudRunnerStepState } from './cloud-runner-step-state';
+import CloudRunnerLogger from './services/core/cloud-runner-logger';
+import { CloudRunnerStepParameters } from './options/cloud-runner-step-parameters';
 import { WorkflowCompositionRoot } from './workflows/workflow-composition-root';
 import { CloudRunnerError } from './error/cloud-runner-error';
-import { TaskParameterSerializer } from './services/task-parameter-serializer';
+import { TaskParameterSerializer } from './services/core/task-parameter-serializer';
 import * as core from '@actions/core';
-import CloudRunnerSecret from './services/cloud-runner-secret';
+import CloudRunnerSecret from './options/cloud-runner-secret';
 import { ProviderInterface } from './providers/provider-interface';
-import CloudRunnerEnvironmentVariable from './services/cloud-runner-environment-variable';
+import CloudRunnerEnvironmentVariable from './options/cloud-runner-environment-variable';
 import TestCloudRunner from './providers/test';
 import LocalCloudRunner from './providers/local';
 import LocalDockerCloudRunner from './providers/docker';
 import GitHub from '../github';
-import SharedWorkspaceLocking from './services/shared-workspace-locking';
-import { FollowLogStreamService } from './services/follow-log-stream-service';
+import SharedWorkspaceLocking from './services/core/shared-workspace-locking';
+import { FollowLogStreamService } from './services/core/follow-log-stream-service';
 
 class CloudRunner {
   public static Provider: ProviderInterface;
@@ -120,7 +120,11 @@ class CloudRunner {
       const jsonContent = JSON.stringify(content, undefined, 4);
       await GitHub.updateGitHubCheck(jsonContent, CloudRunner.buildParameters.buildGuid);
       const output = await new WorkflowCompositionRoot().run(
-        new CloudRunnerStepState(baseImage, CloudRunner.cloudRunnerEnvironmentVariables, CloudRunner.defaultSecrets),
+        new CloudRunnerStepParameters(
+          baseImage,
+          CloudRunner.cloudRunnerEnvironmentVariables,
+          CloudRunner.defaultSecrets,
+        ),
       );
       if (!CloudRunner.buildParameters.isCliMode) core.startGroup('Cleanup shared cloud runner resources');
       await CloudRunner.Provider.cleanupWorkflow(

src/model/cloud-runner/error/cloud-runner-error.ts

@@ -1,7 +1,7 @@
-import CloudRunnerLogger from '../services/cloud-runner-logger';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
 import * as core from '@actions/core';
 import CloudRunner from '../cloud-runner';
-import CloudRunnerSecret from '../services/cloud-runner-secret';
+import CloudRunnerSecret from '../options/cloud-runner-secret';
 import BuildParameters from '../../build-parameters';
 
 export class CloudRunnerError {

src/model/cloud-runner/options/cloud-runner-folders.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
-import CloudRunnerOptions from '../cloud-runner-options';
-import CloudRunner from './../cloud-runner';
+import CloudRunnerOptions from './cloud-runner-options';
+import CloudRunner from '../cloud-runner';
 import BuildParameters from '../../build-parameters';
 
 export class CloudRunnerFolders {

src/model/cloud-runner/options/cloud-runner-options-reader.ts

@@ -1,5 +1,5 @@
 import Input from '../../input';
-import CloudRunnerOptions from '../cloud-runner-options';
+import CloudRunnerOptions from './cloud-runner-options';
 
 class CloudRunnerOptionsReader {
   static GetProperties() {

src/model/cloud-runner/options/cloud-runner-options.ts

@@ -1,6 +1,6 @@
-import { Cli } from '../cli/cli';
-import CloudRunnerQueryOverride from './services/cloud-runner-query-override';
-import GitHub from '../github';
+import { Cli } from '../../cli/cli';
+import CloudRunnerQueryOverride from './cloud-runner-query-override';
+import GitHub from '../../github';
 import * as core from '@actions/core';
 
 class CloudRunnerOptions {

src/model/cloud-runner/options/cloud-runner-query-override.ts

@@ -1,6 +1,6 @@
 import Input from '../../input';
 import { GenericInputReader } from '../../input-readers/generic-input-reader';
-import CloudRunnerOptions from '../cloud-runner-options';
+import CloudRunnerOptions from './cloud-runner-options';
 
 const formatFunction = (value: string, arguments_: any[]) => {
   for (const element of arguments_) {

src/model/cloud-runner/options/cloud-runner-step-parameters.ts

@@ -1,7 +1,7 @@
-import CloudRunnerEnvironmentVariable from './services/cloud-runner-environment-variable';
-import CloudRunnerSecret from './services/cloud-runner-secret';
+import CloudRunnerEnvironmentVariable from './cloud-runner-environment-variable';
+import CloudRunnerSecret from './cloud-runner-secret';
 
-export class CloudRunnerStepState {
+export class CloudRunnerStepParameters {
   public image: string;
   public environment: CloudRunnerEnvironmentVariable[];
   public secrets: CloudRunnerSecret[];

src/model/cloud-runner/providers/aws/aws-base-stack.ts

@@ -1,4 +1,4 @@
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import * as core from '@actions/core';
 import * as SDK from 'aws-sdk';
 import { BaseStackFormation } from './cloud-formations/base-stack-formation';

src/model/cloud-runner/providers/aws/aws-error.ts

@@ -1,4 +1,4 @@
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import * as SDK from 'aws-sdk';
 import * as core from '@actions/core';
 import CloudRunner from '../../cloud-runner';

src/model/cloud-runner/providers/aws/aws-job-stack.ts

@@ -1,12 +1,12 @@
 import * as SDK from 'aws-sdk';
 import CloudRunnerAWSTaskDef from './cloud-runner-aws-task-def';
-import CloudRunnerSecret from '../../services/cloud-runner-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 import { AWSCloudFormationTemplates } from './aws-cloud-formation-templates';
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { AWSError } from './aws-error';
 import CloudRunner from '../../cloud-runner';
 import { CleanupCronFormation } from './cloud-formations/cleanup-cron-formation';
-import CloudRunnerOptions from '../../cloud-runner-options';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
 import { TaskDefinitionFormation } from './cloud-formations/task-definition-formation';
 
 export class AWSJobStack {

src/model/cloud-runner/providers/aws/aws-task-runner.ts

@@ -1,14 +1,14 @@
 import * as AWS from 'aws-sdk';
-import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
 import * as core from '@actions/core';
 import CloudRunnerAWSTaskDef from './cloud-runner-aws-task-def';
 import * as zlib from 'node:zlib';
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { Input } from '../../..';
 import CloudRunner from '../../cloud-runner';
 import { CloudRunnerCommandHooks } from '../../services/cloud-runner-hooks/cloud-runner-command-hook';
-import { FollowLogStreamService } from '../../services/follow-log-stream-service';
-import CloudRunnerOptions from '../../cloud-runner-options';
+import { FollowLogStreamService } from '../../services/core/follow-log-stream-service';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
 import GitHub from '../../../github';
 
 class AWSTaskRunner {

src/model/cloud-runner/providers/aws/index.ts

@@ -1,11 +1,11 @@
 import * as SDK from 'aws-sdk';
-import CloudRunnerSecret from '../../services/cloud-runner-secret';
-import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
 import CloudRunnerAWSTaskDef from './cloud-runner-aws-task-def';
 import AwsTaskRunner from './aws-task-runner';
 import { ProviderInterface } from '../provider-interface';
 import BuildParameters from '../../../build-parameters';
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { AWSJobStack as AwsJobStack } from './aws-job-stack';
 import { AWSBaseStack as AwsBaseStack } from './aws-base-stack';
 import { Input } from '../../..';
@@ -13,7 +13,7 @@ import { GarbageCollectionService } from './services/garbage-collection-service'
 import { ProviderResource } from '../provider-resource';
 import { ProviderWorkflow } from '../provider-workflow';
 import { TaskService } from './services/task-service';
-import CloudRunnerOptions from '../../cloud-runner-options';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
 
 class AWSBuildEnvironment implements ProviderInterface {
   private baseStackName: string;

src/model/cloud-runner/providers/aws/services/garbage-collection-service.ts

@@ -1,6 +1,6 @@
 import AWS from 'aws-sdk';
 import Input from '../../../../input';
-import CloudRunnerLogger from '../../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../../services/core/cloud-runner-logger';
 import { TaskService } from './task-service';
 
 export class GarbageCollectionService {

src/model/cloud-runner/providers/aws/services/task-service.ts

@@ -1,6 +1,6 @@
 import AWS from 'aws-sdk';
 import Input from '../../../../input';
-import CloudRunnerLogger from '../../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../../services/core/cloud-runner-logger';
 import { BaseStackFormation } from '../cloud-formations/base-stack-formation';
 import AwsTaskRunner from '../aws-task-runner';
 import { ListObjectsRequest } from 'aws-sdk/clients/s3';

src/model/cloud-runner/providers/docker/index.ts

@@ -1,15 +1,15 @@
 import BuildParameters from '../../../build-parameters';
-import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable';
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { ProviderInterface } from '../provider-interface';
-import CloudRunnerSecret from '../../services/cloud-runner-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 import Docker from '../../../docker';
 import { Action } from '../../..';
 import { writeFileSync } from 'node:fs';
 import CloudRunner from '../../cloud-runner';
 import { ProviderResource } from '../provider-resource';
 import { ProviderWorkflow } from '../provider-workflow';
-import { CloudRunnerSystem } from '../../services/cloud-runner-system';
+import { CloudRunnerSystem } from '../../services/core/cloud-runner-system';
 import * as fs from 'node:fs';
 import { CloudRunnerCommandHooks } from '../../services/cloud-runner-hooks/cloud-runner-command-hook';
 import { StringKeyValuePair } from '../../../shared-types';

src/model/cloud-runner/providers/k8s/index.ts

@@ -2,14 +2,14 @@ import * as k8s from '@kubernetes/client-node';
 import { BuildParameters } from '../../..';
 import * as core from '@actions/core';
 import { ProviderInterface } from '../provider-interface';
-import CloudRunnerSecret from '../../services/cloud-runner-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 import KubernetesStorage from './kubernetes-storage';
-import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
 import KubernetesTaskRunner from './kubernetes-task-runner';
 import KubernetesSecret from './kubernetes-secret';
 import KubernetesJobSpecFactory from './kubernetes-job-spec-factory';
 import KubernetesServiceAccount from './kubernetes-service-account';
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { CoreV1Api } from '@kubernetes/client-node';
 import CloudRunner from '../../cloud-runner';
 import { ProviderResource } from '../provider-resource';

src/model/cloud-runner/providers/k8s/kubernetes-job-spec-factory.ts

@@ -1,8 +1,8 @@
 import { V1EnvVar, V1EnvVarSource, V1SecretKeySelector } from '@kubernetes/client-node';
 import BuildParameters from '../../../build-parameters';
 import { CloudRunnerCommandHooks } from '../../services/cloud-runner-hooks/cloud-runner-command-hook';
-import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable';
-import CloudRunnerSecret from '../../services/cloud-runner-secret';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 import CloudRunner from '../../cloud-runner';
 
 class KubernetesJobSpecFactory {

src/model/cloud-runner/providers/k8s/kubernetes-pods.ts

@@ -1,4 +1,4 @@
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { CoreV1Api } from '@kubernetes/client-node';
 class KubernetesPods {
   public static async IsPodRunning(podName: string, namespace: string, kubeClient: CoreV1Api) {

src/model/cloud-runner/providers/k8s/kubernetes-secret.ts

@@ -1,7 +1,7 @@
 import { CoreV1Api } from '@kubernetes/client-node';
-import CloudRunnerSecret from '../../services/cloud-runner-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 import * as k8s from '@kubernetes/client-node';
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import * as base64 from 'base-64';
 
 class KubernetesSecret {

src/model/cloud-runner/providers/k8s/kubernetes-storage.ts

@@ -2,7 +2,7 @@ import waitUntil from 'async-wait-until';
 import * as core from '@actions/core';
 import * as k8s from '@kubernetes/client-node';
 import BuildParameters from '../../../build-parameters';
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { IncomingMessage } from 'node:http';
 import GitHub from '../../../github';
 

src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts

@@ -1,10 +1,10 @@
 import { CoreV1Api, KubeConfig } from '@kubernetes/client-node';
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import waitUntil from 'async-wait-until';
-import { FollowLogStreamService } from '../../services/follow-log-stream-service';
-import { CloudRunnerSystem } from '../../services/cloud-runner-system';
+import { CloudRunnerSystem } from '../../services/core/cloud-runner-system';
 import CloudRunner from '../../cloud-runner';
 import KubernetesPods from './kubernetes-pods';
+import { FollowLogStreamService } from '../../services/core/follow-log-stream-service';
 
 class KubernetesTaskRunner {
   static lastReceivedTimestamp: number = 0;

src/model/cloud-runner/providers/local/index.ts

@@ -1,9 +1,9 @@
 import BuildParameters from '../../../build-parameters';
-import { CloudRunnerSystem } from '../../services/cloud-runner-system';
-import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable';
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import { CloudRunnerSystem } from '../../services/core/cloud-runner-system';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { ProviderInterface } from '../provider-interface';
-import CloudRunnerSecret from '../../services/cloud-runner-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 import { ProviderResource } from '../provider-resource';
 import { ProviderWorkflow } from '../provider-workflow';
 

src/model/cloud-runner/providers/provider-interface.ts

@@ -1,6 +1,6 @@
 import BuildParameters from '../../build-parameters';
-import CloudRunnerEnvironmentVariable from '../services/cloud-runner-environment-variable';
-import CloudRunnerSecret from '../services/cloud-runner-secret';
+import CloudRunnerEnvironmentVariable from '../options/cloud-runner-environment-variable';
+import CloudRunnerSecret from '../options/cloud-runner-secret';
 import { ProviderResource } from './provider-resource';
 import { ProviderWorkflow } from './provider-workflow';
 

src/model/cloud-runner/providers/test/index.ts

@@ -1,8 +1,8 @@
 import BuildParameters from '../../../build-parameters';
-import CloudRunnerEnvironmentVariable from '../../services/cloud-runner-environment-variable';
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { ProviderInterface } from '../provider-interface';
-import CloudRunnerSecret from '../../services/cloud-runner-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 import { ProviderResource } from '../provider-resource';
 import { ProviderWorkflow } from '../provider-workflow';
 

src/model/cloud-runner/remote-client/caching.ts

@@ -2,10 +2,10 @@ import { assert } from 'node:console';
 import fs from 'node:fs';
 import path from 'node:path';
 import CloudRunner from '../cloud-runner';
-import CloudRunnerLogger from '../services/cloud-runner-logger';
-import { CloudRunnerFolders } from '../services/cloud-runner-folders';
-import { CloudRunnerSystem } from '../services/cloud-runner-system';
-import { LfsHashing } from '../services/lfs-hashing';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
+import { CloudRunnerFolders } from '../options/cloud-runner-folders';
+import { CloudRunnerSystem } from '../services/core/cloud-runner-system';
+import { LfsHashing } from '../services/utility/lfs-hashing';
 import { RemoteClientLogger } from './remote-client-logger';
 import { Cli } from '../../cli/cli';
 import { CliFunction } from '../../cli/cli-functions-repository';

src/model/cloud-runner/remote-client/index.ts

@@ -1,14 +1,14 @@
 import fs from 'node:fs';
 import CloudRunner from '../cloud-runner';
-import { CloudRunnerFolders } from '../services/cloud-runner-folders';
+import { CloudRunnerFolders } from '../options/cloud-runner-folders';
 import { Caching } from './caching';
-import { LfsHashing } from '../services/lfs-hashing';
+import { LfsHashing } from '../services/utility/lfs-hashing';
 import { RemoteClientLogger } from './remote-client-logger';
 import path from 'node:path';
 import { assert } from 'node:console';
-import CloudRunnerLogger from '../services/cloud-runner-logger';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
 import { CliFunction } from '../../cli/cli-functions-repository';
-import { CloudRunnerSystem } from '../services/cloud-runner-system';
+import { CloudRunnerSystem } from '../services/core/cloud-runner-system';
 import YAML from 'yaml';
 import GitHub from '../../github';
 import BuildParameters from '../../build-parameters';

src/model/cloud-runner/remote-client/remote-client-logger.ts

@@ -1,4 +1,4 @@
-import CloudRunnerLogger from '../services/cloud-runner-logger';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
 
 export class RemoteClientLogger {
   public static log(message: string) {

src/model/cloud-runner/services/cloud-runner-hooks/cloud-runner-command-hook.ts

@@ -2,9 +2,9 @@ import { BuildParameters, Input } from '../../..';
 import YAML from 'yaml';
 import { RemoteClientLogger } from '../../remote-client/remote-client-logger';
 import path from 'node:path';
-import CloudRunnerOptions from '../../cloud-runner-options';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
 import * as fs from 'node:fs';
-import CloudRunnerLogger from '../cloud-runner-logger';
+import CloudRunnerLogger from '../core/cloud-runner-logger';
 import { CommandHook } from './command-hook';
 
 // import CloudRunnerLogger from './cloud-runner-logger';

src/model/cloud-runner/services/cloud-runner-hooks/cloud-runner-container-hook.ts

@@ -6,9 +6,9 @@ import { RemoteClientLogger } from '../../remote-client/remote-client-logger';
 import path from 'node:path';
 import fs from 'node:fs';
 import Input from '../../../input';
-import CloudRunnerOptions from '../../cloud-runner-options';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
 import { ContainerHook as ContainerHook } from './container-hook';
-import { CloudRunnerStepState } from '../../cloud-runner-step-state';
+import { CloudRunnerStepParameters } from '../../options/cloud-runner-step-parameters';
 
 export class CloudRunnerContainerHook {
   static GetContainerHooksFromFiles(hookLifecycle: string): ContainerHook[] {
@@ -229,7 +229,7 @@ export class CloudRunnerContainerHook {
     return object;
   }
 
-  static async RunPostBuildSteps(cloudRunnerStepState: CloudRunnerStepState) {
+  static async RunPostBuildSteps(cloudRunnerStepState: CloudRunnerStepParameters) {
     let output = ``;
     const steps: ContainerHook[] = [
       ...CloudRunnerContainerHook.ParseContainerHooks(CloudRunner.buildParameters.postBuildContainerHooks),
@@ -248,7 +248,7 @@ export class CloudRunnerContainerHook {
 
     return output;
   }
-  static async RunPreBuildSteps(cloudRunnerStepState: CloudRunnerStepState) {
+  static async RunPreBuildSteps(cloudRunnerStepState: CloudRunnerStepParameters) {
     let output = ``;
     const steps: ContainerHook[] = [
       ...CloudRunnerContainerHook.ParseContainerHooks(CloudRunner.buildParameters.preBuildContainerHooks),

src/model/cloud-runner/services/cloud-runner-hooks/command-hook.ts

@@ -1,4 +1,4 @@
-import CloudRunnerSecret from '../cloud-runner-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 
 export class CommandHook {
   public commands: string[] = new Array<string>();

src/model/cloud-runner/services/cloud-runner-hooks/container-hook.ts

@@ -1,4 +1,4 @@
-import CloudRunnerSecret from '../cloud-runner-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 
 export class ContainerHook {
   public commands!: string;

src/model/cloud-runner/services/core/cloud-runner-system.ts

@@ -1,5 +1,5 @@
 import { exec } from 'child_process';
-import { RemoteClientLogger } from '../remote-client/remote-client-logger';
+import { RemoteClientLogger } from '../../remote-client/remote-client-logger';
 
 export class CloudRunnerSystem {
   public static async RunAndReadLines(command: string): Promise<string[]> {

src/model/cloud-runner/services/core/follow-log-stream-service.ts

@@ -1,8 +1,8 @@
+import GitHub from '../../../github';
+import CloudRunner from '../../cloud-runner';
+import { CloudRunnerStatics } from '../../options/cloud-runner-statics';
 import CloudRunnerLogger from './cloud-runner-logger';
 import * as core from '@actions/core';
-import CloudRunner from '../cloud-runner';
-import { CloudRunnerStatics } from '../cloud-runner-statics';
-import GitHub from '../../github';
 
 export class FollowLogStreamService {
   static Reset() {

src/model/cloud-runner/services/core/shared-workspace-locking.ts

@@ -1,8 +1,8 @@
 import { CloudRunnerSystem } from './cloud-runner-system';
 import fs from 'node:fs';
 import CloudRunnerLogger from './cloud-runner-logger';
-import BuildParameters from '../../build-parameters';
-import CloudRunner from '../cloud-runner';
+import BuildParameters from '../../../build-parameters';
+import CloudRunner from '../../cloud-runner';
 export class SharedWorkspaceLocking {
   public static get workspaceBucketRoot() {
     return `s3://${CloudRunner.buildParameters.awsStackName}/`;

src/model/cloud-runner/services/core/task-parameter-serializer.ts

@@ -1,11 +1,11 @@
-import { Input } from '../..';
-import CloudRunnerEnvironmentVariable from './cloud-runner-environment-variable';
-import { CloudRunnerCommandHooks } from './cloud-runner-hooks/cloud-runner-command-hook';
-import CloudRunnerSecret from './cloud-runner-secret';
-import CloudRunnerQueryOverride from './cloud-runner-query-override';
-import CloudRunnerOptionsReader from './cloud-runner-options-reader';
-import BuildParameters from '../../build-parameters';
-import CloudRunnerOptions from '../cloud-runner-options';
+import BuildParameters from '../../../build-parameters';
+import Input from '../../../input';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
+import CloudRunnerOptionsReader from '../../options/cloud-runner-options-reader';
+import CloudRunnerQueryOverride from '../../options/cloud-runner-query-override';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
+import { CloudRunnerCommandHooks } from '../cloud-runner-hooks/cloud-runner-command-hook';
 
 export class TaskParameterSerializer {
   static readonly blockedParameterNames: Set<string> = new Set([

src/model/cloud-runner/services/utility/lfs-hashing.ts

@@ -1,9 +1,9 @@
 import path from 'node:path';
-import { CloudRunnerFolders } from './cloud-runner-folders';
-import { CloudRunnerSystem } from './cloud-runner-system';
+import { CloudRunnerFolders } from '../../options/cloud-runner-folders';
+import { CloudRunnerSystem } from '../core/cloud-runner-system';
 import fs from 'node:fs';
-import { Cli } from '../../cli/cli';
-import { CliFunction } from '../../cli/cli-functions-repository';
+import { Cli } from '../../../cli/cli';
+import { CliFunction } from '../../../cli/cli-functions-repository';
 
 export class LfsHashing {
   public static async createLFSHashFiles() {

src/model/cloud-runner/tests/cloud-runner-async-workflow.test.ts

@@ -2,7 +2,7 @@ import { BuildParameters, ImageTag } from '../..';
 import CloudRunner from '../cloud-runner';
 import UnityVersioning from '../../unity-versioning';
 import { Cli } from '../../cli/cli';
-import CloudRunnerOptions from '../cloud-runner-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
 import setups from './cloud-runner-suite.test';
 import { OptionValues } from 'commander';
 

src/model/cloud-runner/tests/cloud-runner-caching.test.ts

@@ -4,11 +4,11 @@ import BuildParameters from '../../build-parameters';
 import { Cli } from '../../cli/cli';
 import UnityVersioning from '../../unity-versioning';
 import CloudRunner from '../cloud-runner';
-import { CloudRunnerSystem } from '../services/cloud-runner-system';
+import { CloudRunnerSystem } from '../services/core/cloud-runner-system';
 import { Caching } from '../remote-client/caching';
 import { v4 as uuidv4 } from 'uuid';
 import GitHub from '../../github';
-import CloudRunnerOptions from '../cloud-runner-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
 describe('Cloud Runner (Remote Client) Caching', () => {
   it('responds', () => {});
   if (CloudRunnerOptions.providerStrategy === `local-docker`) {

src/model/cloud-runner/tests/cloud-runner-environment.test.ts

@@ -1,12 +1,12 @@
 import { BuildParameters, CloudRunner, ImageTag, Input } from '../..';
-import { TaskParameterSerializer } from '../services/task-parameter-serializer';
+import { TaskParameterSerializer } from '../services/core/task-parameter-serializer';
 import UnityVersioning from '../../unity-versioning';
 import { Cli } from '../../cli/cli';
 import GitHub from '../../github';
 import setups from './cloud-runner-suite.test';
-import { CloudRunnerStatics } from '../cloud-runner-statics';
-import CloudRunnerOptions from '../cloud-runner-options';
-import CloudRunnerLogger from '../services/cloud-runner-logger';
+import { CloudRunnerStatics } from '../options/cloud-runner-statics';
+import CloudRunnerOptions from '../options/cloud-runner-options';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
 
 async function CreateParameters(overrides: any) {
   if (overrides) {

src/model/cloud-runner/tests/cloud-runner-hooks.test.ts

@@ -2,9 +2,9 @@ import CloudRunner from '../cloud-runner';
 import { BuildParameters, ImageTag } from '../..';
 import UnityVersioning from '../../unity-versioning';
 import { Cli } from '../../cli/cli';
-import CloudRunnerLogger from '../services/cloud-runner-logger';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
 import { v4 as uuidv4 } from 'uuid';
-import CloudRunnerOptions from '../cloud-runner-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
 import setups from './cloud-runner-suite.test';
 import { CloudRunnerContainerHook } from '../services/cloud-runner-hooks/cloud-runner-container-hook';
 import { CloudRunnerCommandHooks } from '../services/cloud-runner-hooks/cloud-runner-command-hook';
@@ -56,7 +56,7 @@ commands: echo "test"`;
         targetPlatform: 'StandaloneLinux64',
         cacheKey: `test-case-${uuidv4()}`,
         containerHookFiles: `my-test-step-pre-build,my-test-step-post-build`,
-        customHookFiles: `my-test-hook-pre-build,my-test-hook-post-build`,
+        commandHookFiles: `my-test-hook-pre-build,my-test-hook-post-build`,
       };
       const buildParameter2 = await CreateParameters(overrides);
       await CloudRunner.setup(buildParameter2);

src/model/cloud-runner/tests/cloud-runner-local-persistence.test.ts

@@ -1,11 +1,11 @@
 import { ImageTag } from '../..';
 import CloudRunner from '../cloud-runner';
 import UnityVersioning from '../../unity-versioning';
-import CloudRunnerOptions from '../cloud-runner-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
 import setups from './cloud-runner-suite.test';
 import fs from 'node:fs';
 import { CreateParameters } from './create-test-parameter';
-import CloudRunnerLogger from '../services/cloud-runner-logger';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
 
 describe('Cloud Runner Local Docker Workflows', () => {
   setups();

src/model/cloud-runner/tests/cloud-runner-locking-core.test.ts

@@ -1,9 +1,9 @@
-import SharedWorkspaceLocking from '../services/shared-workspace-locking';
+import SharedWorkspaceLocking from '../services/core/shared-workspace-locking';
 import { Cli } from '../../cli/cli';
 import setups from './cloud-runner-suite.test';
-import CloudRunnerLogger from '../services/cloud-runner-logger';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
 import { v4 as uuidv4 } from 'uuid';
-import CloudRunnerOptions from '../cloud-runner-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
 import UnityVersioning from '../../unity-versioning';
 import BuildParameters from '../../build-parameters';
 import CloudRunner from '../cloud-runner';

src/model/cloud-runner/tests/cloud-runner-locking-get-locked.test.ts

@@ -1,8 +1,8 @@
-import SharedWorkspaceLocking from '../services/shared-workspace-locking';
+import SharedWorkspaceLocking from '../services/core/shared-workspace-locking';
 import { Cli } from '../../cli/cli';
 import setups from './cloud-runner-suite.test';
 import { v4 as uuidv4 } from 'uuid';
-import CloudRunnerOptions from '../cloud-runner-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
 import UnityVersioning from '../../unity-versioning';
 import BuildParameters from '../../build-parameters';
 import CloudRunner from '../cloud-runner';

src/model/cloud-runner/tests/cloud-runner-s3-steps.test.ts

@@ -2,11 +2,11 @@ import CloudRunner from '../cloud-runner';
 import { BuildParameters, ImageTag } from '../..';
 import UnityVersioning from '../../unity-versioning';
 import { Cli } from '../../cli/cli';
-import CloudRunnerLogger from '../services/cloud-runner-logger';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
 import { v4 as uuidv4 } from 'uuid';
-import CloudRunnerOptions from '../cloud-runner-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
 import setups from './cloud-runner-suite.test';
-import { CloudRunnerSystem } from '../services/cloud-runner-system';
+import { CloudRunnerSystem } from '../services/core/cloud-runner-system';
 import { OptionValues } from 'commander';
 
 async function CreateParameters(overrides: OptionValues | undefined) {

src/model/cloud-runner/tests/e2e/cloud-runner-end2end-caching.test.ts

@@ -2,12 +2,12 @@ import CloudRunner from '../../cloud-runner';
 import { BuildParameters, ImageTag } from '../../..';
 import UnityVersioning from '../../../unity-versioning';
 import { Cli } from '../../../cli/cli';
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { v4 as uuidv4 } from 'uuid';
-import CloudRunnerOptions from '../../cloud-runner-options';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
 import setups from '../cloud-runner-suite.test';
 import * as fs from 'node:fs';
-import { CloudRunnerSystem } from '../../services/cloud-runner-system';
+import { CloudRunnerSystem } from '../../services/core/cloud-runner-system';
 
 async function CreateParameters(overrides: any) {
   if (overrides) {

src/model/cloud-runner/tests/e2e/cloud-runner-end2end-locking.test.ts

@@ -2,11 +2,11 @@ import CloudRunner from '../../cloud-runner';
 import { BuildParameters } from '../../..';
 import UnityVersioning from '../../../unity-versioning';
 import { Cli } from '../../../cli/cli';
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { v4 as uuidv4 } from 'uuid';
-import CloudRunnerOptions from '../../cloud-runner-options';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
 import setups from '../cloud-runner-suite.test';
-import SharedWorkspaceLocking from '../../services/shared-workspace-locking';
+import SharedWorkspaceLocking from '../../services/core/shared-workspace-locking';
 
 async function CreateParameters(overrides: any) {
   if (overrides) {

src/model/cloud-runner/tests/e2e/cloud-runner-end2end-retaining.test.ts

@@ -1,16 +1,16 @@
 import CloudRunner from '../../cloud-runner';
 import { ImageTag } from '../../..';
 import UnityVersioning from '../../../unity-versioning';
-import CloudRunnerLogger from '../../services/cloud-runner-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { v4 as uuidv4 } from 'uuid';
-import CloudRunnerOptions from '../../cloud-runner-options';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
 import setups from './../cloud-runner-suite.test';
 import * as fs from 'node:fs';
 import path from 'node:path';
-import { CloudRunnerFolders } from '../../services/cloud-runner-folders';
-import SharedWorkspaceLocking from '../../services/shared-workspace-locking';
+import { CloudRunnerFolders } from '../../options/cloud-runner-folders';
+import SharedWorkspaceLocking from '../../services/core/shared-workspace-locking';
 import { CreateParameters } from '../create-test-parameter';
-import { CloudRunnerSystem } from '../../services/cloud-runner-system';
+import { CloudRunnerSystem } from '../../services/core/cloud-runner-system';
 
 describe('Cloud Runner Retain Workspace', () => {
   it('Responds', () => {});

src/model/cloud-runner/workflows/async-workflow.ts

@@ -1,7 +1,7 @@
-import CloudRunnerSecret from '../services/cloud-runner-secret';
-import CloudRunnerEnvironmentVariable from '../services/cloud-runner-environment-variable';
-import CloudRunnerLogger from '../services/cloud-runner-logger';
-import { CloudRunnerFolders } from '../services/cloud-runner-folders';
+import CloudRunnerSecret from '../options/cloud-runner-secret';
+import CloudRunnerEnvironmentVariable from '../options/cloud-runner-environment-variable';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
+import { CloudRunnerFolders } from '../options/cloud-runner-folders';
 import CloudRunner from '../cloud-runner';
 
 export class AsyncWorkflow {

src/model/cloud-runner/workflows/build-automation-workflow.ts

@@ -1,6 +1,6 @@
-import CloudRunnerLogger from '../services/cloud-runner-logger';
-import { CloudRunnerFolders } from '../services/cloud-runner-folders';
-import { CloudRunnerStepState } from '../cloud-runner-step-state';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
+import { CloudRunnerFolders } from '../options/cloud-runner-folders';
+import { CloudRunnerStepParameters } from '../options/cloud-runner-step-parameters';
 import { WorkflowInterface } from './workflow-interface';
 import * as core from '@actions/core';
 import { CloudRunnerCommandHooks } from '../services/cloud-runner-hooks/cloud-runner-command-hook';
@@ -9,11 +9,11 @@ import CloudRunner from '../cloud-runner';
 import { CloudRunnerContainerHook } from '../services/cloud-runner-hooks/cloud-runner-container-hook';
 
 export class BuildAutomationWorkflow implements WorkflowInterface {
-  async run(cloudRunnerStepState: CloudRunnerStepState) {
+  async run(cloudRunnerStepState: CloudRunnerStepParameters) {
     return await BuildAutomationWorkflow.standardBuildAutomation(cloudRunnerStepState.image, cloudRunnerStepState);
   }
 
-  private static async standardBuildAutomation(baseImage: string, cloudRunnerStepState: CloudRunnerStepState) {
+  private static async standardBuildAutomation(baseImage: string, cloudRunnerStepState: CloudRunnerStepParameters) {
     // TODO accept post and pre build steps as yaml files in the repo
     CloudRunnerLogger.log(`Cloud Runner is running standard build automation`);
 

src/model/cloud-runner/workflows/custom-workflow.ts

@@ -1,7 +1,7 @@
-import CloudRunnerLogger from '../services/cloud-runner-logger';
-import CloudRunnerSecret from '../services/cloud-runner-secret';
-import { CloudRunnerFolders } from '../services/cloud-runner-folders';
-import CloudRunnerEnvironmentVariable from '../services/cloud-runner-environment-variable';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
+import CloudRunnerSecret from '../options/cloud-runner-secret';
+import { CloudRunnerFolders } from '../options/cloud-runner-folders';
+import CloudRunnerEnvironmentVariable from '../options/cloud-runner-environment-variable';
 import { CloudRunnerContainerHook } from '../services/cloud-runner-hooks/cloud-runner-container-hook';
 import { ContainerHook } from '../services/cloud-runner-hooks/container-hook';
 import CloudRunner from '../cloud-runner';

src/model/cloud-runner/workflows/workflow-composition-root.ts

@@ -1,13 +1,13 @@
-import { CloudRunnerStepState } from '../cloud-runner-step-state';
+import { CloudRunnerStepParameters } from '../options/cloud-runner-step-parameters';
 import { CustomWorkflow } from './custom-workflow';
 import { WorkflowInterface } from './workflow-interface';
 import { BuildAutomationWorkflow } from './build-automation-workflow';
 import CloudRunner from '../cloud-runner';
-import CloudRunnerOptions from '../cloud-runner-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
 import { AsyncWorkflow } from './async-workflow';
 
 export class WorkflowCompositionRoot implements WorkflowInterface {
-  async run(cloudRunnerStepState: CloudRunnerStepState) {
+  async run(cloudRunnerStepState: CloudRunnerStepParameters) {
     try {
       if (
         CloudRunnerOptions.asyncCloudRunner &&
@@ -26,7 +26,7 @@ export class WorkflowCompositionRoot implements WorkflowInterface {
       }
 
       return await new BuildAutomationWorkflow().run(
-        new CloudRunnerStepState(
+        new CloudRunnerStepParameters(
           cloudRunnerStepState.image.toString(),
           cloudRunnerStepState.environment,
           cloudRunnerStepState.secrets,

src/model/cloud-runner/workflows/workflow-interface.ts

@@ -1,8 +1,8 @@
-import { CloudRunnerStepState } from '../cloud-runner-step-state';
+import { CloudRunnerStepParameters } from '../options/cloud-runner-step-parameters';
 
 export interface WorkflowInterface {
   run(
     // eslint-disable-next-line no-unused-vars
-    cloudRunnerStepState: CloudRunnerStepState,
+    cloudRunnerStepState: CloudRunnerStepParameters,
   ): Promise<string>;
 }

src/model/github.ts

@@ -1,6 +1,6 @@
-import CloudRunnerLogger from './cloud-runner/services/cloud-runner-logger';
+import CloudRunnerLogger from './cloud-runner/services/core/cloud-runner-logger';
 import CloudRunner from './cloud-runner/cloud-runner';
-import CloudRunnerOptions from './cloud-runner/cloud-runner-options';
+import CloudRunnerOptions from './cloud-runner/options/cloud-runner-options';
 import * as core from '@actions/core';
 import { Octokit } from '@octokit/core';
 

src/model/input-readers/generic-input-reader.ts

@@ -1,5 +1,5 @@
-import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system';
-import CloudRunnerOptions from '../cloud-runner/cloud-runner-options';
+import { CloudRunnerSystem } from '../cloud-runner/services/core/cloud-runner-system';
+import CloudRunnerOptions from '../cloud-runner/options/cloud-runner-options';
 
 export class GenericInputReader {
   public static async Run(command: string) {

src/model/input-readers/git-repo.test.ts

@@ -1,6 +1,6 @@
 import { GitRepoReader } from './git-repo';
-import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system';
-import CloudRunnerOptions from '../cloud-runner/cloud-runner-options';
+import { CloudRunnerSystem } from '../cloud-runner/services/core/cloud-runner-system';
+import CloudRunnerOptions from '../cloud-runner/options/cloud-runner-options';
 
 describe(`git repo tests`, () => {
   it(`Branch value parsed from CLI to not contain illegal characters`, async () => {

src/model/input-readers/git-repo.ts

@@ -1,8 +1,8 @@
 import { assert } from 'node:console';
 import fs from 'node:fs';
-import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system';
-import CloudRunnerLogger from '../cloud-runner/services/cloud-runner-logger';
-import CloudRunnerOptions from '../cloud-runner/cloud-runner-options';
+import { CloudRunnerSystem } from '../cloud-runner/services/core/cloud-runner-system';
+import CloudRunnerLogger from '../cloud-runner/services/core/cloud-runner-logger';
+import CloudRunnerOptions from '../cloud-runner/options/cloud-runner-options';
 import Input from '../input';
 
 export class GitRepoReader {

src/model/input-readers/github-cli.ts

@@ -1,6 +1,6 @@
-import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system';
+import { CloudRunnerSystem } from '../cloud-runner/services/core/cloud-runner-system';
 import * as core from '@actions/core';
-import CloudRunnerOptions from '../cloud-runner/cloud-runner-options';
+import CloudRunnerOptions from '../cloud-runner/options/cloud-runner-options';
 
 export class GithubCliReader {
   static async GetGitHubAuthToken() {

src/model/input-readers/test-license-reader.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import fs from 'node:fs';
 import YAML from 'yaml';
-import CloudRunnerOptions from '../cloud-runner/cloud-runner-options';
+import CloudRunnerOptions from '../cloud-runner/options/cloud-runner-options';
 
 export function ReadLicense(): string {
   if (CloudRunnerOptions.providerStrategy === 'local') {

src/model/input.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { Cli } from './cli/cli';
-import CloudRunnerQueryOverride from './cloud-runner/services/cloud-runner-query-override';
+import CloudRunnerQueryOverride from './cloud-runner/options/cloud-runner-query-override';
 import Platform from './platform';
 import GitHub from './github';