Merge pull request #166 from garden-io/no-more-index-ts

chore: rename all index.ts files

src/build-dir.ts

@@ -21,7 +21,7 @@ import {
 import * as Rsync from "rsync"
 import { GARDEN_DIR_NAME } from "./constants"
 import { ConfigurationError } from "./exceptions"
-import { execRsyncCmd } from "./util"
+import { execRsyncCmd } from "./util/util"
 import {
   BuildCopySpec,
   Module,

src/cli/cli.ts

@@ -10,15 +10,15 @@ import * as sywac from "sywac"
 import { merge, intersection } from "lodash"
 import { resolve } from "path"
 import { safeDump } from "js-yaml"
-import { coreCommands } from "../commands"
+import { coreCommands } from "../commands/commands"
 import stringify = require("json-stringify-safe")
 
 import { DeepPrimitiveMap } from "../types/common"
 import {
   enumToArray,
   shutdown,
   sleep,
-} from "../util"
+} from "../util/util"
 import {
   BooleanParameter,
   Command,
@@ -35,7 +35,7 @@ import {
 } from "../exceptions"
 import { Garden } from "../garden"
 
-import { RootLogNode, getLogger } from "../logger"
+import { RootLogNode, getLogger } from "../logger/logger"
 import { LogLevel, LoggerType } from "../logger/types"
 import { BasicTerminalWriter } from "../logger/writers/basic-terminal-writer"
 import { FancyTerminalWriter } from "../logger/writers/fancy-terminal-writer"

src/commands/call.ts

@@ -16,7 +16,7 @@ import {
   ParameterValues,
   StringParameter,
 } from "./base"
-import { splitFirst } from "../util"
+import { splitFirst } from "../util/util"
 import { ParameterError, RuntimeError } from "../exceptions"
 import { EntryStyle } from "../logger/types"
 import { pick } from "lodash"

src/commands/index.ts → src/commands/commands.ts

@@ -9,15 +9,15 @@
 import { Command } from "./base"
 import { BuildCommand } from "./build"
 import { CallCommand } from "./call"
-import { ConfigCommand } from "./config"
+import { ConfigCommand } from "./config/config"
 import { DeployCommand } from "./deploy"
 import { DevCommand } from "./dev"
-import { EnvironmentCommand } from "./environment"
+import { EnvironmentCommand } from "./environment/environment"
 import { LoginCommand } from "./login"
 import { LogoutCommand } from "./logout"
 import { LogsCommand } from "./logs"
 import { PushCommand } from "./push"
-import { RunCommand } from "./run"
+import { RunCommand } from "./run/run"
 import { ScanCommand } from "./scan"
 import { StatusCommand } from "./status"
 import { TestCommand } from "./test"

src/commands/run/module.ts

@@ -21,7 +21,7 @@ import {
   uniq,
   flatten,
 } from "lodash"
-import { printRuntimeContext } from "./index"
+import { printRuntimeContext } from "./run"
 import dedent = require("dedent")
 
 export const runArgs = {

src/commands/run/index.ts → src/commands/run/run.ts

@@ -9,7 +9,7 @@
 import { safeDump } from "js-yaml"
 import { PluginContext } from "../../plugin-context"
 import { RuntimeContext } from "../../types/service"
-import { highlightYaml } from "../../util"
+import { highlightYaml } from "../../util/util"
 import { Command } from "../base"
 import { RunModuleCommand } from "./module"
 import { RunServiceCommand } from "./service"

src/commands/run/service.ts

@@ -17,7 +17,7 @@ import {
   ParameterValues,
   StringParameter,
 } from "../base"
-import { printRuntimeContext } from "./index"
+import { printRuntimeContext } from "./run"
 import dedent = require("dedent")
 
 export const runArgs = {

src/commands/run/test.ts

@@ -14,15 +14,15 @@ import { RunResult } from "../../types/plugin/outputs"
 import {
   findByName,
   getNames,
-} from "../../util"
+} from "../../util/util"
 import {
   BooleanParameter,
   Command,
   CommandResult,
   ParameterValues,
   StringParameter,
 } from "../base"
-import { printRuntimeContext } from "./index"
+import { printRuntimeContext } from "./run"
 import dedent = require("dedent")
 
 export const runArgs = {

src/commands/scan.ts

@@ -9,7 +9,7 @@
 import { safeDump } from "js-yaml"
 import { PluginContext } from "../plugin-context"
 import { DeepPrimitiveMap } from "../types/common"
-import { highlightYaml } from "../util"
+import { highlightYaml } from "../util/util"
 import {
   Command,
   CommandResult,

src/commands/status.ts

@@ -15,7 +15,7 @@ import {
   Command,
   CommandResult,
 } from "./base"
-import { highlightYaml } from "../util"
+import { highlightYaml } from "../util/util"
 
 export class StatusCommand extends Command {
   name = "status"

src/config-store.ts

@@ -13,7 +13,7 @@ import * as yaml from "js-yaml"
 import { get, isPlainObject, unset } from "lodash"
 import { joiIdentifier, Primitive, validate } from "./types/common"
 import { LocalConfigError } from "./exceptions"
-import { dumpYaml } from "./util"
+import { dumpYaml } from "./util/util"
 
 export type ConfigValue = Primitive | Primitive[]
 

src/docs/commands.ts

@@ -13,7 +13,7 @@ import {
 import * as handlebars from "handlebars"
 import { resolve } from "path"
 import { GLOBAL_OPTIONS } from "../cli/cli"
-import { coreCommands } from "../commands"
+import { coreCommands } from "../commands/commands"
 import { flatten } from "lodash"
 import { describeParameters } from "../commands/base"
 

src/garden.ts

@@ -30,7 +30,7 @@ import {
 import {
   builtinPlugins,
   fixedPlugins,
-} from "./plugins"
+} from "./plugins/plugins"
 import {
   Module,
 } from "./types/module"
@@ -42,14 +42,14 @@ import {
   pluginSchema,
   Provider,
   RegisterPluginParam,
-} from "./types/plugin"
+} from "./types/plugin/plugin"
 import { EnvironmentConfig } from "./types/project"
 import {
   findByName,
   getIgnorer,
   getNames,
   scanDirectory,
-} from "./util"
+} from "./util/util"
 import {
   DEFAULT_NAMESPACE,
   MODULE_CONFIG_FILENAME,
@@ -69,14 +69,14 @@ import {
 import {
   getLogger,
   RootLogNode,
-} from "./logger"
+} from "./logger/logger"
 import {
   pluginActionNames,
   PluginActions,
   PluginFactory,
   GardenPlugin,
   ModuleActions,
-} from "./types/plugin"
+} from "./types/plugin/plugin"
 import {
   Environment,
   joiIdentifier,

src/logger/renderers.ts

@@ -15,7 +15,7 @@ import hasAnsi = require("has-ansi")
 
 import { duration } from "./util"
 import { LogSymbolType, EntryStyle } from "./types"
-import { LogEntry } from "./index"
+import { LogEntry } from "./logger"
 
 export type ToRender = string | ((...args: any[]) => string)
 export type Renderer = [ToRender, any[]] | ToRender[]

src/logger/util.ts

@@ -7,7 +7,7 @@
  */
 
 import { LogEntryOpts, LogLevel } from "./types"
-import { LogEntry, LogNode } from "."
+import { LogEntry, LogNode } from "./logger"
 
 export interface Node {
   children: any[]

src/logger/writers/base.ts

@@ -10,7 +10,7 @@ import {
   LogLevel,
 } from "../types"
 
-import { LogEntry, RootLogNode } from "../index"
+import { LogEntry, RootLogNode } from "../logger"
 
 export interface WriterConfig {
   level?: LogLevel

src/logger/writers/basic-terminal-writer.ts

@@ -12,7 +12,7 @@ import {
 import {
   formatForTerminal,
 } from "../renderers"
-import { LogEntry, RootLogNode } from "../index"
+import { LogEntry, RootLogNode } from "../logger"
 import { validate } from "../util"
 import { Writer } from "./base"
 

src/logger/writers/fancy-terminal-writer.ts

@@ -21,8 +21,8 @@ import {
   leftPad,
   renderMsg,
 } from "../renderers"
-import { LogEntry, RootLogNode } from "../index"
-import { sleep } from "../../util"
+import { LogEntry, RootLogNode } from "../logger"
+import { sleep } from "../../util/util"
 import { getChildEntries, getTerminalWidth, interceptStream, validate } from "../util"
 import { Writer, WriterConfig } from "./base"
 

src/logger/writers/file-writer.ts

@@ -14,7 +14,7 @@ import { ensureDir, truncate } from "fs-extra"
 import {
   LogLevel,
 } from "../types"
-import { LogEntry } from "../index"
+import { LogEntry } from "../logger"
 import { Writer } from "./base"
 import { validate } from "../util"
 import {

src/plugin-context.ts

@@ -32,7 +32,7 @@ import {
   ModuleActions,
   Provider,
   ServiceActions,
-} from "./types/plugin"
+} from "./types/plugin/plugin"
 import {
   BuildResult,
   BuildStatus,
@@ -86,7 +86,7 @@ import {
 } from "lodash"
 import {
   Omit,
-} from "./util"
+} from "./util/util"
 import { TreeVersion } from "./vcs/base"
 
 export type PluginContextGuard = {

src/plugins/container.ts

@@ -25,7 +25,7 @@ import { join } from "path"
 import { ConfigurationError } from "../exceptions"
 import {
   GardenPlugin,
-} from "../types/plugin"
+} from "../types/plugin/plugin"
 import {
   BuildModuleParams,
   GetModuleBuildStatusParams,
@@ -40,7 +40,7 @@ import {
   ServiceConfig,
 } from "../types/service"
 import { DEFAULT_PORT_PROTOCOL } from "../constants"
-import { splitFirst } from "../util"
+import { splitFirst } from "../util/util"
 import { keyBy } from "lodash"
 import {
   genericModuleSpecSchema,

src/plugins/generic.ts

@@ -14,7 +14,7 @@ import {
 } from "../types/common"
 import {
   GardenPlugin,
-} from "../types/plugin"
+} from "../types/plugin/plugin"
 import {
   Module,
   ModuleConfig,
@@ -39,7 +39,7 @@ import {
   BaseTestSpec,
   baseTestSpecSchema,
 } from "../types/test"
-import { spawn } from "../util"
+import { spawn } from "../util/util"
 
 export const name = "generic"
 

src/plugins/google/common.ts

@@ -20,7 +20,7 @@ import { GenericTestSpec } from "../generic"
 import { GCloud } from "./gcloud"
 import {
   Provider,
-} from "../../types/plugin"
+} from "../../types/plugin/plugin"
 
 export const GOOGLE_CLOUD_DEFAULT_REGION = "us-central1"
 

src/plugins/google/gcloud.ts

@@ -8,7 +8,7 @@
 
 import { spawn } from "child_process"
 import { extend } from "lodash"
-import { spawnPty } from "../../util"
+import { spawnPty } from "../../util/util"
 
 export interface GCloudParams {
   data?: Buffer,

src/plugins/google/google-app-engine.ts

@@ -26,10 +26,10 @@ import {
   ContainerModuleSpec,
   ContainerServiceSpec,
 } from "../container"
-import { dumpYaml } from "../../util"
+import { dumpYaml } from "../../util/util"
 import {
   GardenPlugin,
-} from "../../types/plugin"
+} from "../../types/plugin/plugin"
 
 export interface GoogleAppEngineServiceSpec extends ContainerServiceSpec {
   project?: string

src/plugins/google/google-cloud-functions.ts

@@ -42,7 +42,7 @@ import {
 } from "./common"
 import {
   GardenPlugin,
-} from "../../types/plugin"
+} from "../../types/plugin/plugin"
 
 export interface GcfServiceSpec extends GoogleCloudServiceSpec {
   function: string,

src/plugins/kubernetes/actions.ts

@@ -40,7 +40,7 @@ import {
   helpers,
 } from "../container"
 import { values, every, uniq } from "lodash"
-import { deserializeKeys, serializeKeys, splitFirst, sleep } from "../../util"
+import { deserializeKeys, serializeKeys, splitFirst, sleep } from "../../util/util"
 import { ServiceStatus } from "../../types/service"
 import { joiIdentifier } from "../../types/common"
 import {
@@ -66,7 +66,7 @@ import {
   checkDeploymentStatus,
 } from "./status"
 
-import { name as providerName } from "./index"
+import { name as providerName } from "./kubernetes"
 
 const MAX_STORED_USERNAMES = 5
 

src/plugins/kubernetes/ingress.ts

@@ -7,9 +7,9 @@
  */
 
 import { PluginContext } from "../../plugin-context"
-import { findByName } from "../../util"
+import { findByName } from "../../util/util"
 import { ContainerService } from "../container"
-import { KubernetesProvider } from "./index"
+import { KubernetesProvider } from "./kubernetes"
 
 export async function createIngress(ctx: PluginContext, provider: KubernetesProvider, service: ContainerService) {
   // FIXME: ingresses don't get updated when deployment is already running (rethink status check)

src/plugins/kubernetes/kubectl.ts

@@ -9,9 +9,9 @@
 import chalk from "chalk"
 import { ChildProcess, spawn } from "child_process"
 import { extend } from "lodash"
-import { spawnPty } from "../../util"
+import { spawnPty } from "../../util/util"
 import { RuntimeError } from "../../exceptions"
-import { getLogger } from "../../logger"
+import { getLogger } from "../../logger/logger"
 import hasAnsi = require("has-ansi")
 
 export interface KubectlParams {

src/plugins/kubernetes/index.ts → src/plugins/kubernetes/kubernetes.ts

@@ -11,7 +11,7 @@ import { validate } from "../../types/common"
 import {
   GardenPlugin,
   Provider,
-} from "../../types/plugin"
+} from "../../types/plugin/plugin"
 import {
   ProviderConfig,
   providerConfigBase,