Merge pull request #6 from Nepomuceno/firewalladd

Adding firewall and basic makefile

Makefile

@@ -0,0 +1,28 @@
+.POSIX:
+
+.PHONY: all
+all: build format validate
+
+.PHONY: install
+install:
+	command -v terraform >/dev/null 2>&1 || GO111MODULE="on" go get github.com/hashicorp/[email protected]
+	command -v terraform-docs >/dev/null 2>&1 || GO111MODULE="on" go get github.com/segmentio/[email protected]
+	command -v tfsec >/dev/null 2>&1 || GO111MODULE="on" go get github.com/liamg/tfsec/cmd/[email protected]
+	command -v tflint >/dev/null 2>&1 || GO111MODULE="on" go get github.com/terraform-linters/[email protected]
+
+.PHONY: build
+build: install generate
+
+.PHONY: generate
+generate:
+	go run main.go
+
+.PHONY: format
+format:
+	terraform fmt
+
+.PHONY: validate
+validate:
+	terraform fmt --check
+	terraform validate -no-color
+	tflint --no-color

README.md

@@ -133,6 +133,10 @@ You can find a list bellow of all the resources that are currently implemented.
 | express\_route\_circuit | n/a |
 | express\_route\_gateway | n/a |
 | firewall | n/a |
+| firewall\_application\_rule\_collection | n/a |
+| firewall\_ip\_configuration | n/a |
+| firewall\_nat\_rule\_collection | n/a |
+| firewall\_network\_rule\_collection | n/a |
 | frontdoor | n/a |
 | frontdoor\_firewall\_policy | n/a |
 | hdinsight\_hadoop\_cluster | n/a |

docs/not_defined.md

@@ -42,10 +42,6 @@
 - virtual_hub_connection
 - virtual_network_gateway_connection
 - vpn_server_configuration
-- firewall_ip_configuration
-- firewall_application_rule_collection
-- firewall_nat_rule_collection
-- firewall_network_rule_collection
 - monitor_action_group
 - monitor_action_rule_action_group
 - monitor_action_rule_suppression

go.mod

@@ -2,4 +2,7 @@ module github.com/azure/terraform-azurerm-naming
 
 go 1.13
 
-require muzzammil.xyz/jsonc v0.0.0-20200303171503-1e787b591db7
+require (
+	github.com/liamg/tfsec v0.21.0 // indirect
+	github.com/terraform-linters/tflint v0.16.2 // indirect
+)

main.go

@@ -6,8 +6,6 @@ import (
 	"log"
 	"os"
 	"text/template"
-
-	"muzzammil.xyz/jsonc"
 )
 
 // Resource definityion for the package
@@ -40,25 +38,23 @@ func main() {
 		log.Fatal(err)
 	}
 
-	sourceDefinitions, err := ioutil.ReadFile("resourceDefinition.jsonc")
+	sourceDefinitions, err := ioutil.ReadFile("resourceDefinition.json")
 	if err != nil {
 		log.Fatal(err)
 	}
 	var data []Resource
-	jc := jsonc.ToJSON(sourceDefinitions)
-	err = json.Unmarshal(jc, &data)
+	err = json.Unmarshal(sourceDefinitions, &data)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	// Undocumented resource definitions
-	sourceDefinitionsUndocumented, err := ioutil.ReadFile("resourceDefinition_out_of_docs.jsonc")
+	sourceDefinitionsUndocumented, err := ioutil.ReadFile("resourceDefinition_out_of_docs.json")
 	if err != nil {
 		log.Fatal(err)
 	}
 	var dataUndocumented []Resource
-	jcUndoc := jsonc.ToJSON(sourceDefinitionsUndocumented)
-	err = json.Unmarshal(jcUndoc, &dataUndocumented)
+	err = json.Unmarshal(sourceDefinitionsUndocumented, &dataUndocumented)
 	if err != nil {
 		log.Fatal(err)
 	}

main.tf

@@ -1661,5 +1661,45 @@ locals {
       scope       = "resourceGroup"
       regex       = "/^(?=.{1,80}$)[a-zA-Z0-9][a-zA-Z0-9\\-\\._]+[a-zA-Z0-9_]$/"
     }
+    firewall_ip_configuration = {
+      name        = substr(join("-", compact([local.prefix, "fwipconf", local.suffix])), 0, 80)
+      name_unique = substr(join("-", compact([local.prefix, "fwipconf", local.suffix_unique])), 0, 80)
+      dashes      = true
+      slug        = "fwipconf"
+      min_length  = 1
+      max_length  = 80
+      scope       = "resourceGroup"
+      regex       = "/^(?=.{1,80}$)[a-zA-Z0-9][a-zA-Z0-9\\-\\._]+[a-zA-Z0-9_]$/"
+    }
+    firewall_application_rule_collection = {
+      name        = substr(join("-", compact([local.prefix, "fwapp", local.suffix])), 0, 80)
+      name_unique = substr(join("-", compact([local.prefix, "fwapp", local.suffix_unique])), 0, 80)
+      dashes      = true
+      slug        = "fwapp"
+      min_length  = 1
+      max_length  = 80
+      scope       = "parent"
+      regex       = "/^(?=.{1,80}$)[a-zA-Z0-9][a-zA-Z0-9\\-\\._]+[a-zA-Z0-9_]$/"
+    }
+    firewall_nat_rule_collection = {
+      name        = substr(join("-", compact([local.prefix, "fwnatrc", local.suffix])), 0, 80)
+      name_unique = substr(join("-", compact([local.prefix, "fwnatrc", local.suffix_unique])), 0, 80)
+      dashes      = true
+      slug        = "fwnatrc"
+      min_length  = 1
+      max_length  = 80
+      scope       = "parent"
+      regex       = "/^(?=.{1,80}$)[a-zA-Z0-9][a-zA-Z0-9\\-\\._]+[a-zA-Z0-9_]$/"
+    }
+    firewall_network_rule_collection = {
+      name        = substr(join("-", compact([local.prefix, "fwnetrc", local.suffix])), 0, 80)
+      name_unique = substr(join("-", compact([local.prefix, "fwnetrc", local.suffix_unique])), 0, 80)
+      dashes      = true
+      slug        = "fwnetrc"
+      min_length  = 1
+      max_length  = 80
+      scope       = "parent"
+      regex       = "/^(?=.{1,80}$)[a-zA-Z0-9][a-zA-Z0-9\\-\\._]+[a-zA-Z0-9_]$/"
+    }
   }
 }

outputs.tf

@@ -654,4 +654,20 @@ output "private_service_connection" {
   value = local.az.private_service_connection
 }
 
+output "firewall_ip_configuration" {
+  value = local.az.firewall_ip_configuration
+}
+
+output "firewall_application_rule_collection" {
+  value = local.az.firewall_application_rule_collection
+}
+
+output "firewall_nat_rule_collection" {
+  value = local.az.firewall_nat_rule_collection
+}
+
+output "firewall_network_rule_collection" {
+  value = local.az.firewall_network_rule_collection
+}
+