Merge pull request #483 from vdice/fix/no-outputs

fix(adapter.go): don't add empty outputs section to generated bundle
getporter · Aug 1, 2019 · f1a892d · f1a892d
2 parents 94f443a + 7ae6a59
commit f1a892d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 24 deletions.
diff --git a/pkg/cnab/config_adapter/adapter.go b/pkg/cnab/config_adapter/adapter.go
@@ -169,34 +169,38 @@ func (c *ManifestConverter) generateBundleParameters(defs *definition.Definition
 }
 
 func (c *ManifestConverter) generateBundleOutputs(defs *definition.Definitions) *bundle.OutputsDefinition {
- outputs := &bundle.OutputsDefinition{
- Fields: make(map[string]bundle.OutputDefinition, len(c.Manifest.Outputs)),
- }
+ var outputs *bundle.OutputsDefinition
 
- 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),
+ if len(c.Manifest.Outputs) > 0 {
+ outputs = &bundle.OutputsDefinition{
+ Fields: make(map[string]bundle.OutputDefinition, len(c.Manifest.Outputs)),
  }
 
- // Only set definition if it doesn't already exist
- // (Both Params and Outputs may reference same Definition)
- if _, exists := (*defs)[output.Name]; !exists {
- (*defs)[output.Name] = d
+ 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),
+ }
+
+ // Only set definition if it doesn't already exist
+ // (Both Params and Outputs may reference same Definition)
+ if _, exists := (*defs)[output.Name]; !exists {
+ (*defs)[output.Name] = d
+ }
+ outputs.Fields[output.Name] = o
  }
- outputs.Fields[output.Name] = o
  }
  return outputs
 }

diff --git a/pkg/cnab/config_adapter/adapter_test.go b/pkg/cnab/config_adapter/adapter_test.go
@@ -40,6 +40,8 @@ func TestManifestConverter_ToBundle(t *testing.T) {
 
  assert.Contains(t, bun.Custom, config.CustomBundleKey, "Porter stamp was not populated")
  assert.Contains(t, bun.Custom, extensions.DependenciesKey, "Dependencies was not populated")
+
+ assert.Nil(t, bun.Outputs, "expected outputs section not to exist in generated bundle")
 }
 
 func makefloat64(v float64) *float64 {