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

Jump to bottom

New Resource: MariaDB #2406

Merged
merged 33 commits into from
Dec 4, 2018
Merged

New Resource: MariaDB #2406

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
db2dddd
MariaDB Support
WodansSon Nov 29, 2018
1c8ff0e
Update for lint error
WodansSon Nov 29, 2018
7bcfdff
Update website/docs/r/mariadb_server.html.markdown
tombuildsstuff Nov 29, 2018
98a1da6
Update website/docs/r/mariadb_server.html.markdown
tombuildsstuff Nov 29, 2018
6003c57
Updates from PR comments
WodansSon Nov 29, 2018
79a8655
Update azurerm/resource_arm_mariadb_server.go
tombuildsstuff Nov 29, 2018
096fdab
Update website/docs/r/mariadb_server.html.markdown
tombuildsstuff Nov 29, 2018
1bad186
Update website/docs/r/mariadb_server.html.markdown
tombuildsstuff Nov 29, 2018
88b84cd
Update website/docs/r/mariadb_server.html.markdown
tombuildsstuff Nov 29, 2018
4d8fcd9
Fix lint error
WodansSon Nov 29, 2018
7f6efaf
Fix lint error
WodansSon Nov 29, 2018
3f05b1b
Updated docs and added vCore validation
WodansSon Nov 29, 2018
013c3ec
Update website/docs/r/mariadb_server.html.markdown
katbyte Nov 30, 2018
2f1868d
Update azurerm/resource_arm_mariadb_server.go
katbyte Nov 30, 2018
905d304
Update azurerm/resource_arm_mariadb_server.go
katbyte Nov 30, 2018
51da5fc
Update azurerm/resource_arm_mariadb_server_test.go
katbyte Nov 30, 2018
2f95967
Update azurerm/resource_arm_mariadb_server.go
katbyte Nov 30, 2018
cef2387
Update azurerm/resource_arm_mariadb_server.go
katbyte Nov 30, 2018
38de0b7
Update azurerm/resource_arm_mariadb_server.go
katbyte Nov 30, 2018
f80a39e
Update azurerm/resource_arm_mariadb_server.go
katbyte Nov 30, 2018
384ae16
Update azurerm/resource_arm_mariadb_server.go
katbyte Nov 30, 2018
e941a64
Updates per PR comments add more name validation
WodansSon Nov 30, 2018
d2d56e5
Fixed lint errors
WodansSon Nov 30, 2018
5a4c955
Fixed lint error
WodansSon Nov 30, 2018
a3a7958
Updated changelog and PR comment
WodansSon Dec 4, 2018
b4985da
Updated per PR comment
WodansSon Dec 4, 2018
bd165b4
Merge branch 'nr-mariadb' of https://github.com/terraform-providers/t…
WodansSon Dec 4, 2018
1472d03
Merge branch 'master' of https://github.com/terraform-providers/terra…
WodansSon Dec 4, 2018
751b40b
Merge branch 'master' into nr-mariadb
WodansSon Dec 4, 2018
d510f24
Sync changlog with master
WodansSon Dec 4, 2018
e5da692
Merge branch 'nr-mariadb' of https://github.com/terraform-providers/t…
WodansSon Dec 4, 2018
f86813c
Update changelog with mariadb
WodansSon Dec 4, 2018
fbd9a18
Fixed one test issue
WodansSon Dec 4, 2018
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 azurerm/config.go
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,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