fix(create-commands): rename function type to google-cloud-function

garden-io · Jul 10, 2018 · 49c4c93 · 49c4c93
1 parent a8316d1
commit 49c4c93
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/docs/reference/commands.md b/docs/reference/commands.md
@@ -136,7 +136,7 @@ Examples:
 | Argument | Alias | Type | Description |
 | -------- | ----- | ---- | ----------- |
   | `--name` |  | boolean | Assigns a custom name to the module. (Defaults to name of the current directory.)
-  | `--type` |  | `container` `function` `npm-package`  | Type of module.
+  | `--type` |  | `container` `google-cloud-function` `npm-package`  | Type of module.
 
 ### garden delete config
 

diff --git a/src/commands/create/config-templates.ts b/src/commands/create/config-templates.ts
@@ -24,7 +24,7 @@ import { BaseModuleSpec, ModuleConfig, baseModuleSpecSchema } from "../../types/
  */
 export const MODULE_PROVIDER_MAP = {
   container: "local-kubernetes",
-  function: "local-google-cloud-functions",
+  "google-cloud-function": "local-google-cloud-functions",
   "npm-package": "npm-package",
 }
 
@@ -72,11 +72,11 @@ export function containerTemplate(moduleName: string): DeepPartial<ContainerModu
   }
 }
 
-export function functionTemplate(moduleName: string): DeepPartial<GcfModuleSpec> {
+export function googleCloudFunctionTemplate(moduleName: string): DeepPartial<GcfModuleSpec> {
   return {
     functions: [{
-      name: `${moduleName}-function`,
-      entrypoint: camelCase(`${moduleName}-function`),
+      name: `${moduleName}-google-cloud-function`,
+      entrypoint: camelCase(`${moduleName}-google-cloud-function`),
     }],
   }
 }

diff --git a/src/commands/create/helpers.ts b/src/commands/create/helpers.ts
@@ -9,7 +9,7 @@
 import * as Joi from "joi"
 import {
   containerTemplate,
-  functionTemplate,
+  googleCloudFunctionTemplate,
   npmPackageTemplate,
   ModuleConfigOpts,
   ModuleType,
@@ -27,7 +27,7 @@ import { MODULE_CONFIG_FILENAME } from "../../constants"
 export function prepareNewModuleConfig(name: string, type: ModuleType, path: string): ModuleConfigOpts {
   const moduleTypeTemplate = {
     container: containerTemplate,
-    function: functionTemplate,
+    "google-cloud-function": googleCloudFunctionTemplate,
     "npm-package": npmPackageTemplate,
   }[type]
   return {

diff --git a/src/commands/create/prompts.ts b/src/commands/create/prompts.ts
@@ -38,7 +38,7 @@ const moduleTypeChoices: ModuleTypeChoice[] = [
   },
   {
     name: `google-cloud-function (${chalk.red.italic("experimental")})`,
-    value: "function",
+    value: "google-cloud-function",
   },
   {
     name: `npm package (${chalk.red.italic("experimental")})`,

diff --git a/test/src/commands/create/module.ts b/test/src/commands/create/module.ts
@@ -65,13 +65,13 @@ describe("CreateModuleCommand", () => {
       path: ctx.projectRoot,
     })
   })
-  // garden create module --type=function
+  // garden create module --type=google-cloud-function
   it("should optionally create a module of a specific type (without prompting)", async () => {
     const ctx = await makeTestContext(projectRoot)
-    const { result } = await cmd.action(ctx, { "module-dir": "" }, { name: "", type: "function" })
+    const { result } = await cmd.action(ctx, { "module-dir": "" }, { name: "", type: "google-cloud-function" })
     expect(pick(result.module, ["name", "type", "path"])).to.eql({
       name: "test-project-create-command",
-      type: "function",
+      type: "google-cloud-function",
       path: ctx.projectRoot,
     })
   })