8f076b7cb3
Previously, we were inconsistent on how we handled argument validation in the CLI. Many commands used cobra.Command's Args property to provide a validator if they took arguments, but commands which did not rarely used cobra.NoArgs to indicate this. This change does two things: 1. Introduce `cmdutil.ArgsFunc` which works like `cmdutil.RunFunc`, it wraps an existing cobra type and lets us control the behavior when an arguments validator fails. 2. Ensure every command sets the Args property with an instance of cmdutil.ArgsFunc. The cmdutil package defines wrapers for all the cobra validators we are using, to prevent us from having to spell out `cmduitl.ArgsFunc(...)` everywhere. Fixes #588
65 lines
1.8 KiB
Go
65 lines
1.8 KiB
Go
// Copyright 2016-2017, Pulumi Corporation. All rights reserved.
|
|
|
|
package cmd
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"path/filepath"
|
|
|
|
"github.com/pkg/errors"
|
|
"github.com/pulumi/pulumi/pkg/util/archive"
|
|
"github.com/pulumi/pulumi/pkg/util/cmdutil"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
// newArchiveCommand creates a command which just builds the archive we would ship to Pulumi.com to
|
|
// do a deployment.
|
|
func newArchiveCommand() *cobra.Command {
|
|
var forceNoDefaultIgnores bool
|
|
var forceDefaultIgnores bool
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "archive <path-to-archive>",
|
|
Short: "create an archive suitable for deployment",
|
|
Args: cmdutil.ExactArgs(1),
|
|
Run: cmdutil.RunFunc(func(cmd *cobra.Command, args []string) error {
|
|
if forceDefaultIgnores && forceNoDefaultIgnores {
|
|
return errors.New("can't specify --no-default-ignores and --default-ignores at the same time")
|
|
}
|
|
|
|
programPath, err := getPackageFilePath()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
pkg, err := getPackage()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
useDeafultIgnores := pkg.UseDefaultIgnores()
|
|
|
|
if forceDefaultIgnores {
|
|
useDeafultIgnores = true
|
|
} else if forceNoDefaultIgnores {
|
|
useDeafultIgnores = false
|
|
}
|
|
|
|
// programPath is the path to the Pulumi.yaml file. Need its parent folder.
|
|
programFolder := filepath.Dir(programPath)
|
|
archiveContents, err := archive.Process(programFolder, useDeafultIgnores)
|
|
if err != nil {
|
|
return errors.Wrap(err, "creating archive")
|
|
}
|
|
|
|
return ioutil.WriteFile(args[0], archiveContents.Bytes(), 0644)
|
|
}),
|
|
}
|
|
cmd.PersistentFlags().BoolVar(
|
|
&forceNoDefaultIgnores, "--no-default-ignores", false,
|
|
"Do not use default ignores, regardless of Pulumi.yaml")
|
|
cmd.PersistentFlags().BoolVar(
|
|
&forceDefaultIgnores, "--default-ignores", false,
|
|
"Use default ignores, regardless of Pulumi.yaml")
|
|
|
|
return cmd
|
|
}
|