Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove language default and fix command flags #170

Merged
merged 1 commit into from
Oct 23, 2017
Merged

Remove language default and fix command flags #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion MANUAL_CLI.md
View file
Open in desktop
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 \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have an extra space here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johnmccabe can you push this fixed? ^ extra space between = and node

--name=node_info \
--handler=./sample/node_info

Expand Down
2 changes: 1 addition & 1 deletion commands/build.go
View file
Open in desktop
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")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good edit.


// 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,15 @@ import (
)

var (
verboseInvoke bool
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happened to verboseInvoke?

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
View file
Open in desktop
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")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good refactor.

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