Skip to content

Commit

Permalink
Remove language default and fix command flags
Browse files Browse the repository at this point in the history
This commit stops using `node` as a default language due to it
conflicting with functions where the `fprocess` is set in the image.

Given the large numbers of languages having a default makes less sense
now.

It also removes some of the copy-paste/redundant/irrelevant flag
definitions that ended up in newly added subcommands.

Signed-off-by: John McCabe <[email protected]>
  • Loading branch information
johnmccabe authored and alexellis committed Oct 23, 2017
1 parent b05b529 commit 1d336ee
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 12 deletions.
3 changes: 2 additions & 1 deletion MANUAL_CLI.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ So if you want to write in another language, just prepare a Dockerfile and build

This will generate a Docker image for a Node.js function using the code in `/samples/info`.

* The `faas-cli build` command can accept a `--lang` option of `python` or `node` and is `node` by default.
* The `faas-cli build` command can accept a `--lang` option of `python`, `node`, `ruby`, `csharp`, `python3`, `go`, or `dockerfile`.

```
$ faas-cli build \
--image=alexellis2/node_info \
--lang= node \
--name=node_info \
--handler=./sample/node_info
Expand Down
2 changes: 1 addition & 1 deletion commands/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func init() {
buildCmd.Flags().StringVar(&image, "image", "", "Docker image name to build")
buildCmd.Flags().StringVar(&handler, "handler", "", "Directory with handler for function, e.g. handler.js")
buildCmd.Flags().StringVar(&functionName, "name", "", "Name of the deployed function")
buildCmd.Flags().StringVar(&language, "lang", "node", "Programming language template")
buildCmd.Flags().StringVar(&language, "lang", "", "Programming language template")

// Setup flags that are used only by this command (variables defined above)
buildCmd.Flags().BoolVar(&nocache, "no-cache", false, "Do not use Docker's build cache")
Expand Down
2 changes: 1 addition & 1 deletion commands/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func init() {
deployCmd.Flags().StringVar(&gateway, "gateway", defaultGateway, "Gateway URI")
deployCmd.Flags().StringVar(&handler, "handler", "", "Directory with handler for function, e.g. handler.js")
deployCmd.Flags().StringVar(&image, "image", "", "Docker image name to build")
deployCmd.Flags().StringVar(&language, "lang", "node", "Programming language template")
deployCmd.Flags().StringVar(&language, "lang", "", "Programming language template")
deployCmd.Flags().StringVar(&functionName, "name", "", "Name of the deployed function")
deployCmd.Flags().StringVar(&network, "network", defaultNetwork, "Name of the network")

Expand Down
5 changes: 1 addition & 4 deletions commands/invoke.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,15 @@ import (
)

var (
verboseInvoke bool
contentType string
contentType string
)

func init() {
// Setup flags that are used by multiple commands (variables defined in faas.go)
invokeCmd.Flags().StringVar(&functionName, "name", "", "Name of the deployed function")
invokeCmd.Flags().StringVar(&gateway, "gateway", defaultGateway, "Gateway URI")

invokeCmd.Flags().StringVar(&language, "lang", "node", "Programming language template")
invokeCmd.Flags().StringVar(&contentType, "content-type", "text/plain", "The content-type HTTP header such as application/json")
invokeCmd.Flags().BoolVar(&verboseInvoke, "verbose", false, "Verbose output for the function list")

faasCmd.AddCommand(invokeCmd)
}
Expand Down
5 changes: 0 additions & 5 deletions commands/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,7 @@ var (

func init() {
// Setup flags that are used by multiple commands (variables defined in faas.go)
listCmd.Flags().StringVar(&fprocess, "fprocess", "", "Fprocess to be run by the watchdog")
listCmd.Flags().StringVar(&gateway, "gateway", defaultGateway, "Gateway URI")
listCmd.Flags().StringVar(&handler, "handler", "", "Directory with handler for function, e.g. handler.js")
listCmd.Flags().StringVar(&image, "image", "", "Docker image name to build")
listCmd.Flags().StringVar(&language, "lang", "node", "Programming language template")
listCmd.Flags().StringVar(&functionName, "name", "", "Name of the deployed function")

listCmd.Flags().BoolVar(&verboseList, "verbose", false, "Verbose output for the function list")

Expand Down

0 comments on commit 1d336ee

Please sign in to comment.