Merge pull request awslabs#79 from govau/snakesonaplane

Add `OutputsAsIs` optional field to metadata for a service
Casecommons · Dec 14, 2018 · 4158206 · 4158206
2 parents 02a57c2 + 2c10f6d
commit 4158206
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/pkg/broker/awsbroker.go b/pkg/broker/awsbroker.go
@@ -232,6 +232,7 @@ func (db Db) ServiceDefinitionToOsb(sd CfnTemplate) osb.Service {
 			"documentationUrl":    sd.Metadata.Spec.DocumentationUrl,
 			"imageUrl":            sd.Metadata.Spec.ImageUrl,
 			"longDescription":     sd.Metadata.Spec.LongDescription,
+			"outputsAsIs":         sd.Metadata.Spec.OutputsAsIs,
 		},
 		PlanUpdatable: aws.Bool(false),
 	}

diff --git a/pkg/broker/types.go b/pkg/broker/types.go
@@ -162,6 +162,7 @@ type CfnTemplate struct {
 			ImageUrl            string   `yaml:"ImageUrl,omitempty"`
 			DocumentationUrl    string   `yaml:"DocumentationUrl,omitempty"`
 			ProviderDisplayName string   `yaml:"ProviderDisplayName,omitempty"`
+			OutputsAsIs         bool     `yaml:"OutputsAsIs,omitempty"`
 			Bindings            struct {
 				IAM struct {
 					AddKeypair bool `yaml:"AddKeypair,omitempty"`

diff --git a/pkg/broker/util.go b/pkg/broker/util.go
@@ -395,6 +395,28 @@ func paramValue(v interface{}) string {
 	return fmt.Sprintf("%v", v)
 }
 
+func leaveOutputsAsIs(service *osb.Service) bool {
+	if service.Metadata == nil {
+		return false
+	}
+	v, found := service.Metadata["outputsAsIs"]
+	if !found {
+		return false
+	}
+	b, ok := v.(bool)
+	if !ok {
+		return false
+	}
+	return b
+}
+
+func toScreamingSnakeCaseIfAppropriate(service *osb.Service, s string) string {
+	if leaveOutputsAsIs(service) {
+		return s
+	}
+	return toScreamingSnakeCase(s)
+}
+
 func getCredentials(service *osb.Service, outputs []*cloudformation.Output, ssmSvc ssmiface.SSMAPI) (map[string]interface{}, error) {
 	credentials := make(map[string]interface{})
 	var ssmValues []string
@@ -410,7 +432,7 @@ func getCredentials(service *osb.Service, outputs []*cloudformation.Output, ssmS
 			credentials[k] = aws.StringValue(o.OutputValue)
 			ssmValues = append(ssmValues, aws.StringValue(o.OutputValue))
 		} else {
-			credentials[toScreamingSnakeCase(aws.StringValue(o.OutputKey))] = aws.StringValue(o.OutputValue)
+			credentials[toScreamingSnakeCaseIfAppropriate(service, aws.StringValue(o.OutputKey))] = aws.StringValue(o.OutputValue)
 			// If the output value starts with "ssm:", we'll get the actual value from SSM
 			if strings.HasPrefix(aws.StringValue(o.OutputValue), cfnOutputSSMValuePrefix) {
 				ssmValues = append(ssmValues, strings.TrimPrefix(aws.StringValue(o.OutputValue), cfnOutputSSMValuePrefix))