Commit1c43a1a

committed

Merge pull requestsorintlab#221 from sgotti/stolonctl_spec_defaults_option

stolonctl: add an option to show defaults cluster spec values

2 parents31cbb41 +a16b11e commit1c43a1aCopy full SHA for 1c43a1a

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,15 @@ var cmdSpec = &cobra.Command{`
`26`	`26`	`Short:"Retrieve the current cluster specification",`
`27`	`27`	`}`
`28`	`28`
	`29`	`+typespecOptionsstruct {`
	`30`	`+defaultsbool`
	`31`	`+}`
	`32`	`+`
	`33`	`+varspecOptsspecOptions`
	`34`	`+`
`29`	`35`	`funcinit() {`
	`36`	`+cmdSpec.PersistentFlags().BoolVar(&specOpts.defaults,"defaults",false,"also show default values")`
	`37`	`+`
`30`	`38`	`cmdStolonCtl.AddCommand(cmdSpec)`
`31`	`39`	`}`
`32`	`40`
`@@ -46,7 +54,11 @@ func spec(cmd *cobra.Command, args []string) {`
`46`	`54`	`ifcd.Cluster.Spec==nil {`
`47`	`55`	`die("no cluster spec available")`
`48`	`56`	`}`
`49`		`-specj,err:=json.MarshalIndent(cd.Cluster.Spec,"","\t")`
	`57`	`+cs:=cd.Cluster.Spec`
	`58`	`+ifspecOpts.defaults {`
	`59`	`+cs=cd.Cluster.DefSpec()`
	`60`	`+}`
	`61`	`+specj,err:=json.MarshalIndent(cs,"","\t")`
`50`	`62`	`iferr!=nil {`
`51`	`63`	`die("failed to marshall spec: %v",err)`
`52`	`64`	`}`

Comments

(0)