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.

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

Resource arm analysis services server #3721

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
9a4a468
add new analysis services server resource (blocking features commented)
r0bnet May 21, 2019
1ac0a98
add analysis services server documentation
r0bnet May 21, 2019
9b3aadd
comment out blob storage backup uri for now
r0bnet May 21, 2019
49522c5
rename function to make them distinct
r0bnet May 21, 2019
2a104c3
add analysis services client registration
r0bnet May 24, 2019
92a8107
add basic acc test for analysis services server
r0bnet May 27, 2019
891e572
add tests for tags and querypool_connection_mode
r0bnet May 27, 2019
1f1f466
add tests for admin_users but can't execute them currently
r0bnet May 27, 2019
65e20ac
remove obsolete nil checks
r0bnet Jun 7, 2019
db3d3d8
upgrade to v30.0.0 Azure go sdk
r0bnet Jun 11, 2019
25346f5
remove unused service fabric files
r0bnet Jun 11, 2019
334cb2a
add enable_powerbi_service and firewall rules; fix minor errors
r0bnet Jun 12, 2019
0c60eb8
ensure that enable_power_bi_service and ip filter rules will be set t…
r0bnet Jun 17, 2019
a7d8475
add test for firewall rules (not working yet)
r0bnet Jun 19, 2019
39eec58
rename ipv4_firewall_rules to singular; add test for firewall rules; …
r0bnet Jun 21, 2019
b462958
remove gateway id as i'm currently unsure how to test it (or what it is)
r0bnet Jun 21, 2019
d5287fa
Merge branch 'master' into resource_arm_analysis_services_server
r0bnet Jun 24, 2019
0e3f477
merge current master
r0bnet Jun 24, 2019
3965aa6
comment unused function out
r0bnet Jun 24, 2019
9d3b698
fix github comments on PR
r0bnet Jul 10, 2019
6ae9133
fix github comments on PR #2
r0bnet Jul 10, 2019
74a2293
Merge branch 'master' into resource_arm_analysis_services_server
r0bnet Jul 19, 2019
fe84342
fix merging problem
r0bnet Jul 19, 2019
01e300b
change firewall test to explicit config
r0bnet Jul 19, 2019
46c554e
fix some errors; enable adminUsers test but not working currently
r0bnet Jul 19, 2019
6e4ae47
fix linting error
r0bnet Jul 19, 2019
60943a1
fix linting error
r0bnet Jul 19, 2019
c131eed
fix admin users test
r0bnet Jul 19, 2019
0ee1c9f
Merge remote-tracking branch 'fork/resource_arm_analysis_services_ser…
r0bnet Jul 19, 2019
d71696e
adjust pr comments
r0bnet Jul 19, 2019
71fd632
fixing comments from code review
tombuildsstuff Jul 19, 2019
f003cb9
sidebar: fixing the ordering
tombuildsstuff Jul 19, 2019
7377923
r/analysis_services_server: ensuring the ID is set in the create
tombuildsstuff Jul 22, 2019
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
11 changes: 11 additions & 0 deletions azurerm/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"time"

resourcesprofile "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/resources/mgmt/resources"
"github.com/Azure/azure-sdk-for-go/services/analysisservices/mgmt/2017-08-01/analysisservices"
"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch"
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-06-01/compute"
"github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb"
Expand Down Expand Up @@ -256,6 +257,9 @@ type ArmClient struct {
// Web
appServicePlansClient web.AppServicePlansClient
appServicesClient web.AppsClient

// Analysis Services
analysisServicesServerClient analysisservices.ServersClient
}

func (c *ArmClient) configureClient(client *autorest.Client, auth autorest.Authorizer) {
Expand Down Expand Up @@ -402,6 +406,7 @@ func getArmClient(c *authentication.Config, skipProviderRegistration bool, partn
client.registerStorageClients(endpoint, c.SubscriptionID, auth)
client.registerStreamAnalyticsClients(endpoint, c.SubscriptionID, auth)
client.registerWebClients(endpoint, c.SubscriptionID, auth)
client.registerAnalysisServicesClients(endpoint, c.SubscriptionID, auth)

return &client, nil
}
Expand Down Expand Up @@ -833,6 +838,12 @@ func (c *ArmClient) registerWebClients(endpoint, subscriptionId string, auth aut
c.appServicesClient = appsClient
}

func (c *ArmClient) registerAnalysisServicesClients(endpoint, subscriptionId string, auth autorest.Authorizer) {
analysisServicesServersClient := analysisservices.NewServersClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&analysisServicesServersClient.Client, auth)
c.analysisServicesServerClient = analysisServicesServersClient
}

var (
storageKeyCacheMu sync.RWMutex
storageKeyCache = make(map[string]string)
Expand Down
1 change: 1 addition & 0 deletions azurerm/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ func Provider() terraform.ResourceProvider {
},

ResourcesMap: map[string]*schema.Resource{
"azurerm_analysis_services_server": resourceArmAnalysisServicesServer(),
"azurerm_api_management": resourceArmApiManagementService(),
"azurerm_api_management_api": resourceArmApiManagementApi(),
"azurerm_api_management_api_operation": resourceArmApiManagementApiOperation(),
Expand Down
Loading