Skip to content

Commit

Permalink
New Resource: MariaDB (#2406)
Browse files Browse the repository at this point in the history
* MariaDB Support

* Update for lint error

* Update website/docs/r/mariadb_server.html.markdown

Co-Authored-By: jeffreyCline <[email protected]>

* Update website/docs/r/mariadb_server.html.markdown

Co-Authored-By: jeffreyCline <[email protected]>

* Updates from PR comments

* Update azurerm/resource_arm_mariadb_server.go

Co-Authored-By: jeffreyCline <[email protected]>

* Update website/docs/r/mariadb_server.html.markdown

Co-Authored-By: jeffreyCline <[email protected]>

* Update website/docs/r/mariadb_server.html.markdown

Co-Authored-By: jeffreyCline <[email protected]>

* Update website/docs/r/mariadb_server.html.markdown

Co-Authored-By: jeffreyCline <[email protected]>

* Fix lint error

* Fix lint error

* Updated docs and added vCore validation

* Update website/docs/r/mariadb_server.html.markdown

Co-Authored-By: jeffreyCline <[email protected]>

* Update azurerm/resource_arm_mariadb_server.go

Co-Authored-By: jeffreyCline <[email protected]>

* Update azurerm/resource_arm_mariadb_server.go

Co-Authored-By: jeffreyCline <[email protected]>

* Update azurerm/resource_arm_mariadb_server_test.go

Co-Authored-By: jeffreyCline <[email protected]>

* Update azurerm/resource_arm_mariadb_server.go

Co-Authored-By: jeffreyCline <[email protected]>

* Update azurerm/resource_arm_mariadb_server.go

Co-Authored-By: jeffreyCline <[email protected]>

* Update azurerm/resource_arm_mariadb_server.go

Co-Authored-By: jeffreyCline <[email protected]>

* Update azurerm/resource_arm_mariadb_server.go

Co-Authored-By: jeffreyCline <[email protected]>

* Update azurerm/resource_arm_mariadb_server.go

Co-Authored-By: jeffreyCline <[email protected]>

* Updates per PR comments add more name validation

* Fixed lint errors

* Fixed lint error

* Updated changelog and PR comment

* Updated per PR comment

* Sync changlog with master

* Update changelog with mariadb

* Fixed one test issue
  • Loading branch information
WodansSon authored Dec 4, 2018
1 parent 7de6e5d commit 378109b
Show file tree
Hide file tree
Showing 20 changed files with 4,850 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
FEATURES:

* **New Data Source:** `azurerm_monitor_action_group` [GH-2430]
* **New Resource:** `azurerm_mariadb_server` [GH-2406]

IMPROVEMENTS:

Expand Down
6 changes: 6 additions & 0 deletions azurerm/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
"github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization"
"github.com/Azure/azure-sdk-for-go/services/preview/devspaces/mgmt/2018-06-01-preview/devspaces"
"github.com/Azure/azure-sdk-for-go/services/preview/dns/mgmt/2018-03-01-preview/dns"
"github.com/Azure/azure-sdk-for-go/services/preview/mariadb/mgmt/2018-06-01-preview/mariadb"
"github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights"
"github.com/Azure/azure-sdk-for-go/services/preview/msi/mgmt/2015-08-31-preview/msi"
"github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights"
Expand Down Expand Up @@ -169,6 +170,7 @@ type ArmClient struct {
devSpaceControllerClient devspaces.ControllersClient

// Databases
mariadbServersClient mariadb.ServersClient
mysqlConfigurationsClient mysql.ConfigurationsClient
mysqlDatabasesClient mysql.DatabasesClient
mysqlFirewallRulesClient mysql.FirewallRulesClient
Expand Down Expand Up @@ -639,6 +641,10 @@ func (c *ArmClient) registerDatabricksClients(endpoint, subscriptionId string, a
}

func (c *ArmClient) registerDatabases(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) {
mariadbServersClient := mariadb.NewServersClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&mariadbServersClient.Client, auth)
c.mariadbServersClient = mariadbServersClient

// MySQL
mysqlConfigClient := mysql.NewConfigurationsClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&mysqlConfigClient.Client, auth)
Expand Down
1 change: 1 addition & 0 deletions azurerm/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ func Provider() terraform.ResourceProvider {
"azurerm_logic_app_trigger_http_request": resourceArmLogicAppTriggerHttpRequest(),
"azurerm_logic_app_trigger_recurrence": resourceArmLogicAppTriggerRecurrence(),
"azurerm_logic_app_workflow": resourceArmLogicAppWorkflow(),
"azurerm_mariadb_server": resourceArmMariaDbServer(),
"azurerm_managed_disk": resourceArmManagedDisk(),
"azurerm_management_lock": resourceArmManagementLock(),
"azurerm_management_group": resourceArmManagementGroup(),
Expand Down
Loading

0 comments on commit 378109b

Please sign in to comment.