deploy: Ensure that non-trivial default flag values are passed through.

This commit is contained in:
Robert van Gent 2020-07-04 10:15:46 -07:00 committed by Bjørn Erik Pedersen
parent 42e150fbfa
commit a1c3e3c1f3

View file

@ -25,6 +25,9 @@ var _ cmder = (*deployCmd)(nil)
// deployCmd supports deploying sites to Cloud providers. // deployCmd supports deploying sites to Cloud providers.
type deployCmd struct { type deployCmd struct {
*baseBuilderCmd *baseBuilderCmd
invalidateCDN bool
maxDeletes int
} }
// TODO: In addition to the "deploy" command, consider adding a "--deploy" // TODO: In addition to the "deploy" command, consider adding a "--deploy"
@ -51,6 +54,8 @@ documentation.
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
cfgInit := func(c *commandeer) error { cfgInit := func(c *commandeer) error {
c.Set("invalidateCDN", cc.invalidateCDN)
c.Set("maxDeletes", cc.maxDeletes)
return nil return nil
} }
comm, err := initializeConfig(true, false, &cc.hugoBuilderCommon, cc, cfgInit) comm, err := initializeConfig(true, false, &cc.hugoBuilderCommon, cc, cfgInit)
@ -69,8 +74,8 @@ documentation.
cmd.Flags().Bool("confirm", false, "ask for confirmation before making changes to the target") cmd.Flags().Bool("confirm", false, "ask for confirmation before making changes to the target")
cmd.Flags().Bool("dryRun", false, "dry run") cmd.Flags().Bool("dryRun", false, "dry run")
cmd.Flags().Bool("force", false, "force upload of all files") cmd.Flags().Bool("force", false, "force upload of all files")
cmd.Flags().Bool("invalidateCDN", true, "invalidate the CDN cache listed in the deployment target") cmd.Flags().BoolVar(&cc.invalidateCDN, "invalidateCDN", true, "invalidate the CDN cache listed in the deployment target")
cmd.Flags().Int("maxDeletes", 256, "maximum # of files to delete, or -1 to disable") cmd.Flags().IntVar(&cc.maxDeletes, "maxDeletes", 256, "maximum # of files to delete, or -1 to disable")
cc.baseBuilderCmd = b.newBuilderBasicCmd(cmd) cc.baseBuilderCmd = b.newBuilderBasicCmd(cmd)