Feat: bundle outputs

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/.gitignore

@@ -1,2 +1,2 @@
 Dockerfile
-cnab/
+.cnab

build/testdata/bundles/mysql/porter.yaml

@@ -45,6 +45,7 @@ install:
     - name: mysql-password
       secret: "{{ bundle.parameters.mysql-name }}"
       key: mysql-password
+
 uninstall:
 - helm:
     description: "Uninstall MySQL"

build/testdata/bundles/terraform/.gitignore

@@ -0,0 +1,2 @@
+Dockerfile
+.cnab

build/testdata/bundles/terraform/porter.yaml

@@ -16,13 +16,17 @@ install:
       autoApprove: true
       vars:
         file_contents: "{{bundle.parameters.file_contents}}"
+      outputs:
+        - name: file_contents
 
 upgrade:
   - terraform:
       description: "Upgrade Terraform assets"
       autoApprove: true
       vars:
         file_contents: "{{ bundle.parameters.file_contents }}"
+      outputs:
+        - name: file_contents
 
 status:
   - terraform:
@@ -34,3 +38,10 @@ uninstall:
       description: "Uninstall Terraform assets"
       vars:
         file_contents: "{{bundle.parameters.file_contents}}"
+
+outputs:
+  - name: file_contents
+    type: string
+    applyTo:
+      - install
+      - upgrade

build/testdata/bundles/terraform/terraform/outputs.tf

@@ -0,0 +1,4 @@
+output "file_contents" {
+  value = "${var.file_contents}"
+  description = "Contents of the file 'foo'"
+}

build/testdata/bundles/wordpress/.gitignore

@@ -1,2 +1,2 @@
 Dockerfile
-cnab/
+.cnab

build/testdata/bundles/wordpress/porter.yaml

@@ -45,10 +45,23 @@ install:
         externalDatabase.password: "{{ bundle.dependencies.mysql.outputs.mysql-password }}"
         externalDatabase.port: 3306
         mariadb.enabled: false
+      outputs:
+        - name: wordpress-password
+          secret: "{{ bundle.parameters.wordpress-name }}-wordpress"
+          key: wordpress-password
 
 uninstall:
   - helm:
       description: "Uninstall Wordpress"
       purge: true
       releases: 
         - "{{ bundle.parameters.wordpress-name }}"
+
+outputs:
+  - name: wordpress-password
+    description: "The Wordpress installation password"
+    type: string
+    applyTo:
+      - "install"
+      - "upgrade"
+    sensitive: true

cmd/porter/bundle.go

@@ -3,9 +3,10 @@ package main
 import (
 	"strings"
 
+	"github.com/spf13/cobra"
+
 	"github.com/deislabs/porter/pkg/porter"
 	"github.com/deislabs/porter/pkg/printer"
-	"github.com/spf13/cobra"
 )
 
 func buildBundlesCommand(p *porter.Porter) *cobra.Command {
@@ -25,6 +26,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 +39,7 @@ func buildBundleAliasCommands(p *porter.Porter) []*cobra.Command {
 		buildUpgradeCommand(p),
 		buildUninstallCommand(p),
 		buildPublishCommand(p),
+		buildShowCommand(p),
 	}
 }
 
@@ -326,3 +329,38 @@ func buildPublishCommand(p *porter.Porter) *cobra.Command {
 	}
 	return cmd
 }
+
+func buildBundleShowCommand(p *porter.Porter) *cobra.Command {
+	opts := porter.ShowOptions{}
+
+	cmd := cobra.Command{
+		Use:   "show [CLAIM]",
+		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, p.Context)
+		},
+		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
+}

docs/content/authoring-bundles.md

@@ -8,6 +8,7 @@ Porter generates a bundle from its manifest, porter.yaml. The manifest is made u
 * [Bundle Metadata](#bundle-metadata)
 * [Mixins](#mixins)
 * [Parameters](#parameters)
+* [Outputs](#outputs)
 * [Credentials](#credentials)
 * [Bundle Actions](#bundle-actions)
 * [Dependencies](#dependencies)
@@ -87,11 +88,37 @@ parameters:
   * `path`: The path for the file. Required for file paths, there is no default.
 * `sensitive`: Optional. Designate this parameter's value as sensitive, for masking in console output.
 
-### Parameter Schema
+## Outputs
 
-The [CNAB Spec for parameter definitions](https://github.com/deislabs/cnab-spec/blob/master/101-bundle-json.md#definitions)
-has full support for [json schema](https://json-schema.org). We aren't quite there yet but 
-are working towards it. Here is what Porter supports for defining schema for parameters currently:
+Outputs are part of the [CNAB Spec](https://github.com/deislabs/cnab-spec/blob/master/101-bundle-json.md#outputs) to
+allow access to outputs generated during the course of executing a bundle.  These are global/bundle-wide outputs,
+as opposed to step outputs described in [Parameters, Credentials and Outputs](/wiring/).  However, as of writing, each
+bundle output is only valid if it references a step output declared under one or more [bundle actions](#bundle-actions).
+
+```yaml
+outputs:
+- name: mysql_user
+  type: string
+  description: "MySQL user name"
+- name: mysql_password
+  type: string
+  applyTo:
+    - "install"
+    - "upgrade"
+```
+
+* `name`: The name of the output.
+* `type`: The data type of the output: string, integer, number, boolean.
+* `applyTo`: (Optional) Restrict this output to a given list of actions. If empty or missing, applies to all actions.
+* `description`: (Optional) A brief description of the given output.
+* `sensitive`: (Optional) Designate an output as sensitive. Defaults to false.
+
+### Definition Schema for Parameters and Outputs
+
+The [CNAB Spec for definitions](https://github.com/deislabs/cnab-spec/blob/master/101-bundle-json.md#definitions)
+applies to both parameters and outputs.  It has full support for [json schema](https://json-schema.org). We aren't
+quite there yet but are working towards it. Here is what Porter supports for defining schema for parameters and outputs
+currently:
 
 * `default`: The default value for the parameter. When a default is not provided, the `required` is defaulted to true.
 * `required`: Specify if the parameter must be specified when the bundle is executed.

docs/content/cli.md

@@ -202,7 +202,7 @@ Global Flags:
 This command is available both as `porter bundle list` and `porter bundles list`.
 
 ```console
- $ porter bundle list --help
+$ porter bundle list --help
 List all bundles installed by Porter.
 
 A listing of bundles currently installed by Porter will be provided, along with
@@ -226,6 +226,31 @@ Global Flags:
       --debug   Enable debug logging
 ```
 
+### Bundle Show
+
+This command is available both as `porter bundle show` and `porter bundles show`.
+
+```console
+$ porter bundle show --help
+Displays info relating to a bundle claim, including status and a listing of outputs.
+
+Usage:
+  porter bundles show [CLAIM] [flags]
+
+Examples:
+  porter bundle show [CLAIM]
+
+Optional output formats include json and yaml.
+
+
+Flags:
+  -h, --help            help for show
+  -o, --output string   Specify an output format.  Allowed values: table, json, yaml (default "table")
+
+Global Flags:
+      --debug   Enable debug logging
+```
+
 ## Mixin Commands
 
 ### Mixins List

examples/kubernetes-mixin-example/porter.yaml

@@ -23,13 +23,21 @@ install:
           resourceType: service
           resourceName: nginx-deployment
           jsonPath: "{.spec.clusterIP}"
+
   - exec:
       description: "Echo the IP Address"
       command: bash
       arguments:
         - -c
         - "echo 'You will find the service at: {{bundle.outputs.IP_ADDRESS}}'"
+
 uninstall:
   - kubernetes:
       description: "Uninstall Hello World"
+      manifests:
+        - manifests/nginx
       wait: true
+
+outputs:
+  - name: ip_address
+    type: string

pkg/cnab/config_adapter/adapter.go

@@ -2,6 +2,7 @@ package configadapter
 
 import (
 	"fmt"
+	"path/filepath"
 	"strings"
 
 	"github.com/deislabs/cnab-go/bundle/definition"
@@ -35,17 +36,18 @@ func (c *ManifestConverter) ToBundle() *bundle.Bundle {
 		},
 	}
 
+	b.Definitions = make(definition.Definitions, len(c.Manifest.Parameters)+len(c.Manifest.Outputs))
 	b.InvocationImages = []bundle.InvocationImage{image}
-	b.Definitions, b.Parameters = c.generateBundleParameters()
+	b.Parameters = c.generateBundleParameters(&b.Definitions)
+	b.Outputs = c.generateBundleOutputs(&b.Definitions)
 	b.Credentials = c.generateBundleCredentials()
 	b.Images = c.generateBundleImages()
 	b.Custom[config.CustomBundleKey] = c.GenerateStamp()
 
 	return b
 }
 
-func (c *ManifestConverter) generateBundleParameters() (definition.Definitions, *bundle.ParametersDefinition) {
-	defs := make(definition.Definitions, len(c.Manifest.Parameters))
+func (c *ManifestConverter) generateBundleParameters(defs *definition.Definitions) *bundle.ParametersDefinition {
 	params := &bundle.ParametersDefinition{
 		Fields: make(map[string]bundle.ParameterDefinition, len(c.Manifest.Parameters)),
 	}
@@ -83,10 +85,39 @@ func (c *ManifestConverter) generateBundleParameters() (definition.Definitions,
 			}
 		}
 
-		defs[param.Name] = d
+		(*defs)[param.Name] = d
 		params.Fields[param.Name] = p
 	}
-	return defs, params
+	return params
+}
+
+func (c *ManifestConverter) generateBundleOutputs(defs *definition.Definitions) *bundle.OutputsDefinition {
+	outputs := &bundle.OutputsDefinition{
+		Fields: make(map[string]bundle.OutputDefinition, len(c.Manifest.Outputs)),
+	}
+
+	for _, output := range c.Manifest.Outputs {
+		fmt.Fprintf(c.Out, "Generating output definition %s ====>\n", output.Name)
+		d := &definition.Schema{
+			Type:      output.Type,
+			Default:   output.Default,
+			Enum:      output.Enum,
+			Minimum:   output.Minimum,
+			Maximum:   output.Maximum,
+			MinLength: output.MinLength,
+			MaxLength: output.MaxLength,
+		}
+		o := bundle.OutputDefinition{
+			Definition:  output.Name,
+			Description: output.Description,
+			ApplyTo:     output.ApplyTo,
+			Path:        filepath.Join(config.BundleOutputsDir, output.Name),
+		}
+
+		(*defs)[output.Name] = d
+		outputs.Fields[output.Name] = o
+	}
+	return outputs
 }
 
 func (c *ManifestConverter) buildDefaultPorterParameters() []config.ParameterDefinition {