Merge pull request #450 from cloudflare/fw-rules-dynamic-keys

cloudflare_ruleset: support writing map type nested blocks
cloudflare · Aug 26, 2022 · b68dec6 · b68dec6
2 parents 8e21fee + 42b5b07
commit b68dec6
Show file tree

Hide file tree

Showing 4 changed files with 236 additions and 187 deletions.
diff --git a/internal/app/cf-terraforming/cmd/generate.go b/internal/app/cf-terraforming/cmd/generate.go
@@ -760,6 +760,18 @@ func generateResources() func(cmd *cobra.Command, args []string) {
 									actionParams.(map[string]interface{})[logCustomFields] = newLogCustomFields
 								}
 							}
+							// check if our ruleset is of action 'skip'
+							if rules.([]interface{})[ruleCounter].(map[string]interface{})["action"] == "skip" {
+								for rule := range actionParams.(map[string]interface{}) {
+									for key, value := range actionParams.(map[string]interface{})[rule].(map[string]interface{}) {
+										var rulesList []string
+										for _, val := range value.([]interface{}) {
+											rulesList = append(rulesList, val.(string))
+										}
+										actionParams.(map[string]interface{})[rule].(map[string]interface{})[key] = strings.Join(rulesList, ", ")
+									}
+								}
+							}
 						}
 					}
 				}

diff --git a/internal/app/cf-terraforming/cmd/util.go b/internal/app/cf-terraforming/cmd/util.go
@@ -355,6 +355,8 @@ func writeNestedBlock(attributes []string, schemaBlock *tfjson.SchemaBlock, attr
 			}
 		case ty.IsListType(), ty.IsSetType():
 			nestedBlockOutput += writeAttrLine(attrName, attrStruct[attrName], true)
+		case ty.IsMapType():
+			nestedBlockOutput += writeAttrLine(attrName, attrStruct[attrName], false)
 		default:
 			log.Debugf("unexpected nested type %T for %s", ty, attrName)
 		}