refactor: remove unused MeshTenantSorting and move InteractivePrompts

meshcloud · Nov 7, 2023 · 118b510 · 118b510
1 parent a617a47
commit 118b510
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 47 deletions.
diff --git a/...ommands/interactive/InteractivePrompts.ts → src/cli/InteractivePrompts.ts b/...ommands/interactive/InteractivePrompts.ts → src/cli/InteractivePrompts.ts
@@ -1,10 +1,10 @@
 import * as colors from "std/fmt/colors";
 import { Select } from "x/cliffy/prompt";
-import { isWindows } from "../../os.ts";
-import { CollieRepository } from "../../model/CollieRepository.ts";
-import { FoundationRepository } from "../../model/FoundationRepository.ts";
-import { KitModuleRepository } from "../../kit/KitModuleRepository.ts";
-import { Logger } from "../../cli/Logger.ts";
+import { isWindows } from "../os.ts";
+import { CollieRepository } from "../model/CollieRepository.ts";
+import { FoundationRepository } from "../model/FoundationRepository.ts";
+import { KitModuleRepository } from "../kit/KitModuleRepository.ts";
+import { Logger } from "../cli/Logger.ts";
 
 export class InteractivePrompts {
   static async selectFoundation(kit: CollieRepository, logger: Logger) {

diff --git a/src/cli/commandOptionsConventions.ts b/src/cli/commandOptionsConventions.ts
@@ -1,4 +1,4 @@
-import { InteractivePrompts } from "../commands/interactive/InteractivePrompts.ts";
+import { InteractivePrompts } from "./InteractivePrompts.ts";
 import { CollieRepository } from "../model/CollieRepository.ts";
 import { CollieConfig } from "../model/CollieConfig.ts";
 import { Logger } from "./Logger.ts";

diff --git a/src/commands/config/set.command.ts b/src/commands/config/set.command.ts
@@ -3,7 +3,7 @@ import { TopLevelCommand } from "../TopLevelCommand.ts";
 import { CollieConfig } from "../../model/CollieConfig.ts";
 import { Logger } from "../../cli/Logger.ts";
 import { CollieRepository } from "../../model/CollieRepository.ts";
-import { InteractivePrompts } from "../interactive/InteractivePrompts.ts";
+import { InteractivePrompts } from "../../cli/InteractivePrompts.ts";
 import { CLI } from "../../info.ts";
 
 export function registerSetCmd(program: TopLevelCommand) {

diff --git a/src/commands/interactive/MeshTenantSorting.ts b/src/commands/interactive/MeshTenantSorting.ts
diff --git a/src/commands/kit/apply.command.ts b/src/commands/kit/apply.command.ts
@@ -10,7 +10,7 @@ import { FoundationRepository } from "../../model/FoundationRepository.ts";
 import { GlobalCommandOptions } from "../GlobalCommandOptions.ts";
 import { Logger } from "../../cli/Logger.ts";
 import { ModelValidator } from "../../model/schemas/ModelValidator.ts";
-import { InteractivePrompts } from "../interactive/InteractivePrompts.ts";
+import { InteractivePrompts } from "../../cli/InteractivePrompts.ts";
 import { KitModuleRepository } from "../../kit/KitModuleRepository.ts";
 import { CommandOptionError } from "../CommandOptionError.ts";
 import { TopLevelCommand } from "../TopLevelCommand.ts";

diff --git a/src/commands/kit/bundle.command.ts b/src/commands/kit/bundle.command.ts
@@ -17,7 +17,7 @@ import { AzureKitBundle } from "./bundles/azure-caf-es.ts";
 import { AzureKitMeshstackIntegrationBundle } from "./bundles/azure-caf-es-with-meshplatform.ts";
 import { SelectValueOptions } from "x/cliffy/prompt";
 import { FoundationRepository } from "../../model/FoundationRepository.ts";
-import { InteractivePrompts } from "../interactive/InteractivePrompts.ts";
+import { InteractivePrompts } from "../../cli/InteractivePrompts.ts";
 import { ModelValidator } from "../../model/schemas/ModelValidator.ts";
 import { deployFoundation } from "../foundation/deploy.command.ts";
 import { InputParameter, InputSelectParameter } from "../InputParameter.ts";

diff --git a/src/commands/kit/import.command.ts b/src/commands/kit/import.command.ts
@@ -5,7 +5,7 @@ import { TopLevelCommand } from "../TopLevelCommand.ts";
 import { CliApiFacadeFactory } from "../../api/CliApiFacadeFactory.ts";
 import { KitModuleRepository } from "../../kit/KitModuleRepository.ts";
 import { ModelValidator } from "../../model/schemas/ModelValidator.ts";
-import { InteractivePrompts } from "../interactive/InteractivePrompts.ts";
+import { InteractivePrompts } from "../../cli/InteractivePrompts.ts";
 import { CollieHub } from "../../model/CollieHub.ts";
 
 interface ImportOptions {