Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: MySQL Flex Server Auto IOPS Scaling #23391

Closed
wants to merge 7 commits into from
Closed

Feature: MySQL Flex Server Auto IOPS Scaling #23391

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
39345f3
Included the autoIoScaling feature for MySQL Flexible server. Updated…
Siddarthyuvaraj Sep 19, 2023
7bb27fc
Merge branch 'main' of https://github.com/fidelity/terraform-provider…
Siddarthyuvaraj Sep 26, 2023
4758334
Merge branch 'hashicorp:main' into fidelity-20230918-193143
Siddarthyuvaraj Sep 26, 2023
c5bfa78
fixed the linting in test case
Siddarthyuvaraj Sep 27, 2023
4be6b62
Merge branch 'fidelity-20230918-193143' of https://github.com/fidelit…
Siddarthyuvaraj Sep 27, 2023
ce12244
fixed the linting in test case
Siddarthyuvaraj Sep 27, 2023
1634591
fixed the linting in test case
Siddarthyuvaraj Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions internal/services/mysql/mysql_flexible_server_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ func dataSourceMysqlFlexibleServer() *pluginsdk.Resource {
Computed: true,
},

"iops_auto_scaling": {
Type: pluginsdk.TypeBool,
Computed: true,
},

"iops": {
Type: pluginsdk.TypeInt,
Computed: true,
Expand Down Expand Up @@ -255,6 +260,7 @@ func flattenDataSourceArmServerStorage(storage *servers.Storage) []interface{} {
"size_gb": size,
"iops": iops,
"auto_grow_enabled": *storage.AutoGrow == servers.EnableStatusEnumEnabled,
"iops_auto_scaling": *storage.AutoIoScaling == servers.EnableStatusEnumEnabled,
},
}
}
Expand Down
15 changes: 14 additions & 1 deletion internal/services/mysql/mysql_flexible_server_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,12 @@ func resourceMysqlFlexibleServer() *pluginsdk.Resource {
Default: true,
},

"iops_auto_scaling": {
Type: pluginsdk.TypeBool,
Optional: true,
Default: false,
},

"iops": {
Type: pluginsdk.TypeInt,
Optional: true,
Expand Down Expand Up @@ -760,12 +766,18 @@ func expandArmServerStorage(inputs []interface{}) *servers.Storage {

input := inputs[0].(map[string]interface{})
autoGrow := servers.EnableStatusEnumDisabled
iopsAutoScaling := servers.EnableStatusEnumDisabled
if v := input["auto_grow_enabled"].(bool); v {
autoGrow = servers.EnableStatusEnumEnabled
}

if v := input["iops_auto_scaling"].(bool); v {
iopsAutoScaling = servers.EnableStatusEnumEnabled
}

storage := servers.Storage{
AutoGrow: &autoGrow,
AutoGrow: &autoGrow,
AutoIoScaling: &iopsAutoScaling,
}

if v := input["size_gb"].(int); v != 0 {
Expand Down Expand Up @@ -798,6 +810,7 @@ func flattenArmServerStorage(storage *servers.Storage) []interface{} {
"size_gb": size,
"iops": iops,
"auto_grow_enabled": *storage.AutoGrow == servers.EnableStatusEnumEnabled,
"iops_auto_scaling": *storage.AutoIoScaling == servers.EnableStatusEnumEnabled,
},
}
}
Expand Down
2 changes: 2 additions & 0 deletions internal/services/mysql/mysql_flexible_server_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,7 @@
size_gb = 32
iops = 400
auto_grow_enabled = false
iops_auto_scaling = false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here

Suggested change
iops_auto_scaling = false
iops_auto_scaling = false

}

delegated_subnet_id = azurerm_subnet.test.id
Expand Down Expand Up @@ -971,7 +972,7 @@
}

func (r MySqlFlexibleServerResource) updateStorage(data acceptance.TestData, sizeGB int, iops int, enabled bool) string {
return fmt.Sprintf(`

Check failure on line 975 in internal/services/mysql/mysql_flexible_server_resource_test.go

View workflow job for this annotation

GitHub Actions / test 

fmt.Sprintf format %t reads arg #6, but call has 5 args

Check failure on line 975 in internal/services/mysql/mysql_flexible_server_resource_test.go

View workflow job for this annotation

GitHub Actions / golint 

printf: fmt.Sprintf format %t reads arg #6, but call has 5 args (govet)
%s

resource "azurerm_mysql_flexible_server" "test" {
Expand All @@ -989,6 +990,7 @@
size_gb = %d
iops = %d
auto_grow_enabled = %t
iops_auto_scaling = %t
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't lined up properly

Suggested change
iops_auto_scaling = %t
iops_auto_scaling = %t

}
}
`, r.template(data), data.RandomInteger, sizeGB, iops, enabled)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test is failing as it's missing an argument down below

Suggested change
`, r.template(data), data.RandomInteger, sizeGB, iops, enabled)
`, r.template(data), data.RandomInteger, sizeGB, iops, enabled, enabled)

Expand Down
2 changes: 2 additions & 0 deletions website/docs/d/mysql_flexible_server.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ A `storage` block exports the following:

* `auto_grow_enabled` - Is Storage Auto Grow enabled?

* `iops_auto_scaling` - Is Iops Auto Scaling enabled?

* `iops` - The storage IOPS of the MySQL Flexible Server.

* `size_gb` - The max storage allowed for the MySQL Flexible Server.
Expand Down
2 changes: 2 additions & 0 deletions website/docs/r/mysql_flexible_server.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ A `storage` block supports the following:

* `auto_grow_enabled` - (Optional) Should Storage Auto Grow be enabled? Defaults to `true`.

* `iops_auto_scaling` - (Optional) Should Iops Auto Scaling be enabled? Defaults to `false`.

* `iops` - (Optional) The storage IOPS for the MySQL Flexible Server. Possible values are between `360` and `20000`.

* `size_gb` - (Optional) The max storage allowed for the MySQL Flexible Server. Possible values are between `20` and `16384`.
Expand Down
Loading