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

[Azure] Add sovereign cloud support for MySQL #862

Closed
wants to merge 7 commits into from
Closed

[Azure] Add sovereign cloud support for MySQL #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f27e14c
Add getBaseURI
davidkpiano Mar 22, 2021
64d9826
Update ci.yml
polatengin Apr 5, 2021
3fed811
Merge branch 'master' into davidkpiano/get-base-uri
davidkpiano Apr 8, 2021
6dea8cd
Add CreateMySQLServerClientE
davidkpiano Apr 8, 2021
d21672b
Merge remote-tracking branch 'upstream/master'
rguthriemsft Apr 17, 2021
37db7e5
Add CreateMySQLServerClientE
davidkpiano Apr 8, 2021
9260c85
Merge branch 'davidkpiano/811-mysql' of https://github.com/aztfmod/te…
davidkpiano Apr 21, 2021
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
30 changes: 30 additions & 0 deletions modules/azure/client_factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
"github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2019-11-01/containerservice"
kvmng "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault"
"github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql"
"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-06-01/subscriptions"
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage"
autorestAzure "github.com/Azure/go-autorest/autorest/azure"
Expand Down Expand Up @@ -206,6 +207,35 @@ func CreateStorageBlobContainerClientE(subscriptionID string) (*storage.BlobCont
return &blobContainerClient, nil
}

// CreateMySQLServerClientE is a helper function that will setup a mysql server client.
func CreateMySQLServerClientE(subscriptionID string) (*mysql.ServersClient, error) {
// Validate Azure subscription ID
subscriptionID, err := getTargetAzureSubscription(subscriptionID)
if err != nil {
return nil, err
}

// Lookup environment URI
baseURI, err := getBaseURI()
if err != nil {
return nil, err
}

// Create a mysql server client
mysqlClient := mysql.NewServersClientWithBaseURI(baseURI, subscriptionID)

// Create an authorizer
authorizer, err := NewAuthorizer()
if err != nil {
return nil, err
}

// Attach authorizer to the client
mysqlClient.Authorizer = *authorizer

return &mysqlClient, nil
}

// GetKeyVaultURISuffixE returns the proper KeyVault URI suffix for the configured Azure environment.
// This function would fail the test if there is an error.
func GetKeyVaultURISuffixE() (string, error) {
Expand Down
3 changes: 2 additions & 1 deletion modules/azure/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
)

// GetMYSQLServerClientE is a helper function that will setup a mysql server client.
// TODO: remove in next version
davidkpiano marked this conversation as resolved.
Show resolved Hide resolved
func GetMYSQLServerClientE(subscriptionID string) (*mysql.ServersClient, error) {
// Validate Azure subscription ID
subscriptionID, err := getTargetAzureSubscription(subscriptionID)
Expand Down Expand Up @@ -43,7 +44,7 @@ func GetMYSQLServer(t testing.TestingT, resGroupName string, serverName string,
// GetMYSQLServerE is a helper function that gets the server.
func GetMYSQLServerE(t testing.TestingT, subscriptionID string, resGroupName string, serverName string) (*mysql.Server, error) {
// Create a mySQl Server client
mysqlClient, err := GetMYSQLServerClientE(subscriptionID)
mysqlClient, err := CreateMySQLServerClientE(subscriptionID)
if err != nil {
return nil, err
}
Expand Down