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

New Resource: azurerm_app_service #344

Merged
merged 31 commits into from
Sep 19, 2017
Merged

New Resource: azurerm_app_service #344

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
cf0726f
Adding azure app service resource
leostolyarov Jun 11, 2017
ceaf0d7
adding importer
leostolyarov Aug 19, 2017
6f8869b
adding some tests
leostolyarov Aug 19, 2017
27c3626
updating tests to use testlocation()
leostolyarov Aug 19, 2017
fbcb783
setting tags
leostolyarov Aug 19, 2017
2165bd0
Resolve App Service Import Acceptance test failure
Aug 23, 2017
92b89a0
removed additional spaces which were inserted by editor
Aug 23, 2017
74f9069
removing duplicates
leostolyarov Sep 1, 2017
f5f45a1
adding documentation
leostolyarov Sep 1, 2017
58be15a
running fmt
leostolyarov Sep 1, 2017
5141e2a
updating app service resource
leostolyarov Sep 1, 2017
1ebf2e5
updating app service code
leostolyarov Sep 3, 2017
be6793d
updating tests
leostolyarov Sep 3, 2017
2c8b16e
updating documentation
leostolyarov Sep 3, 2017
007c21b
setting site config
leostolyarov Sep 3, 2017
f2d292d
adding more tests
leostolyarov Sep 3, 2017
2a8813f
making use of utils module
leostolyarov Sep 4, 2017
dd51d15
WIP
tombuildsstuff Sep 14, 2017
5b0cf5c
Reserved requires an App Service Environment
tombuildsstuff Sep 15, 2017
0fc5a96
Fixing the Java apps
tombuildsstuff Sep 18, 2017
bd30db1
Adding tests for remote debugging
tombuildsstuff Sep 18, 2017
e43b775
remote debugging version needs to be computed
tombuildsstuff Sep 18, 2017
f60e228
Fixing the tests
tombuildsstuff Sep 18, 2017
83b8a61
Fixing the jetty tests
tombuildsstuff Sep 18, 2017
7dd051d
Removing linux support for the moment
tombuildsstuff Sep 18, 2017
8e3ac2e
Adding import tests
tombuildsstuff Sep 18, 2017
61d6167
Handling setting the appSettings/connectionStrings correctly
tombuildsstuff Sep 18, 2017
976e2b4
Updating the documentation
tombuildsstuff Sep 18, 2017
978c976
Removing the updates from the create
tombuildsstuff Sep 19, 2017
50f1a06
Updating the documentation
tombuildsstuff Sep 19, 2017
91f71fd
Updating the TODO's
tombuildsstuff Sep 19, 2017
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
15 changes: 7 additions & 8 deletions azurerm/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,11 @@ type ArmClient struct {
sqlServersClient sql.ServersClient

appServicePlansClient web.AppServicePlansClient
appServicesClient web.AppsClient

appInsightsClient appinsights.ComponentsClient

servicePrincipalsClient graphrbac.ServicePrincipalsClient

appsClient web.AppsClient
}

func withRequestLogging() autorest.SendDecorator {
Expand Down Expand Up @@ -642,6 +641,12 @@ func (c *Config) getArmClient() (*ArmClient, error) {
aspc.Sender = sender
client.appServicePlansClient = aspc

ac := web.NewAppsClientWithBaseURI(endpoint, c.SubscriptionID)
setUserAgent(&ac.Client)
ac.Authorizer = auth
ac.Sender = autorest.CreateSender(withRequestLogging())
client.appServicesClient = ac

ai := appinsights.NewComponentsClientWithBaseURI(endpoint, c.SubscriptionID)
setUserAgent(&ai.Client)
ai.Authorizer = auth
Expand All @@ -654,12 +659,6 @@ func (c *Config) getArmClient() (*ArmClient, error) {
spc.Sender = sender
client.servicePrincipalsClient = spc

ac := web.NewAppsClientWithBaseURI(endpoint, c.SubscriptionID)
setUserAgent(&ac.Client)
ac.Authorizer = auth
ac.Sender = sender
client.appsClient = ac

kvc := keyvault.NewVaultsClientWithBaseURI(endpoint, c.SubscriptionID)
setUserAgent(&kvc.Client)
kvc.Authorizer = auth
Expand Down
Loading