iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4991 from hashicorp/private_to_sensitive 

rename private to be in line with tfe
This commit is contained in:
Matthew Hooker 2017-06-08 15:43:44 -07:00 committed by GitHub
parent cd147e2da4 33af49d980
commit 934c7dae35
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command/push.go
View File

@ -52,7 +52,7 @@ func (c *PushCommand) Run(args []string) int {
flags.StringVar(&message, "message", "", "message") flags.StringVar(&message, "message", "", "message")
flags.StringVar(&name, "name", "", "name") flags.StringVar(&name, "name", "", "name")
flags.BoolVar(&create, "create", false, "create (deprecated)") flags.BoolVar(&create, "create", false, "create (deprecated)")
flags.Var((*sliceflag.StringFlag)(&privVars), "private", "") flags.Var((*sliceflag.StringFlag)(&privVars), "sensitive", "")
if err := flags.Parse(args); err != nil { if err := flags.Parse(args); err != nil {
return 1 return 1
} }
@ -205,7 +205,7 @@ func (c *PushCommand) Run(args []string) int {
} }
// Collect the variables from CLI args and any var files // Collect the variables from CLI args and any var files
if privs := flags.Lookup("private"); privs != nil { if privs := flags.Lookup("sensitive"); privs != nil {
pvf := privs.Value.(*sliceflag.StringFlag) pvf := privs.Value.(*sliceflag.StringFlag)
pvars := []string(*pvf) pvars := []string(*pvf)
uploadOpts.PrivVars = pvars uploadOpts.PrivVars = pvars
@ -310,7 +310,7 @@ Options:
-token=<token> The access token to use to when uploading -token=<token> The access token to use to when uploading
-private='var1,var2' List of variables to mark as sensitive in Atlas UI. -sensitive='var1,var2' List of variables to mark as sensitive in Atlas UI.
-var 'key=value' Variable for templates, can be used multiple times. -var 'key=value' Variable for templates, can be used multiple times.

2
command/push_test.go
View File

@ -208,7 +208,7 @@ func TestPush_vars(t *testing.T) {
"-var", "one=two", "-var", "one=two",
"-var-file", filepath.Join(testFixture("push-vars"), "vars.json"), "-var-file", filepath.Join(testFixture("push-vars"), "vars.json"),
"-var", "overridden=yes", "-var", "overridden=yes",
"-private", "super,secret", "-sensitive", "super,secret",
filepath.Join(testFixture("push-vars"), "template.json"), filepath.Join(testFixture("push-vars"), "template.json"),
} }
if code := c.Run(args); code != 0 { if code := c.Run(args); code != 0 {

4
website/source/docs/commands/push.html.md
View File

@ -44,10 +44,10 @@ configuration using the options below.
`hashicorp/precise64`, which follows the form `<username>/<buildname>`. This `hashicorp/precise64`, which follows the form `<username>/<buildname>`. This
must be specified here or in your template. must be specified here or in your template.
- `-private` - A comma-separated list of variables that should be marked as - `-sensitive` - A comma-separated list of variables that should be marked as
sensitive in the Terraform Enterprise ui. These variables' keys will be sensitive in the Terraform Enterprise ui. These variables' keys will be
visible, but their values will be redacted. example usage: visible, but their values will be redacted. example usage:
`-var 'supersecretpassword=mypassword' -private=supersecretpassword1` `-var 'supersecretpassword=mypassword' -sensitive=supersecretpassword1`
- `-var` - Set a variable in your packer template. This option can be used - `-var` - Set a variable in your packer template. This option can be used
multiple times. This is useful for setting version numbers for your build. multiple times. This is useful for setting version numbers for your build.