feat(cli): add --var shorthand for --variable (#8710)

`--variable` is used frequently enough to deserve a shorthand. Unfortunately,
`-v` is taken by verbose, and `-V` is too easily confused with version or
verbose, so we're left with "--var".
This commit is contained in:
Ammar Bandukwala
2023-07-25 09:36:02 -05:00
committed by GitHub
parent 30e16052d6
commit 2a01747804
9 changed files with 38 additions and 6 deletions

View File

@ -170,6 +170,11 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
Description: "Specify a set of values for Terraform-managed variables.", Description: "Specify a set of values for Terraform-managed variables.",
Value: clibase.StringArrayOf(&variables), Value: clibase.StringArrayOf(&variables),
}, },
{
Flag: "var",
Description: "Alias of --variable.",
Value: clibase.StringArrayOf(&variables),
},
{ {
Flag: "provisioner-tag", Flag: "provisioner-tag",
Description: "Specify a set of tags to target provisioner daemons.", Description: "Specify a set of tags to target provisioner daemons.",

View File

@ -291,6 +291,11 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
Description: "Specify a set of values for Terraform-managed variables.", Description: "Specify a set of values for Terraform-managed variables.",
Value: clibase.StringArrayOf(&variables), Value: clibase.StringArrayOf(&variables),
}, },
{
Flag: "var",
Description: "Alias of --variable.",
Value: clibase.StringArrayOf(&variables),
},
{ {
Flag: "provisioner-tag", Flag: "provisioner-tag",
Description: "Specify a set of tags to target provisioner daemons.", Description: "Specify a set of tags to target provisioner daemons.",

View File

@ -34,6 +34,9 @@ Create a template from the current directory or as specified by flag
--provisioner-tag string-array --provisioner-tag string-array
Specify a set of tags to target provisioner daemons. Specify a set of tags to target provisioner daemons.
--var string-array
Alias of --variable.
--variable string-array --variable string-array
Specify a set of values for Terraform-managed variables. Specify a set of values for Terraform-managed variables.

View File

@ -32,6 +32,9 @@ Push a new template version from the current directory or as specified by flag
--provisioner-tag string-array --provisioner-tag string-array
Specify a set of tags to target provisioner daemons. Specify a set of tags to target provisioner daemons.
--var string-array
Alias of --variable.
--variable string-array --variable string-array
Specify a set of values for Terraform-managed variables. Specify a set of values for Terraform-managed variables.

View File

@ -81,6 +81,14 @@ Disable the default behavior of granting template access to the 'everyone' group
Specify a set of tags to target provisioner daemons. Specify a set of tags to target provisioner daemons.
### --var
| | |
| ---- | ------------------------- |
| Type | <code>string-array</code> |
Alias of --variable.
### --variable ### --variable
| | | | | |

View File

@ -80,6 +80,14 @@ Specify a name for the new template version. It will be automatically generated
Specify a set of tags to target provisioner daemons. Specify a set of tags to target provisioner daemons.
### --var
| | |
| ---- | ------------------------- |
| Type | <code>string-array</code> |
Alias of --variable.
### --variable ### --variable
| | | | | |

View File

@ -62,10 +62,10 @@ provider "artifactory" {
} }
``` ```
When pushing the template, you can pass in the variables using the `--variable` flag: When pushing the template, you can pass in the variables using the `-V` flag:
```sh ```sh
coder templates push --variable 'jfrog_url=https://YYY.jfrog.io' --variable 'artifactory_access_token=XXX' coder templates push --var 'jfrog_url=https://YYY.jfrog.io' --var 'artifactory_access_token=XXX'
``` ```
## Installing jf ## Installing jf

View File

@ -35,10 +35,10 @@ Coder. Consult the [migration](https://coder.com/docs/v2/latest/templates/parame
documentation for details on how to do so. documentation for details on how to do so.
To supply values to existing existing Terraform variables you can specify the To supply values to existing existing Terraform variables you can specify the
`--variable` flag. For example `-V` flag. For example
```bash ```bash
coder templates create envbox --variable namespace="mynamespace" --variable max_cpus=2 --variable min_cpus=1 --variable max_memory=4 --variable min_memory=1 coder templates create envbox --var namespace="mynamespace" --var max_cpus=2 --var min_cpus=1 --var max_memory=4 --var min_memory=1
``` ```
## Contributions ## Contributions

View File

@ -22,8 +22,8 @@ This template provisions a [code-server](https://github.com/coder/code-server) i
```bash ```bash
coder templates create fly-docker-image \ coder templates create fly-docker-image \
--variable fly_api_token=$(flyctl auth token) \ --var fly_api_token=$(flyctl auth token) \
--variable fly_org=personal --var fly_org=personal
``` ```
> If the Coder server is also running as a fly.io app, then instead of setting variable `fly_api_token` you can also set a fly.io secret with the name `FLY_API_TOKEN` > If the Coder server is also running as a fly.io app, then instead of setting variable `fly_api_token` you can also set a fly.io secret with the name `FLY_API_TOKEN`