Accept 8.0 as a correct version on MySQL server (#179)

terraform-linters · Jun 18, 2022 · 4e265a2 · 4e265a2
1 parent aff11ff
commit 4e265a2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 53 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -14,7 +14,7 @@ This documentation describes a list of rules available by enabling this ruleset.
 
 ## API Specification Rules
 
-These are the rules that warn against invalid values generated from [azure-rest-api-specs](https://github.com/Azure/azure-rest-api-specs). Currently, 231 rules are available.
+These are the rules that warn against invalid values generated from [azure-rest-api-specs](https://github.com/Azure/azure-rest-api-specs). Currently, 230 rules are available.
 
 |Rule|Enabled by default|
 | --- | --- |
@@ -178,7 +178,6 @@ These are the rules that warn against invalid values generated from [azure-rest-
 |[azurerm_mssql_virtual_machine_invalid_sql_license_type](rules/azurerm_mssql_virtual_machine_invalid_sql_license_type.md)|✔|
 |[azurerm_mysql_firewall_rule_invalid_end_ip_address](rules/azurerm_mysql_firewall_rule_invalid_end_ip_address.md)|✔|
 |[azurerm_mysql_firewall_rule_invalid_start_ip_address](rules/azurerm_mysql_firewall_rule_invalid_start_ip_address.md)|✔|
-|[azurerm_mysql_server_invalid_version](rules/azurerm_mysql_server_invalid_version.md)|✔|
 |[azurerm_nat_gateway_invalid_sku_name](rules/azurerm_nat_gateway_invalid_sku_name.md)|✔|
 |[azurerm_netapp_account_invalid_resource_group_name](rules/azurerm_netapp_account_invalid_resource_group_name.md)|✔|
 |[azurerm_netapp_pool_invalid_name](rules/azurerm_netapp_pool_invalid_name.md)|✔|

diff --git a/docs/rules/azurerm_mysql_server_invalid_version.md b/docs/rules/azurerm_mysql_server_invalid_version.md
diff --git a/rules/apispec/provider.go b/rules/apispec/provider.go
@@ -170,7 +170,6 @@ var Rules = []tflint.Rule{
 	NewAzurermMssqlVirtualMachineInvalidSQLLicenseTypeRule(),
 	NewAzurermMysqlFirewallRuleInvalidEndIPAddressRule(),
 	NewAzurermMysqlFirewallRuleInvalidStartIPAddressRule(),
-	NewAzurermMysqlServerInvalidVersionRule(),
 	NewAzurermNatGatewayInvalidSkuNameRule(),
 	NewAzurermNetappAccountInvalidResourceGroupNameRule(),
 	NewAzurermNetappPoolInvalidNameRule(),

diff --git a/...c/azurerm_mysql_server_invalid_version.go → ...s/azurerm_mysql_server_invalid_version.go b/...c/azurerm_mysql_server_invalid_version.go → ...s/azurerm_mysql_server_invalid_version.go
@@ -1,6 +1,4 @@
-// This file generated by `tools/apispec-rule-gen/main.go`. DO NOT EDIT
-
-package apispec
+package rules
 
 import (
 	"fmt"
@@ -26,7 +24,7 @@ func NewAzurermMysqlServerInvalidVersionRule() *AzurermMysqlServerInvalidVersion
 		attributeName: "version",
 		enum: []string{
 			"5.7",
-			"8.0.21",
+			"8.0",
 		},
 	}
 }
@@ -80,7 +78,7 @@ func (r *AzurermMysqlServerInvalidVersionRule) Check(runner tflint.Runner) error
 			if !found {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" is an invalid value as version`, truncateLongMessage(val)),
+					fmt.Sprintf(`"%s" is an invalid value as version`, val),
 					attribute.Expr.Range(),
 				)
 			}

diff --git a/rules/provider.go b/rules/provider.go
@@ -12,4 +12,5 @@ var Rules = append([]tflint.Rule{
 	NewAzurermVirtualMachineInvalidVMSizeRule(),
 	NewAzurermWindowsVirtualMachineInvalidSizeRule(),
 	NewAzurermWindowsVirtualMachineScaleSetInvalidSkuRule(),
+	NewAzurermMysqlServerInvalidVersionRule(),
 }, apispec.Rules...)
diff --git a/tools/apispec-rule-gen/mappings/azurerm_mysql_server.hcl b/tools/apispec-rule-gen/mappings/azurerm_mysql_server.hcl
@@ -5,6 +5,6 @@ mapping "azurerm_mysql_server" {
   sku_name                     = Sku.name
   administrator_login          = ServerProperties.administratorLogin
   administrator_login_password = ServerProperties.administratorLoginPassword
-  version                      = ServerVersion
+  version                      = any //ServerVersion
   ssl_enforcement              = any //SslEnforcement
 }