From 8e8c2118b701f05f880858493a3fe008b4cea271 Mon Sep 17 00:00:00 2001 From: Roland Schoen Date: Tue, 18 Oct 2022 13:52:25 +0200 Subject: [PATCH 1/8] - Increase length of azurerm_windows_virtual_machine and azurerm_windows_virtual_machine_scale_set - Updated docs --- azurecaf/models_generated.go | 6 +++--- docs/resources/azurecaf_name.md | 4 ++-- resourceDefinition.json | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/azurecaf/models_generated.go b/azurecaf/models_generated.go index a504003..b421437 100644 --- a/azurecaf/models_generated.go +++ b/azurecaf/models_generated.go @@ -1,6 +1,6 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated by robots at -// 2022-09-28 05:31:00.230127042 +0000 UTC m=+0.003704126 +// 2022-10-18 13:50:29.866316452 +0200 CEST m=+0.002999251 // using data from // resourceDefinition.json and resourceDefinition_out_of_docs.json @@ -347,8 +347,8 @@ var ResourceDefinitions = map[string]ResourceStructure{ "azurerm_web_application_firewall_policy": {"azurerm_web_application_firewall_policy", "wafw", 1, 80, false, "[^0-9A-Za-z]", "^[a-zA-Z0-9][a-zA-Z0-9]{0,78}[a-zA-Z0-9]$", false, "global"}, "azurerm_web_pubsub": {"azurerm_web_pubsub", "ps", 3, 63, false, "[^0-9A-Za-z-]", "^[a-zA-Z][-a-zA-Z0-9]{1,61}[a-zA-Z0-9]$", true, "resourceGroup"}, "azurerm_web_pubsub_hub": {"azurerm_web_pubsub_hub", "pshub", 1, 128, false, "[^0-9A-Za-z_`,.\\[\\]]", "^[a-zA-Z][a-zA-Z0-9_`,.\\[\\]]{0,127}$", false, "parent"}, - "azurerm_windows_virtual_machine": {"azurerm_windows_virtual_machine", "vm", 1, 15, false, "[\\/\"\\[\\]:|<>+=;,?*@&_]", "^[^\\/\"\\[\\]:|<>+=;,?*@&_][^\\/\"\\[\\]:|<>+=;,?*@&]{0,13}[^\\/\"\\[\\]:|<>+=;,?*@&.-]$", true, "resourceGroup"}, - "azurerm_windows_virtual_machine_scale_set": {"azurerm_windows_virtual_machine_scale_set", "vmss", 1, 15, false, "[\\/\"\\[\\]:|<>+=;,?*@&_]", "^[^\\/\"\\[\\]:|<>+=;,?*@&_][^\\/\"\\[\\]:|<>+=;,?*@&]{0,13}[^\\/\"\\[\\]:|<>+=;,?*@&.-]$", true, "resourceGroup"}, + "azurerm_windows_virtual_machine": {"azurerm_windows_virtual_machine", "vm", 1, 64, false, "[\\/\"\\[\\]:|<>+=;,?*@&_]", "^[^\\/\"\\[\\]:|<>+=;,?*@&_][^\\/\"\\[\\]:|<>+=;,?*@&]{0,62}[^\\/\"\\[\\]:|<>+=;,?*@&.-]$", true, "resourceGroup"}, + "azurerm_windows_virtual_machine_scale_set": {"azurerm_windows_virtual_machine_scale_set", "vmss", 1, 64, false, "[\\/\"\\[\\]:|<>+=;,?*@&_]", "^[^\\/\"\\[\\]:|<>+=;,?*@&_][^\\/\"\\[\\]:|<>+=;,?*@&]{0,62}[^\\/\"\\[\\]:|<>+=;,?*@&.-]$", true, "resourceGroup"}, "databricks_cluster": {"databricks_cluster", "dbc", 3, 30, false, "[^a-zA-Z0-9-_]", "^[a-zA-Z0-9-_]{3,30}$", true, "parent"}, "databricks_high_concurrency_cluster": {"databricks_high_concurrency_cluster", "dbhcc", 3, 30, false, "[^0-9A-Za-z_-]", "^[a-zA-Z0-9-_]{3,30}$", true, "parent"}, "databricks_standard_cluster": {"databricks_standard_cluster", "dbsc", 3, 30, false, "[^a-zA-Z0-9-_]", "^[a-zA-Z0-9-_]{3,30}$", true, "parent"}, diff --git a/docs/resources/azurecaf_name.md b/docs/resources/azurecaf_name.md index 930472f..fb6d29f 100644 --- a/docs/resources/azurecaf_name.md +++ b/docs/resources/azurecaf_name.md @@ -105,8 +105,8 @@ Current supported resource types: | azurerm_managed_disk| dsk| 1| 80| false| "^[a-zA-Z0-9_]{1,80}$"| | azurerm_virtual_machine| vm| 1| 15| false| "^[^\\/\"\\[\\]:|<>+=;,?*@&_][^\\/\"\\[\\]:|<>+=;,?*@&]{0,13}[^\\/\"\\[\\]:|<>+=;,?*@&.-]$"| | azurerm_virtual_machine_scale_set| vmss| 1| 15| false| "^[^\\/\"\\[\\]:|<>+=;,?*@&_][^\\/\"\\[\\]:|<>+=;,?*@&]{0,13}[^\\/\"\\[\\]:|<>+=;,?*@&.-]$"| -| azurerm_windows_virtual_machine| vm| 1| 15| false| "^[^\\/\"\\[\\]:|<>+=;,?*@&_][^\\/\"\\[\\]:|<>+=;,?*@&]{0,13}[^\\/\"\\[\\]:|<>+=;,?*@&.-]$"| -| azurerm_windows_virtual_machine_scale_set| vmss| 1| 15| false| "^[^\\/\"\\[\\]:|<>+=;,?*@&_][^\\/\"\\[\\]:|<>+=;,?*@&]{0,13}[^\\/\"\\[\\]:|<>+=;,?*@&.-]$"| +| azurerm_windows_virtual_machine| vm| 1| 64| false| "^[^\\/\"\\[\\]:|<>+=;,?*@&_][^\\/\"\\[\\]:|<>+=;,?*@&]{0,62}[^\\/\"\\[\\]:|<>+=;,?*@&.-]$"| +| azurerm_windows_virtual_machine_scale_set| vmss| 1| 64| false| "^[^\\/\"\\[\\]:|<>+=;,?*@&_][^\\/\"\\[\\]:|<>+=;,?*@&]{0,62}[^\\/\"\\[\\]:|<>+=;,?*@&.-]$"| | azurerm_containerGroups| cg| 1| 63| false| "^[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9]$"| | azurerm_container_registry| cr| 1| 63| true| "^[a-zA-Z0-9]{1,63}$"| | azurerm_container_registry_webhook| crwh| 1| 50| false| "^[a-zA-Z0-9]{1,50}$"| diff --git a/resourceDefinition.json b/resourceDefinition.json index aeb6b96..3d328d2 100644 --- a/resourceDefinition.json +++ b/resourceDefinition.json @@ -564,8 +564,8 @@ { "name": "azurerm_windows_virtual_machine", "min_length": 1, - "max_length": 15, - "validation_regex": "\"^[^\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&_][^\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&]{0,13}[^\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&.-]$\"", + "max_length": 64, + "validation_regex": "\"^[^\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&_][^\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&]{0,62}[^\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&.-]$\"", "scope": "resourceGroup", "slug": "vm", "dashes": true, @@ -575,8 +575,8 @@ { "name": "azurerm_windows_virtual_machine_scale_set", "min_length": 1, - "max_length": 15, - "validation_regex": "\"^[^\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&_][^\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&]{0,13}[^\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&.-]$\"", + "max_length": 64, + "validation_regex": "\"^[^\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&_][^\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&]{0,62}[^\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&.-]$\"", "scope": "resourceGroup", "slug": "vmss", "dashes": true, From 7dec9e272bec996f40bb5c3b15fa0f89534c86b7 Mon Sep 17 00:00:00 2001 From: t3mi Date: Thu, 20 Oct 2022 18:07:03 +0000 Subject: [PATCH 2/8] Add CDN FrontDoor route and custom domain, metric alert, NGINX, DNS resolver --- README.md | 6 +++- azurecaf/models_generated.go | 10 +++++++ resourceDefinition.json | 55 ++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f73cde1..7dd23c9 100644 --- a/README.md +++ b/README.md @@ -252,11 +252,13 @@ This is the current compreheensive status of the implemented resources in the pr |azurerm_bot_connection | ✔ | |azurerm_bot_web_app | ✔ | |azurerm_cdn_endpoint | ✔ | +|azurerm_cdn_frontdoor_custom_domain | ✔ | |azurerm_cdn_frontdoor_endpoint | ✔ | |azurerm_cdn_frontdoor_firewall_policy | ✔ | |azurerm_cdn_frontdoor_origin | ✔ | |azurerm_cdn_frontdoor_origin_group | ✔ | |azurerm_cdn_frontdoor_profile | ✔ | +|azurerm_cdn_frontdoor_route | ✔ | |azurerm_cdn_frontdoor_rule | ✔ | |azurerm_cdn_frontdoor_rule_set | ✔ | |azurerm_cdn_frontdoor_secret | ✔ | @@ -493,7 +495,7 @@ This is the current compreheensive status of the implemented resources in the pr |azurerm_monitor_diagnostic_categories | ❌ | |azurerm_monitor_diagnostic_setting | ✔ | |azurerm_monitor_log_profile | ❌ | -|azurerm_monitor_metric_alert | ❌ | +|azurerm_monitor_metric_alert | ✔ | |azurerm_monitor_private_link_scope | ✔ | |azurerm_monitor_scheduled_query_rules_alert | ❌ | |azurerm_monitor_scheduled_query_rules_log | ❌ | @@ -539,6 +541,7 @@ This is the current compreheensive status of the implemented resources in the pr |azurerm_network_service_tags | ❌ | |azurerm_network_watcher | ✔ | |azurerm_network_watcher_flow_log | ❌ | +|azurerm_nginx_deployment | ✔ | |azurerm_notification_hub | ✔ | |azurerm_notification_hub_authorization_rule | ✔ | |azurerm_notification_hub_namespace | ✔ | @@ -567,6 +570,7 @@ This is the current compreheensive status of the implemented resources in the pr |azurerm_private_dns_cname_record | ❌ | |azurerm_private_dns_mx_record | ❌ | |azurerm_private_dns_ptr_record | ❌ | +|azurerm_private_dns_resolver | ✔ | |azurerm_private_dns_srv_record | ❌ | |azurerm_private_dns_txt_record | ❌ | |azurerm_private_dns_zone | ✔ | diff --git a/azurecaf/models_generated.go b/azurecaf/models_generated.go index bf83aba..be79503 100644 --- a/azurecaf/models_generated.go +++ b/azurecaf/models_generated.go @@ -50,11 +50,13 @@ var ResourceDefinitions = map[string]ResourceStructure{ "azurerm_bot_connection": {"azurerm_bot_connection", "botcon", 2, 64, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-_.]{1,63}$", true, "parent"}, "azurerm_bot_web_app": {"azurerm_bot_web_app", "bot", 2, 64, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-_.]{1,63}$", true, "global"}, "azurerm_cdn_endpoint": {"azurerm_cdn_endpoint", "cdn", 1, 50, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9][a-zA-Z0-9-]{0,48}[a-zA-Z0-9]$", true, "global"}, + "azurerm_cdn_frontdoor_custom_domain": {"azurerm_cdn_frontdoor_custom_domain", "cfdcd", 1, 260, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,258}[a-zA-Z0-9])?$", true, "parent"}, "azurerm_cdn_frontdoor_endpoint": {"azurerm_cdn_frontdoor_endpoint", "cfde", 1, 46, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,44}[a-zA-Z0-9])?$", true, "global"}, "azurerm_cdn_frontdoor_firewall_policy": {"azurerm_cdn_frontdoor_firewall_policy", "cfdfp", 1, 128, false, "[^0-9A-Za-z]", "^[a-zA-Z][0-9a-zA-Z]{0,127}$", false, "resourceGroup"}, "azurerm_cdn_frontdoor_origin": {"azurerm_cdn_frontdoor_origin", "cfdo", 1, 90, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,88}[a-zA-Z0-9])?$", true, "parent"}, "azurerm_cdn_frontdoor_origin_group": {"azurerm_cdn_frontdoor_origin_group", "cfdog", 1, 90, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,88}[a-zA-Z0-9])?$", true, "parent"}, "azurerm_cdn_frontdoor_profile": {"azurerm_cdn_frontdoor_profile", "cfdp", 1, 90, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,88}[a-zA-Z0-9])?$", true, "resourceGroup"}, + "azurerm_cdn_frontdoor_route": {"azurerm_cdn_frontdoor_route", "cfdroute", 1, 90, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,88}[a-zA-Z0-9])?$", true, "parent"}, "azurerm_cdn_frontdoor_rule": {"azurerm_cdn_frontdoor_rule", "cfdr", 1, 60, false, "[^0-9A-Za-z]", "^[a-zA-Z][a-zA-Z0-9]{0,59}$", false, "parent"}, "azurerm_cdn_frontdoor_rule_set": {"azurerm_cdn_frontdoor_rule_set", "cfdrs", 1, 60, false, "[^0-9A-Za-z]", "^[a-zA-Z][a-zA-Z0-9]{0,59}$", false, "parent"}, "azurerm_cdn_frontdoor_secret": {"azurerm_cdn_frontdoor_secret", "cfds", 2, 260, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9][a-zA-Z0-9-]{0,258}[a-zA-Z0-9]$", true, "parent"}, @@ -206,6 +208,7 @@ var ResourceDefinitions = map[string]ResourceStructure{ "azurerm_monitor_activity_log_alert": {"azurerm_monitor_activity_log_alert", "adfmysql", 1, 260, false, "[^0-9A-Za-z<>*%:&?#\\+\\/]", "^[^<>*%:&?#\\+\\/]{0,259}[^<>*%:&.?#\\+\\/]$", true, "parent"}, "azurerm_monitor_autoscale_setting": {"azurerm_monitor_autoscale_setting", "amas", 2, 64, false, "[^0-9A-Za-z _.-]", "^[a-zA-Z0-9][a-zA-Z0-9-]{0,62}[a-zA-Z0-9]$", true, "resourceGroup"}, "azurerm_monitor_diagnostic_setting": {"azurerm_monitor_diagnostic_setting", "amds", 1, 260, false, "[^0-9A-Za-z _.-]", "^[a-zA-Z0-9 ][a-zA-Z0-9-._ ]{0,258}[a-zA-Z0-9_]$", true, "parent"}, + "azurerm_monitor_metric_alert": {"azurerm_monitor_metric_alert", "ma", 1, 251, false, "[<>*%&:\\?+/#@{}]", "^[^<>*%&:\\?+/#@{}]{0,250}[^<>*%&:\\?+/#@{}. ]$", true, "resourceGroup"}, "azurerm_monitor_private_link_scope": {"azurerm_monitor_private_link_scope", "ampls", 1, 255, false, "[^0-9A-Za-z-._()]", "^[0-9A-Za-z-._()]{0,254}[0-9A-Za-z-_()]$", true, "resourceGroup"}, "azurerm_mssql_database": {"azurerm_mssql_database", "sqldb", 1, 128, false, "[<>*%:.?\\+\\/ ]", "^[^<>*%:.?\\+\\/]{1,127}[^<>*%:.?\\+\\/ ]$", true, "parent"}, "azurerm_mssql_elasticpool": {"azurerm_mssql_elasticpool", "sqlep", 1, 128, false, "[<>*%:.?\\+\\/]", "^[^<>*%:.?\\+\\/]{1,127}[^<>*%:.?\\+\\/ ]$", true, "parent"}, @@ -228,6 +231,7 @@ var ResourceDefinitions = map[string]ResourceStructure{ "azurerm_network_security_group_rule": {"azurerm_network_security_group_rule", "nsgr", 1, 80, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_network_security_rule": {"azurerm_network_security_rule", "nsgr", 1, 80, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_network_watcher": {"azurerm_network_watcher", "nw", 1, 80, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,78}[a-zA-Z0-9_]$", true, "resourceGroup"}, + "azurerm_nginx_deployment": {"azurerm_nginx_deployment", "nginx", 1, 30, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,28}[a-zA-Z0-9])?$", true, "resourceGroup"}, "azurerm_notification_hub": {"azurerm_notification_hub", "nh", 1, 260, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,259}$", true, "parent"}, "azurerm_notification_hub_authorization_rule": {"azurerm_notification_hub_authorization_rule", "dnsrec", 1, 256, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,255}$", true, "parent"}, "azurerm_notification_hub_namespace": {"azurerm_notification_hub_namespace", "dnsrec", 6, 50, false, "[^0-9A-Za-z-]", "^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", true, "global"}, @@ -245,6 +249,7 @@ var ResourceDefinitions = map[string]ResourceStructure{ "azurerm_private_dns_cname_record": {"azurerm_private_dns_cname_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_mx_record": {"azurerm_private_dns_mx_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_ptr_record": {"azurerm_private_dns_ptr_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, + "azurerm_private_dns_resolver": {"azurerm_private_dns_resolver", "pdnsr", 3, 80, false, "[^0-9A-Za-z_-]", "^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$", true, "resourceGroup"}, "azurerm_private_dns_srv_record": {"azurerm_private_dns_srv_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_txt_record": {"azurerm_private_dns_txt_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_zone": {"azurerm_private_dns_zone", "pdns", 1, 63, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,61}[a-zA-Z0-9_]$", true, "resourceGroup"}, @@ -455,12 +460,14 @@ var ResourceMaps = map[string]string{ "botteams": "azurerm_bot_channel_ms_teams", "cdn": "azurerm_cdn_endpoint", "cdnprof": "azurerm_cdn_profile", + "cfdcd": "azurerm_cdn_frontdoor_custom_domain", "cfde": "azurerm_cdn_frontdoor_endpoint", "cfdfp": "azurerm_cdn_frontdoor_firewall_policy", "cfdo": "azurerm_cdn_frontdoor_origin", "cfdog": "azurerm_cdn_frontdoor_origin_group", "cfdp": "azurerm_cdn_frontdoor_profile", "cfdr": "azurerm_cdn_frontdoor_rule", + "cfdroute": "azurerm_cdn_frontdoor_route", "cfdrs": "azurerm_cdn_frontdoor_rule_set", "cfds": "azurerm_cdn_frontdoor_secret", "cfdsp": "azurerm_cdn_frontdoor_security_policy", @@ -550,6 +557,7 @@ var ResourceMaps = map[string]string{ "lbnatrl": "azurerm_lb_nat_rule", "lgw": "azurerm_local_network_gateway", "log": "azurerm_log_analytics_workspace", + "ma": "azurerm_monitor_metric_alert", "map": "azurerm_maps_account", "maria": "azurerm_mariadb_server", "mariadb": "azurerm_mariadb_database", @@ -567,6 +575,7 @@ var ResourceMaps = map[string]string{ "mysqlffw": "azurerm_mysql_flexible_server_firewall_rule", "mysqlfw": "azurerm_mysql_firewall_rule", "mysqlvn": "azurerm_mysql_virtual_network_rule", + "nginx": "azurerm_nginx_deployment", "nh": "azurerm_notification_hub", "nic": "azurerm_network_interface", "npl": "aks_node_pool_linux", @@ -576,6 +585,7 @@ var ResourceMaps = map[string]string{ "nw": "azurerm_network_watcher", "pbi": "azurerm_powerbi_embedded", "pdns": "azurerm_private_dns_zone", + "pdnsr": "azurerm_private_dns_resolver", "pdnsrec": "azurerm_private_dns_a_record", "pdnszg": "azurerm_private_dns_zone_group", "pe": "azurerm_private_endpoint", diff --git a/resourceDefinition.json b/resourceDefinition.json index 223e249..ffb1862 100644 --- a/resourceDefinition.json +++ b/resourceDefinition.json @@ -297,6 +297,17 @@ "lowercase": false, "regex": "\"[^0-9A-Za-z]\"" }, + { + "name": "azurerm_cdn_frontdoor_custom_domain", + "min_length": 1, + "max_length": 260, + "validation_regex": "\"^[a-zA-Z0-9]([a-zA-Z0-9-]{0,258}[a-zA-Z0-9])?$\"", + "scope": "parent", + "slug": "cfdcd", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z-]\"" + }, { "name": "azurerm_cdn_frontdoor_endpoint", "min_length": 1, @@ -352,6 +363,17 @@ "lowercase": false, "regex": "\"[^0-9A-Za-z-]\"" }, + { + "name": "azurerm_cdn_frontdoor_route", + "min_length": 1, + "max_length": 90, + "validation_regex": "\"^[a-zA-Z0-9]([a-zA-Z0-9-]{0,88}[a-zA-Z0-9])?$\"", + "scope": "parent", + "slug": "cfdroute", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z-]\"" + }, { "name": "azurerm_cdn_frontdoor_rule", "min_length": 1, @@ -2411,6 +2433,17 @@ "lowercase": false, "regex": "\"[^0-9A-Za-z_.-]\"" }, + { + "name": "azurerm_nginx_deployment", + "min_length": 1, + "max_length": 30, + "validation_regex": "\"^[a-zA-Z0-9]([a-zA-Z0-9-]{0,28}[a-zA-Z0-9])?$\"", + "scope": "resourceGroup", + "slug": "nginx", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z-]\"" + }, { "name": "azurerm_network_watcher", "min_length": 1, @@ -2488,6 +2521,17 @@ "lowercase": false, "regex": "\"[^0-9A-Za-z_.-]\"" }, + { + "name": "azurerm_private_dns_resolver", + "min_length": 3, + "max_length": 80, + "validation_regex": "\"^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$\"", + "scope": "resourceGroup", + "slug": "pdnsr", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z_-]\"" + }, { "name": "azurerm_private_dns_zone", "min_length": 1, @@ -2896,6 +2940,17 @@ "lowercase": false, "regex": "\"[^0-9A-Za-z _.-]\"" }, + { + "name": "azurerm_monitor_metric_alert", + "min_length": 1, + "max_length": 251, + "validation_regex": "\"^[^<>*%&:\\\\?+/#@{}]{0,250}[^<>*%&:\\\\?+/#@{}. ]$\"", + "scope": "resourceGroup", + "slug": "ma", + "dashes": true, + "lowercase": false, + "regex": "\"[<>*%&:\\\\?+/#@{}]\"" + }, { "name": "azurerm_monitor_private_link_scope", "min_length": 1, From 8c99ed3c941fa5dae0ab7fac9a67beb65980b851 Mon Sep 17 00:00:00 2001 From: t3mi Date: Mon, 31 Oct 2022 09:44:29 +0000 Subject: [PATCH 3/8] add dns forwarding rulesets, private resolvers endpoints --- README.md | 3 ++ azurecaf/models_generated.go | 12 ++++++-- resourceDefinition.json | 57 ++++++++++++++++++++++++++++-------- 3 files changed, 57 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 7dd23c9..d91b23e 100644 --- a/README.md +++ b/README.md @@ -571,6 +571,9 @@ This is the current compreheensive status of the implemented resources in the pr |azurerm_private_dns_mx_record | ❌ | |azurerm_private_dns_ptr_record | ❌ | |azurerm_private_dns_resolver | ✔ | +|azurerm_private_dns_resolver_dns_forwarding_ruleset | ✔ | +|azurerm_private_dns_resolver_inbound_endpoint | ✔ | +|azurerm_private_dns_resolver_outbound_endpoint | ✔ | |azurerm_private_dns_srv_record | ❌ | |azurerm_private_dns_txt_record | ❌ | |azurerm_private_dns_zone | ✔ | diff --git a/azurecaf/models_generated.go b/azurecaf/models_generated.go index be79503..1d3c7e0 100644 --- a/azurecaf/models_generated.go +++ b/azurecaf/models_generated.go @@ -1,6 +1,6 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated by robots at -// 2022-10-18 10:22:38.7198696 +0200 CEST m=+0.003380280 +// 2022-10-31 09:43:39.263487986 +0000 UTC m=+0.002441415 // using data from // resourceDefinition.json and resourceDefinition_out_of_docs.json @@ -249,7 +249,10 @@ var ResourceDefinitions = map[string]ResourceStructure{ "azurerm_private_dns_cname_record": {"azurerm_private_dns_cname_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_mx_record": {"azurerm_private_dns_mx_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_ptr_record": {"azurerm_private_dns_ptr_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, - "azurerm_private_dns_resolver": {"azurerm_private_dns_resolver", "pdnsr", 3, 80, false, "[^0-9A-Za-z_-]", "^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$", true, "resourceGroup"}, + "azurerm_private_dns_resolver": {"azurerm_private_dns_resolver", "dnspr", 3, 80, false, "[^0-9A-Za-z_-]", "^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$", true, "resourceGroup"}, + "azurerm_private_dns_resolver_dns_forwarding_ruleset": {"azurerm_private_dns_resolver_dns_forwarding_ruleset", "dnsfwrs", 2, 80, false, "[^0-9A-Za-z_-]", "^[a-zA-Z][a-zA-Z0-9-_]{0,78}[a-zA-Z0-9]$", true, "resourceGroup"}, + "azurerm_private_dns_resolver_inbound_endpoint": {"azurerm_private_dns_resolver_inbound_endpoint", "dnsprie", 3, 80, false, "[^0-9A-Za-z_-]", "^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$", true, "parent"}, + "azurerm_private_dns_resolver_outbound_endpoint": {"azurerm_private_dns_resolver_outbound_endpoint", "dnsproe", 3, 80, false, "[^0-9A-Za-z_-]", "^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$", true, "parent"}, "azurerm_private_dns_srv_record": {"azurerm_private_dns_srv_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_txt_record": {"azurerm_private_dns_txt_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_zone": {"azurerm_private_dns_zone", "pdns", 1, 63, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,61}[a-zA-Z0-9_]$", true, "resourceGroup"}, @@ -494,6 +497,10 @@ var ResourceMaps = map[string]string{ "dlsfw": "azurerm_data_lake_store_firewall_rule", "dms": "azurerm_database_migration_service", "dns": "azurerm_dns_zone", + "dnsfwrs": "azurerm_private_dns_resolver_dns_forwarding_ruleset", + "dnspr": "azurerm_private_dns_resolver", + "dnsprie": "azurerm_private_dns_resolver_inbound_endpoint", + "dnsproe": "azurerm_private_dns_resolver_outbound_endpoint", "dnsrec": "azurerm_dns_a_record", "dpbpb": "azurerm_data_protection_backup_policy_blob_storage", "dpbpd": "azurerm_data_protection_backup_policy_disk", @@ -585,7 +592,6 @@ var ResourceMaps = map[string]string{ "nw": "azurerm_network_watcher", "pbi": "azurerm_powerbi_embedded", "pdns": "azurerm_private_dns_zone", - "pdnsr": "azurerm_private_dns_resolver", "pdnsrec": "azurerm_private_dns_a_record", "pdnszg": "azurerm_private_dns_zone_group", "pe": "azurerm_private_endpoint", diff --git a/resourceDefinition.json b/resourceDefinition.json index ffb1862..1b0d738 100644 --- a/resourceDefinition.json +++ b/resourceDefinition.json @@ -2527,7 +2527,40 @@ "max_length": 80, "validation_regex": "\"^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$\"", "scope": "resourceGroup", - "slug": "pdnsr", + "slug": "dnspr", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z_-]\"" + }, + { + "name": "azurerm_private_dns_resolver_dns_forwarding_ruleset", + "min_length": 2, + "max_length": 80, + "validation_regex": "\"^[a-zA-Z][a-zA-Z0-9-_]{0,78}[a-zA-Z0-9]$\"", + "scope": "resourceGroup", + "slug": "dnsfwrs", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z_-]\"" + }, + { + "name": "azurerm_private_dns_resolver_inbound_endpoint", + "min_length": 3, + "max_length": 80, + "validation_regex": "\"^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$\"", + "scope": "parent", + "slug": "dnsprie", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z_-]\"" + }, + { + "name": "azurerm_private_dns_resolver_outbound_endpoint", + "min_length": 3, + "max_length": 80, + "validation_regex": "\"^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$\"", + "scope": "parent", + "slug": "dnsproe", "dashes": true, "lowercase": false, "regex": "\"[^0-9A-Za-z_-]\"" @@ -2918,6 +2951,17 @@ "lowercase": false, "regex": "`[^~!@$^*()\\[\\]\\{\\}_\\-=\"';,0-9A-Za-z _.-]`" }, + { + "name": "azurerm_monitor_activity_log_alert", + "min_length": 1, + "max_length": 260, + "validation_regex": "\"^[^<>*%:&?#\\\\+\\\\/]{0,259}[^<>*%:&.?#\\\\+\\\\/]$\"", + "scope": "parent", + "slug": "adfmysql", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z<>*%:&?#\\\\+\\\\/]\"" + }, { "name": "azurerm_monitor_autoscale_setting", "min_length": 2, @@ -3116,17 +3160,6 @@ "lowercase": false, "regex": "\"[\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&_]\"" }, - { - "name": "azurerm_monitor_activity_log_alert", - "min_length": 1, - "max_length": 260, - "validation_regex": "\"^[^<>*%:&?#\\\\+\\\\/]{0,259}[^<>*%:&.?#\\\\+\\\\/]$\"", - "scope": "parent", - "slug": "adfmysql", - "dashes": true, - "lowercase": false, - "regex": "\"[^0-9A-Za-z<>*%:&?#\\\\+\\\\/]\"" - }, { "name": "azurerm_vpn_site", "min_length": 1, From ada7283d2eec5ae36199022a6ed354aef6dcd738 Mon Sep 17 00:00:00 2001 From: Roland Schoen Date: Tue, 18 Oct 2022 10:24:37 +0200 Subject: [PATCH 4/8] Add automation_job_schedule naming resource --- azurecaf/models_generated.go | 4 +++- resourceDefinition.json | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/azurecaf/models_generated.go b/azurecaf/models_generated.go index b421437..5bb4875 100644 --- a/azurecaf/models_generated.go +++ b/azurecaf/models_generated.go @@ -1,6 +1,6 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated by robots at -// 2022-10-18 13:50:29.866316452 +0200 CEST m=+0.002999251 +// 2022-11-01 08:22:55.69779605 +0000 UTC m=+0.004071626 // using data from // resourceDefinition.json and resourceDefinition_out_of_docs.json @@ -32,6 +32,7 @@ var ResourceDefinitions = map[string]ResourceStructure{ "azurerm_automation_certificate": {"azurerm_automation_certificate", "aacert", 1, 128, false, `[^-\w\._\(\)]`, "^[^<>*%:.?\\+\\/]{0,127}[^<>*%:.?\\+\\/ ]$", true, "parent"}, "azurerm_automation_credential": {"azurerm_automation_credential", "aacred", 1, 128, false, `[^-\w\._\(\)]`, "^[^<>*%:.?\\+\\/]{0,127}[^<>*%:.?\\+\\/ ]$", true, "parent"}, "azurerm_automation_hybrid_runbook_worker_group": {"azurerm_automation_hybrid_runbook_worker_group", "aahwg", 1, 128, false, "[<>*%&:\\?.+/#]", "^([^<>*%&:\\?.+/#\\s]?[ ]?){0,127}[^<>*%&:\\?.+/#\\s]$", true, "parent"}, + "azurerm_automation_job_schedule": {"azurerm_automation_job_schedule", "aajs", 1, 128, false, `[^-\w\._\(\)]`, "^[^<>*%:.?\\+\\/]{0,127}[^<>*%:.?\\+\\/ ]$", true, "parent"}, "azurerm_automation_runbook": {"azurerm_automation_runbook", "aarun", 1, 63, false, "[^0-9A-Za-z_]", "^[a-zA-Z][a-zA-Z0-9-]{0,62}$", true, "parent"}, "azurerm_automation_schedule": {"azurerm_automation_schedule", "aasched", 1, 128, false, `[^-\w\._\(\)]`, "^[^<>*%:.?\\+\\/]{0,127}[^<>*%:.?\\+\\/ ]$", true, "parent"}, "azurerm_automation_variable": {"azurerm_automation_variable", "aavar", 1, 128, false, `[^-\w\._\(\)]`, "^[^<>*%:.?\\+\\/]{0,127}[^<>*%:.?\\+\\/ ]$", true, "parent"}, @@ -364,6 +365,7 @@ var ResourceMaps = map[string]string{ "aacred": "azurerm_automation_credential", "aadb2c": "azurerm_aadb2c_directory", "aahwg": "azurerm_automation_hybrid_runbook_worker_group", + "aajs": "azurerm_automation_job_schedule", "aarun": "azurerm_automation_runbook", "aasched": "azurerm_automation_schedule", "aavar": "azurerm_automation_variable", diff --git a/resourceDefinition.json b/resourceDefinition.json index 3d328d2..25d3064 100644 --- a/resourceDefinition.json +++ b/resourceDefinition.json @@ -109,6 +109,17 @@ "lowercase": false, "regex": "\"[<>*%&:\\\\?.+/#]\"" }, + { + "name": "azurerm_automation_job_schedule", + "min_length": 1, + "max_length": 128, + "validation_regex": "\"^[^<>*%:.?\\\\+\\\\/]{0,127}[^<>*%:.?\\\\+\\\\/ ]$\"", + "scope": "parent", + "slug": "aajs", + "dashes": true, + "lowercase": false, + "regex": "`[^-\\w\\._\\(\\)]`" + }, { "name": "azurerm_automation_runbook", "min_length": 1, From ba54d38545c34c18a46152296473a9890919649e Mon Sep 17 00:00:00 2001 From: Roland Schoen Date: Tue, 18 Oct 2022 10:28:17 +0200 Subject: [PATCH 5/8] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 48fd294..f73cde1 100644 --- a/README.md +++ b/README.md @@ -222,7 +222,7 @@ This is the current compreheensive status of the implemented resources in the pr |azurerm_automation_dsc_configuration | ❌ | |azurerm_automation_dsc_nodeconfiguration | ❌ | |azurerm_automation_hybrid_runbook_worker_group | ✔ | -|azurerm_automation_job_schedule | ❌ | +|azurerm_automation_job_schedule | ✔ | |azurerm_automation_module | ❌ | |azurerm_automation_runbook | ✔ | |azurerm_automation_schedule | ✔ | From 2de197bbb76eddb519e845a092c1248522d762c6 Mon Sep 17 00:00:00 2001 From: Roland Schoen Date: Tue, 18 Oct 2022 10:38:10 +0200 Subject: [PATCH 6/8] update docs --- docs/resources/azurecaf_name.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/resources/azurecaf_name.md b/docs/resources/azurecaf_name.md index fb6d29f..99b8cce 100644 --- a/docs/resources/azurecaf_name.md +++ b/docs/resources/azurecaf_name.md @@ -78,6 +78,7 @@ Current supported resource types: | azurerm_automation_account| aa| 6| 50| false| "^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$"| | azurerm_automation_certificate| aacert| 1| 128| false| "^[^<>*%:.?\\+\\/]{0,127}[^<>*%:.?\\+\\/ ]$"| | azurerm_automation_credential| aacred| 1| 128| false| "^[^<>*%:.?\\+\\/]{0,127}[^<>*%:.?\\+\\/ ]$"| +| azurerm_automation_job_schedule| aajs| 1| 128| false| "^[^<>*%:.?\\+\\/]{0,127}[^<>*%:.?\\+\\/ ]$"| | azurerm_automation_runbook| aarun| 1| 63| false| "^[a-zA-Z][a-zA-Z0-9-]{0,62}$"| | azurerm_automation_schedule| aasched| 1| 128| false| "^[^<>*%:.?\\+\\/]{0,127}[^<>*%:.?\\+\\/ ]$"| | azurerm_automation_variable| aavar| 1| 128| false| "^[^<>*%:.?\\+\\/]{0,127}[^<>*%:.?\\+\\/ ]$"| From 4b068fe00cc2ee1c3d2e597122811ae0e2ae7cac Mon Sep 17 00:00:00 2001 From: t3mi Date: Thu, 20 Oct 2022 18:07:03 +0000 Subject: [PATCH 7/8] Add CDN FrontDoor route and custom domain, metric alert, NGINX, DNS resolver --- README.md | 6 +++- azurecaf/models_generated.go | 10 +++++++ resourceDefinition.json | 55 ++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f73cde1..7dd23c9 100644 --- a/README.md +++ b/README.md @@ -252,11 +252,13 @@ This is the current compreheensive status of the implemented resources in the pr |azurerm_bot_connection | ✔ | |azurerm_bot_web_app | ✔ | |azurerm_cdn_endpoint | ✔ | +|azurerm_cdn_frontdoor_custom_domain | ✔ | |azurerm_cdn_frontdoor_endpoint | ✔ | |azurerm_cdn_frontdoor_firewall_policy | ✔ | |azurerm_cdn_frontdoor_origin | ✔ | |azurerm_cdn_frontdoor_origin_group | ✔ | |azurerm_cdn_frontdoor_profile | ✔ | +|azurerm_cdn_frontdoor_route | ✔ | |azurerm_cdn_frontdoor_rule | ✔ | |azurerm_cdn_frontdoor_rule_set | ✔ | |azurerm_cdn_frontdoor_secret | ✔ | @@ -493,7 +495,7 @@ This is the current compreheensive status of the implemented resources in the pr |azurerm_monitor_diagnostic_categories | ❌ | |azurerm_monitor_diagnostic_setting | ✔ | |azurerm_monitor_log_profile | ❌ | -|azurerm_monitor_metric_alert | ❌ | +|azurerm_monitor_metric_alert | ✔ | |azurerm_monitor_private_link_scope | ✔ | |azurerm_monitor_scheduled_query_rules_alert | ❌ | |azurerm_monitor_scheduled_query_rules_log | ❌ | @@ -539,6 +541,7 @@ This is the current compreheensive status of the implemented resources in the pr |azurerm_network_service_tags | ❌ | |azurerm_network_watcher | ✔ | |azurerm_network_watcher_flow_log | ❌ | +|azurerm_nginx_deployment | ✔ | |azurerm_notification_hub | ✔ | |azurerm_notification_hub_authorization_rule | ✔ | |azurerm_notification_hub_namespace | ✔ | @@ -567,6 +570,7 @@ This is the current compreheensive status of the implemented resources in the pr |azurerm_private_dns_cname_record | ❌ | |azurerm_private_dns_mx_record | ❌ | |azurerm_private_dns_ptr_record | ❌ | +|azurerm_private_dns_resolver | ✔ | |azurerm_private_dns_srv_record | ❌ | |azurerm_private_dns_txt_record | ❌ | |azurerm_private_dns_zone | ✔ | diff --git a/azurecaf/models_generated.go b/azurecaf/models_generated.go index 5bb4875..aab5b11 100644 --- a/azurecaf/models_generated.go +++ b/azurecaf/models_generated.go @@ -50,11 +50,13 @@ var ResourceDefinitions = map[string]ResourceStructure{ "azurerm_bot_connection": {"azurerm_bot_connection", "botcon", 2, 64, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-_.]{1,63}$", true, "parent"}, "azurerm_bot_web_app": {"azurerm_bot_web_app", "bot", 2, 64, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-_.]{1,63}$", true, "global"}, "azurerm_cdn_endpoint": {"azurerm_cdn_endpoint", "cdn", 1, 50, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9][a-zA-Z0-9-]{0,48}[a-zA-Z0-9]$", true, "global"}, + "azurerm_cdn_frontdoor_custom_domain": {"azurerm_cdn_frontdoor_custom_domain", "cfdcd", 1, 260, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,258}[a-zA-Z0-9])?$", true, "parent"}, "azurerm_cdn_frontdoor_endpoint": {"azurerm_cdn_frontdoor_endpoint", "cfde", 1, 46, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,44}[a-zA-Z0-9])?$", true, "global"}, "azurerm_cdn_frontdoor_firewall_policy": {"azurerm_cdn_frontdoor_firewall_policy", "cfdfp", 1, 128, false, "[^0-9A-Za-z]", "^[a-zA-Z][0-9a-zA-Z]{0,127}$", false, "resourceGroup"}, "azurerm_cdn_frontdoor_origin": {"azurerm_cdn_frontdoor_origin", "cfdo", 1, 90, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,88}[a-zA-Z0-9])?$", true, "parent"}, "azurerm_cdn_frontdoor_origin_group": {"azurerm_cdn_frontdoor_origin_group", "cfdog", 1, 90, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,88}[a-zA-Z0-9])?$", true, "parent"}, "azurerm_cdn_frontdoor_profile": {"azurerm_cdn_frontdoor_profile", "cfdp", 1, 90, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,88}[a-zA-Z0-9])?$", true, "resourceGroup"}, + "azurerm_cdn_frontdoor_route": {"azurerm_cdn_frontdoor_route", "cfdroute", 1, 90, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,88}[a-zA-Z0-9])?$", true, "parent"}, "azurerm_cdn_frontdoor_rule": {"azurerm_cdn_frontdoor_rule", "cfdr", 1, 60, false, "[^0-9A-Za-z]", "^[a-zA-Z][a-zA-Z0-9]{0,59}$", false, "parent"}, "azurerm_cdn_frontdoor_rule_set": {"azurerm_cdn_frontdoor_rule_set", "cfdrs", 1, 60, false, "[^0-9A-Za-z]", "^[a-zA-Z][a-zA-Z0-9]{0,59}$", false, "parent"}, "azurerm_cdn_frontdoor_secret": {"azurerm_cdn_frontdoor_secret", "cfds", 2, 260, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9][a-zA-Z0-9-]{0,258}[a-zA-Z0-9]$", true, "parent"}, @@ -206,6 +208,7 @@ var ResourceDefinitions = map[string]ResourceStructure{ "azurerm_monitor_activity_log_alert": {"azurerm_monitor_activity_log_alert", "adfmysql", 1, 260, false, "[^0-9A-Za-z<>*%:&?#\\+\\/]", "^[^<>*%:&?#\\+\\/]{0,259}[^<>*%:&.?#\\+\\/]$", true, "parent"}, "azurerm_monitor_autoscale_setting": {"azurerm_monitor_autoscale_setting", "amas", 2, 64, false, "[^0-9A-Za-z _.-]", "^[a-zA-Z0-9][a-zA-Z0-9-]{0,62}[a-zA-Z0-9]$", true, "resourceGroup"}, "azurerm_monitor_diagnostic_setting": {"azurerm_monitor_diagnostic_setting", "amds", 1, 260, false, "[^0-9A-Za-z _.-]", "^[a-zA-Z0-9 ][a-zA-Z0-9-._ ]{0,258}[a-zA-Z0-9_]$", true, "parent"}, + "azurerm_monitor_metric_alert": {"azurerm_monitor_metric_alert", "ma", 1, 251, false, "[<>*%&:\\?+/#@{}]", "^[^<>*%&:\\?+/#@{}]{0,250}[^<>*%&:\\?+/#@{}. ]$", true, "resourceGroup"}, "azurerm_monitor_private_link_scope": {"azurerm_monitor_private_link_scope", "ampls", 1, 255, false, "[^0-9A-Za-z-._()]", "^[0-9A-Za-z-._()]{0,254}[0-9A-Za-z-_()]$", true, "resourceGroup"}, "azurerm_mssql_database": {"azurerm_mssql_database", "sqldb", 1, 128, false, "[<>*%:.?\\+\\/ ]", "^[^<>*%:.?\\+\\/]{1,127}[^<>*%:.?\\+\\/ ]$", true, "parent"}, "azurerm_mssql_elasticpool": {"azurerm_mssql_elasticpool", "sqlep", 1, 128, false, "[<>*%:.?\\+\\/]", "^[^<>*%:.?\\+\\/]{1,127}[^<>*%:.?\\+\\/ ]$", true, "parent"}, @@ -228,6 +231,7 @@ var ResourceDefinitions = map[string]ResourceStructure{ "azurerm_network_security_group_rule": {"azurerm_network_security_group_rule", "nsgr", 1, 80, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_network_security_rule": {"azurerm_network_security_rule", "nsgr", 1, 80, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_network_watcher": {"azurerm_network_watcher", "nw", 1, 80, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,78}[a-zA-Z0-9_]$", true, "resourceGroup"}, + "azurerm_nginx_deployment": {"azurerm_nginx_deployment", "nginx", 1, 30, false, "[^0-9A-Za-z-]", "^[a-zA-Z0-9]([a-zA-Z0-9-]{0,28}[a-zA-Z0-9])?$", true, "resourceGroup"}, "azurerm_notification_hub": {"azurerm_notification_hub", "nh", 1, 260, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,259}$", true, "parent"}, "azurerm_notification_hub_authorization_rule": {"azurerm_notification_hub_authorization_rule", "dnsrec", 1, 256, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,255}$", true, "parent"}, "azurerm_notification_hub_namespace": {"azurerm_notification_hub_namespace", "dnsrec", 6, 50, false, "[^0-9A-Za-z-]", "^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", true, "global"}, @@ -245,6 +249,7 @@ var ResourceDefinitions = map[string]ResourceStructure{ "azurerm_private_dns_cname_record": {"azurerm_private_dns_cname_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_mx_record": {"azurerm_private_dns_mx_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_ptr_record": {"azurerm_private_dns_ptr_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, + "azurerm_private_dns_resolver": {"azurerm_private_dns_resolver", "pdnsr", 3, 80, false, "[^0-9A-Za-z_-]", "^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$", true, "resourceGroup"}, "azurerm_private_dns_srv_record": {"azurerm_private_dns_srv_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_txt_record": {"azurerm_private_dns_txt_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_zone": {"azurerm_private_dns_zone", "pdns", 1, 63, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,61}[a-zA-Z0-9_]$", true, "resourceGroup"}, @@ -455,12 +460,14 @@ var ResourceMaps = map[string]string{ "botteams": "azurerm_bot_channel_ms_teams", "cdn": "azurerm_cdn_endpoint", "cdnprof": "azurerm_cdn_profile", + "cfdcd": "azurerm_cdn_frontdoor_custom_domain", "cfde": "azurerm_cdn_frontdoor_endpoint", "cfdfp": "azurerm_cdn_frontdoor_firewall_policy", "cfdo": "azurerm_cdn_frontdoor_origin", "cfdog": "azurerm_cdn_frontdoor_origin_group", "cfdp": "azurerm_cdn_frontdoor_profile", "cfdr": "azurerm_cdn_frontdoor_rule", + "cfdroute": "azurerm_cdn_frontdoor_route", "cfdrs": "azurerm_cdn_frontdoor_rule_set", "cfds": "azurerm_cdn_frontdoor_secret", "cfdsp": "azurerm_cdn_frontdoor_security_policy", @@ -550,6 +557,7 @@ var ResourceMaps = map[string]string{ "lbnatrl": "azurerm_lb_nat_rule", "lgw": "azurerm_local_network_gateway", "log": "azurerm_log_analytics_workspace", + "ma": "azurerm_monitor_metric_alert", "map": "azurerm_maps_account", "maria": "azurerm_mariadb_server", "mariadb": "azurerm_mariadb_database", @@ -567,6 +575,7 @@ var ResourceMaps = map[string]string{ "mysqlffw": "azurerm_mysql_flexible_server_firewall_rule", "mysqlfw": "azurerm_mysql_firewall_rule", "mysqlvn": "azurerm_mysql_virtual_network_rule", + "nginx": "azurerm_nginx_deployment", "nh": "azurerm_notification_hub", "nic": "azurerm_network_interface", "npl": "aks_node_pool_linux", @@ -576,6 +585,7 @@ var ResourceMaps = map[string]string{ "nw": "azurerm_network_watcher", "pbi": "azurerm_powerbi_embedded", "pdns": "azurerm_private_dns_zone", + "pdnsr": "azurerm_private_dns_resolver", "pdnsrec": "azurerm_private_dns_a_record", "pdnszg": "azurerm_private_dns_zone_group", "pe": "azurerm_private_endpoint", diff --git a/resourceDefinition.json b/resourceDefinition.json index 25d3064..b4fc46a 100644 --- a/resourceDefinition.json +++ b/resourceDefinition.json @@ -297,6 +297,17 @@ "lowercase": false, "regex": "\"[^0-9A-Za-z]\"" }, + { + "name": "azurerm_cdn_frontdoor_custom_domain", + "min_length": 1, + "max_length": 260, + "validation_regex": "\"^[a-zA-Z0-9]([a-zA-Z0-9-]{0,258}[a-zA-Z0-9])?$\"", + "scope": "parent", + "slug": "cfdcd", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z-]\"" + }, { "name": "azurerm_cdn_frontdoor_endpoint", "min_length": 1, @@ -352,6 +363,17 @@ "lowercase": false, "regex": "\"[^0-9A-Za-z-]\"" }, + { + "name": "azurerm_cdn_frontdoor_route", + "min_length": 1, + "max_length": 90, + "validation_regex": "\"^[a-zA-Z0-9]([a-zA-Z0-9-]{0,88}[a-zA-Z0-9])?$\"", + "scope": "parent", + "slug": "cfdroute", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z-]\"" + }, { "name": "azurerm_cdn_frontdoor_rule", "min_length": 1, @@ -2411,6 +2433,17 @@ "lowercase": false, "regex": "\"[^0-9A-Za-z_.-]\"" }, + { + "name": "azurerm_nginx_deployment", + "min_length": 1, + "max_length": 30, + "validation_regex": "\"^[a-zA-Z0-9]([a-zA-Z0-9-]{0,28}[a-zA-Z0-9])?$\"", + "scope": "resourceGroup", + "slug": "nginx", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z-]\"" + }, { "name": "azurerm_network_watcher", "min_length": 1, @@ -2488,6 +2521,17 @@ "lowercase": false, "regex": "\"[^0-9A-Za-z_.-]\"" }, + { + "name": "azurerm_private_dns_resolver", + "min_length": 3, + "max_length": 80, + "validation_regex": "\"^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$\"", + "scope": "resourceGroup", + "slug": "pdnsr", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z_-]\"" + }, { "name": "azurerm_private_dns_zone", "min_length": 1, @@ -2896,6 +2940,17 @@ "lowercase": false, "regex": "\"[^0-9A-Za-z _.-]\"" }, + { + "name": "azurerm_monitor_metric_alert", + "min_length": 1, + "max_length": 251, + "validation_regex": "\"^[^<>*%&:\\\\?+/#@{}]{0,250}[^<>*%&:\\\\?+/#@{}. ]$\"", + "scope": "resourceGroup", + "slug": "ma", + "dashes": true, + "lowercase": false, + "regex": "\"[<>*%&:\\\\?+/#@{}]\"" + }, { "name": "azurerm_monitor_private_link_scope", "min_length": 1, From 9778cbc680bd816d530d418aa08b8662cb692204 Mon Sep 17 00:00:00 2001 From: t3mi Date: Mon, 31 Oct 2022 09:44:29 +0000 Subject: [PATCH 8/8] add dns forwarding rulesets, private resolvers endpoints --- README.md | 3 ++ azurecaf/models_generated.go | 12 ++++++-- resourceDefinition.json | 57 ++++++++++++++++++++++++++++-------- 3 files changed, 57 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 7dd23c9..d91b23e 100644 --- a/README.md +++ b/README.md @@ -571,6 +571,9 @@ This is the current compreheensive status of the implemented resources in the pr |azurerm_private_dns_mx_record | ❌ | |azurerm_private_dns_ptr_record | ❌ | |azurerm_private_dns_resolver | ✔ | +|azurerm_private_dns_resolver_dns_forwarding_ruleset | ✔ | +|azurerm_private_dns_resolver_inbound_endpoint | ✔ | +|azurerm_private_dns_resolver_outbound_endpoint | ✔ | |azurerm_private_dns_srv_record | ❌ | |azurerm_private_dns_txt_record | ❌ | |azurerm_private_dns_zone | ✔ | diff --git a/azurecaf/models_generated.go b/azurecaf/models_generated.go index aab5b11..d3e44de 100644 --- a/azurecaf/models_generated.go +++ b/azurecaf/models_generated.go @@ -1,6 +1,6 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated by robots at -// 2022-11-01 08:22:55.69779605 +0000 UTC m=+0.004071626 +// 2022-11-01 08:25:39.661982793 +0000 UTC m=+0.005481209 // using data from // resourceDefinition.json and resourceDefinition_out_of_docs.json @@ -249,7 +249,10 @@ var ResourceDefinitions = map[string]ResourceStructure{ "azurerm_private_dns_cname_record": {"azurerm_private_dns_cname_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_mx_record": {"azurerm_private_dns_mx_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_ptr_record": {"azurerm_private_dns_ptr_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, - "azurerm_private_dns_resolver": {"azurerm_private_dns_resolver", "pdnsr", 3, 80, false, "[^0-9A-Za-z_-]", "^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$", true, "resourceGroup"}, + "azurerm_private_dns_resolver": {"azurerm_private_dns_resolver", "dnspr", 3, 80, false, "[^0-9A-Za-z_-]", "^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$", true, "resourceGroup"}, + "azurerm_private_dns_resolver_dns_forwarding_ruleset": {"azurerm_private_dns_resolver_dns_forwarding_ruleset", "dnsfwrs", 2, 80, false, "[^0-9A-Za-z_-]", "^[a-zA-Z][a-zA-Z0-9-_]{0,78}[a-zA-Z0-9]$", true, "resourceGroup"}, + "azurerm_private_dns_resolver_inbound_endpoint": {"azurerm_private_dns_resolver_inbound_endpoint", "dnsprie", 3, 80, false, "[^0-9A-Za-z_-]", "^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$", true, "parent"}, + "azurerm_private_dns_resolver_outbound_endpoint": {"azurerm_private_dns_resolver_outbound_endpoint", "dnsproe", 3, 80, false, "[^0-9A-Za-z_-]", "^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$", true, "parent"}, "azurerm_private_dns_srv_record": {"azurerm_private_dns_srv_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_txt_record": {"azurerm_private_dns_txt_record", "pdnsrec", 1, 80, false, "[^a-zA-Z0-9\\-\\._]", "^[a-zA-Z0-9][a-zA-Z0-9\\-\\._]{0,78}[a-zA-Z0-9_]$", true, "parent"}, "azurerm_private_dns_zone": {"azurerm_private_dns_zone", "pdns", 1, 63, false, "[^0-9A-Za-z_.-]", "^[a-zA-Z0-9][a-zA-Z0-9-._]{0,61}[a-zA-Z0-9_]$", true, "resourceGroup"}, @@ -494,6 +497,10 @@ var ResourceMaps = map[string]string{ "dlsfw": "azurerm_data_lake_store_firewall_rule", "dms": "azurerm_database_migration_service", "dns": "azurerm_dns_zone", + "dnsfwrs": "azurerm_private_dns_resolver_dns_forwarding_ruleset", + "dnspr": "azurerm_private_dns_resolver", + "dnsprie": "azurerm_private_dns_resolver_inbound_endpoint", + "dnsproe": "azurerm_private_dns_resolver_outbound_endpoint", "dnsrec": "azurerm_dns_a_record", "dpbpb": "azurerm_data_protection_backup_policy_blob_storage", "dpbpd": "azurerm_data_protection_backup_policy_disk", @@ -585,7 +592,6 @@ var ResourceMaps = map[string]string{ "nw": "azurerm_network_watcher", "pbi": "azurerm_powerbi_embedded", "pdns": "azurerm_private_dns_zone", - "pdnsr": "azurerm_private_dns_resolver", "pdnsrec": "azurerm_private_dns_a_record", "pdnszg": "azurerm_private_dns_zone_group", "pe": "azurerm_private_endpoint", diff --git a/resourceDefinition.json b/resourceDefinition.json index b4fc46a..0a536e5 100644 --- a/resourceDefinition.json +++ b/resourceDefinition.json @@ -2527,7 +2527,40 @@ "max_length": 80, "validation_regex": "\"^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$\"", "scope": "resourceGroup", - "slug": "pdnsr", + "slug": "dnspr", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z_-]\"" + }, + { + "name": "azurerm_private_dns_resolver_dns_forwarding_ruleset", + "min_length": 2, + "max_length": 80, + "validation_regex": "\"^[a-zA-Z][a-zA-Z0-9-_]{0,78}[a-zA-Z0-9]$\"", + "scope": "resourceGroup", + "slug": "dnsfwrs", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z_-]\"" + }, + { + "name": "azurerm_private_dns_resolver_inbound_endpoint", + "min_length": 3, + "max_length": 80, + "validation_regex": "\"^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$\"", + "scope": "parent", + "slug": "dnsprie", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z_-]\"" + }, + { + "name": "azurerm_private_dns_resolver_outbound_endpoint", + "min_length": 3, + "max_length": 80, + "validation_regex": "\"^[a-zA-Z][a-zA-Z0-9-_]{1,78}[a-zA-Z0-9]$\"", + "scope": "parent", + "slug": "dnsproe", "dashes": true, "lowercase": false, "regex": "\"[^0-9A-Za-z_-]\"" @@ -2918,6 +2951,17 @@ "lowercase": false, "regex": "`[^~!@$^*()\\[\\]\\{\\}_\\-=\"';,0-9A-Za-z _.-]`" }, + { + "name": "azurerm_monitor_activity_log_alert", + "min_length": 1, + "max_length": 260, + "validation_regex": "\"^[^<>*%:&?#\\\\+\\\\/]{0,259}[^<>*%:&.?#\\\\+\\\\/]$\"", + "scope": "parent", + "slug": "adfmysql", + "dashes": true, + "lowercase": false, + "regex": "\"[^0-9A-Za-z<>*%:&?#\\\\+\\\\/]\"" + }, { "name": "azurerm_monitor_autoscale_setting", "min_length": 2, @@ -3116,17 +3160,6 @@ "lowercase": false, "regex": "\"[\\\\/\\\"\\\\[\\\\]:|<>+=;,?*@&_]\"" }, - { - "name": "azurerm_monitor_activity_log_alert", - "min_length": 1, - "max_length": 260, - "validation_regex": "\"^[^<>*%:&?#\\\\+\\\\/]{0,259}[^<>*%:&.?#\\\\+\\\\/]$\"", - "scope": "parent", - "slug": "adfmysql", - "dashes": true, - "lowercase": false, - "regex": "\"[^0-9A-Za-z<>*%:&?#\\\\+\\\\/]\"" - }, { "name": "azurerm_vpn_site", "min_length": 1,