Merge pull request #2890 from devonbleak/f-iam-policy-source-json

data-source/aws_iam_policy_document: Support layering via source_json and override_json attributes

aws/data_source_aws_iam_policy_document.go

@@ -26,10 +26,18 @@ func dataSourceAwsIamPolicyDocument() *schema.Resource {
 		Read: dataSourceAwsIamPolicyDocumentRead,
 
 		Schema: map[string]*schema.Schema{
+			"override_json": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"policy_id": {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"source_json": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"statement": {
 				Type:     schema.TypeList,
 				Required: true,
@@ -94,17 +102,22 @@ func dataSourceAwsIamPolicyDocument() *schema.Resource {
 }
 
 func dataSourceAwsIamPolicyDocumentRead(d *schema.ResourceData, meta interface{}) error {
-	doc := &IAMPolicyDoc{
-		Version: "2012-10-17",
+	doc := &IAMPolicyDoc{}
+
+	if sourceJson, hasSourceJson := d.GetOk("source_json"); hasSourceJson {
+		if err := json.Unmarshal([]byte(sourceJson.(string)), doc); err != nil {
+			return err
+		}
 	}
 
+	doc.Version = "2012-10-17"
+
 	if policyId, hasPolicyId := d.GetOk("policy_id"); hasPolicyId {
 		doc.Id = policyId.(string)
 	}
 
 	var cfgStmts = d.Get("statement").([]interface{})
 	stmts := make([]*IAMPolicyStatement, len(cfgStmts))
-	doc.Statements = stmts
 	for i, stmtI := range cfgStmts {
 		cfgStmt := stmtI.(map[string]interface{})
 		stmt := &IAMPolicyStatement{
@@ -148,6 +161,26 @@ func dataSourceAwsIamPolicyDocumentRead(d *schema.ResourceData, meta interface{}
 		stmts[i] = stmt
 	}
 
+	doc.Statements = append(doc.Statements, stmts...)
+
+	// merge in our override_json
+	if overrideJson, hasOverrideJson := d.GetOk("override_json"); hasOverrideJson {
+		overrideDoc := &IAMPolicyDoc{}
+		if err := json.Unmarshal([]byte(overrideJson.(string)), overrideDoc); err != nil {
+			return err
+		}
+
+		if len(overrideDoc.Id) > 0 {
+			doc.Id = overrideDoc.Id
+		}
+
+		if len(overrideDoc.Statements) > 0 {
+			doc.Statements = append(doc.Statements, overrideDoc.Statements...)
+		}
+	}
+
+	doc.DeDupSids()
+
 	jsonDoc, err := json.MarshalIndent(doc, "", "  ")
 	if err != nil {
 		// should never happen if the above code is correct