Merge pull request #4170 from babinkos/patch-1

Update resource_arm_mariadb_server.go to support version 10.3
hashicorp · Aug 28, 2019 · 1aacf8e · 1aacf8e
2 parents dd2e5ff + d4ec0b0
commit 1aacf8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/azurerm/resource_arm_mariadb_server.go b/azurerm/resource_arm_mariadb_server.go
@@ -123,6 +123,7 @@ func resourceArmMariaDbServer() *schema.Resource {
 				ForceNew: true,
 				ValidateFunc: validation.StringInSlice([]string{
 					"10.2",
+					"10.3",
 				}, false),
 			},
 

diff --git a/website/docs/r/mariadb_server.html.markdown b/website/docs/r/mariadb_server.html.markdown
@@ -63,7 +63,7 @@ The following arguments are supported:
 
 * `administrator_login_password` - (Required) The Password associated with the `administrator_login` for the MariaDB Server.
 
-* `version` - (Required) Specifies the version of MariaDB to use. The valid value is `10.2`. Changing this forces a new resource to be created.
+* `version` - (Required) Specifies the version of MariaDB to use. Possible values are `10.2` and `10.3`. Changing this forces a new resource to be created.
 
 * `ssl_enforcement` - (Required) Specifies if SSL should be enforced on connections. Possible values are `Enabled` and `Disabled`.
-Original file line number
+Diff line change
@@ Expand Up / @@ -123,6 +123,7 @@ func resourceArmMariaDbServer() *schema.Resource { @@
     				ForceNew: true,
     				ValidateFunc: validation.StringInSlice([]string{
     					"10.2",
+    					"10.3",
     				}, false),
     			},
@@ Expand Down @@