feat(outputs): add porter bundle show command; misc review updates

Makefile

@@ -152,7 +152,9 @@ endif
 
 install:
 	mkdir -p $(HOME)/.porter
-	cp -R bin/* $(HOME)/.porter/
+	cp -R bin/bundles $(HOME)/.porter/
+	cp -R bin/mixins $(HOME)/.porter/
+	cp bin/porter* $(HOME)/.porter/
 	ln -f -s $(HOME)/.porter/porter /usr/local/bin/porter
 
 clean: clean-mixins clean-last-testrun

build/testdata/bundles/mysql/porter.yaml

@@ -52,13 +52,3 @@ uninstall:
     purge: true
     releases:
       - "{{ bundle.parameters.mysql-name }}"
-
-outputs:
-- name: mysql-root-password
-  description: "The root MySQL password"
-  type: string
-- name: mysql-password
-  type: string
-  applyTo:
-  - install
-  - upgrade

build/testdata/bundles/wordpress/porter.yaml

@@ -63,4 +63,5 @@ outputs:
     type: string
     applyTo:
       - "install"
-      - "upgrade"
+      - "upgrade"
+    sensitive: true

cmd/porter/bundle.go

@@ -25,6 +25,7 @@ func buildBundlesCommand(p *porter.Porter) *cobra.Command {
 	cmd.AddCommand(buildBundleInstallCommand(p))
 	cmd.AddCommand(buildBundleUpgradeCommand(p))
 	cmd.AddCommand(buildBundleUninstallCommand(p))
+	cmd.AddCommand(buildBundleShowCommand(p))
 
 	return cmd
 }
@@ -37,6 +38,7 @@ func buildBundleAliasCommands(p *porter.Porter) []*cobra.Command {
 		buildUpgradeCommand(p),
 		buildUninstallCommand(p),
 		buildPublishCommand(p),
+		buildShowCommand(p),
 	}
 }
 
@@ -326,3 +328,39 @@ func buildPublishCommand(p *porter.Porter) *cobra.Command {
 	}
 	return cmd
 }
+
+// TODO: test!
+func buildBundleShowCommand(p *porter.Porter) *cobra.Command {
+	opts := porter.ShowOptions{}
+
+	cmd := cobra.Command{
+		Use:   "show",
+		Short: "Show a bundle",
+		Long:  "Displays info relating to a bundle claim, including status and a listing of outputs.",
+		Example: `  porter bundle show [CLAIM]
+
+Optional output formats include json and yaml.
+`,
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			return opts.Validate(args)
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return p.ShowBundle(opts)
+		},
+	}
+
+	f := cmd.Flags()
+	f.StringVarP(&opts.RawFormat, "output", "o", "table",
+		"Specify an output format.  Allowed values: table, json, yaml")
+
+	return &cmd
+}
+
+func buildShowCommand(p *porter.Porter) *cobra.Command {
+	cmd := buildBundleShowCommand(p)
+	cmd.Example = strings.Replace(cmd.Example, "porter bundle show", "porter show", -1)
+	cmd.Annotations = map[string]string{
+		"group": "alias",
+	}
+	return cmd
+}

cmd/porter/main.go

@@ -42,7 +42,7 @@ func buildRootCommand() *cobra.Command {
 	cmd.AddCommand(buildBundlesCommand(p))
 	cmd.AddCommand(buildMixinsCommand(p))
 	cmd.AddCommand(buildCredentialsCommand(p))
-	cmd.AddCommand(buildOutputsCommand(p))
+	// cmd.AddCommand(buildOutputsCommand(p))
 
 	for _, alias := range buildBundleAliasCommands(p) {
 		cmd.AddCommand(alias)

pkg/cnab/provider/duffle.go

@@ -22,7 +22,7 @@ func NewDuffle(c *config.Config) *Duffle {
 	}
 }
 
-func (d *Duffle) newDriver(driverName, bundleName string) (driver.Driver, error) {
+func (d *Duffle) newDriver(driverName, claimName string) (driver.Driver, error) {
 	driverImpl, err := duffledriver.Lookup(driverName)
 	if err != nil {
 		return driverImpl, err
@@ -47,7 +47,7 @@ func (d *Duffle) newDriver(driverName, bundleName string) (driver.Driver, error)
 		}
 
 		// Create outputs sub-directory using the bundle name
-		bundleOutputsDir := filepath.Join(outputsDir, bundleName)
+		bundleOutputsDir := filepath.Join(outputsDir, claimName)
 		err = d.FileSystem.MkdirAll(bundleOutputsDir, 0755)
 		if err != nil {
 			return nil, errors.Wrapf(err, "could not create outputs directory %s for docker driver bind mount", bundleOutputsDir)

pkg/cnab/provider/install.go

@@ -39,7 +39,7 @@ func (d *Duffle) Install(args InstallArguments) error {
 	}
 	c.Parameters = params
 
-	driver, err := d.newDriver(args.Driver, b.Name)
+	driver, err := d.newDriver(args.Driver, c.Name)
 	if err != nil {
 		return errors.Wrap(err, "unable to instantiate driver")
 	}

pkg/cnab/provider/uninstall.go

@@ -37,7 +37,7 @@ func (d *Duffle) Uninstall(args UninstallArguments) error {
 		}
 	}
 
-	driver, err := d.newDriver(args.Driver, claim.Bundle.Name)
+	driver, err := d.newDriver(args.Driver, claim.Name)
 	if err != nil {
 		return errors.Wrap(err, "unable to instantiate driver")
 	}

pkg/cnab/provider/upgrade.go

@@ -37,7 +37,7 @@ func (d *Duffle) Upgrade(args UpgradeArguments) error {
 		}
 	}
 
-	driver, err := d.newDriver(args.Driver, claim.Bundle.Name)
+	driver, err := d.newDriver(args.Driver, claim.Name)
 	if err != nil {
 		return errors.Wrap(err, "unable to instantiate driver")
 	}

pkg/config/manifest.go

@@ -116,6 +116,7 @@ type OutputDefinition struct {
 	Name        string   `yaml:"name"`
 	ApplyTo     []string `yaml:"applyTo,omitempty"`
 	Description string   `yaml:"description,omitempty"`
+	Sensitive   bool     `yaml:"sensitive"`
 
 	Schema `yaml:",inline"`
 }