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: app_service_environment #4956

Closed
wants to merge 10 commits into from
Closed

New resource: app_service_environment #4956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
596dd5d
WIP: New Resource: `azurerm_app_service_environment`
tombuildsstuff Feb 21, 2018
f5fe9c3
Switching to deploying v2 ASE's
tombuildsstuff Mar 16, 2018
3c9273b
Merge commit from master
justinbarias Oct 25, 2019
d623a47
Uplift app-service-environment branch to v1.35
justinbarias Nov 4, 2019
1556f39
Merge branch 'master' into app-service-environment
justinbarias Nov 22, 2019
5a786d3
Add function to workaround return type issue
justinbarias Nov 22, 2019
e6ba6f3
Merge branch 'app-service-environment' of https://github.com/justinba…
justinbarias Nov 22, 2019
27b8cf0
Update appService managed identity types.
justinbarias Nov 22, 2019
7202810
Update vendor folder
justinbarias Nov 22, 2019
37b9c3c
Fix lint issues
justinbarias Nov 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
2 changes: 1 addition & 1 deletion azurerm/data_source_app_service_certificate_order.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags"
Expand Down
5 changes: 2 additions & 3 deletions azurerm/helpers/azure/app_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"regexp"
"strings"

"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress"
Expand Down Expand Up @@ -226,7 +226,6 @@ func SchemaAppServiceIdentity() *schema.Schema {
ValidateFunc: validation.StringInSlice([]string{
string(web.ManagedServiceIdentityTypeNone),
string(web.ManagedServiceIdentityTypeSystemAssigned),
string(web.ManagedServiceIdentityTypeSystemAssignedUserAssigned),
string(web.ManagedServiceIdentityTypeUserAssigned),
}, true),
DiffSuppressFunc: suppress.CaseDifference,
Expand Down Expand Up @@ -1337,7 +1336,7 @@ func ExpandAppServiceIdentity(d *schema.ResourceData) *web.ManagedServiceIdentit
Type: identityType,
}

if managedServiceIdentity.Type == web.ManagedServiceIdentityTypeUserAssigned || managedServiceIdentity.Type == web.ManagedServiceIdentityTypeSystemAssignedUserAssigned {
if managedServiceIdentity.Type == web.ManagedServiceIdentityTypeUserAssigned {
managedServiceIdentity.UserAssignedIdentities = identityIds
}

Expand Down
2 changes: 1 addition & 1 deletion azurerm/helpers/azure/app_service_schedule_backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/Azure/go-autorest/autorest/date"

"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
)
Expand Down
2 changes: 1 addition & 1 deletion azurerm/helpers/azure/web.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package azure

import (
"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)
Expand Down
27 changes: 16 additions & 11 deletions azurerm/internal/services/web/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
package web

import (
"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
)

type Client struct {
AppServicePlansClient *web.AppServicePlansClient
AppServicesClient *web.AppsClient
CertificatesClient *web.CertificatesClient
CertificatesOrderClient *web.AppServiceCertificateOrdersClient
BaseClient *web.BaseClient
AppServicePlansClient *web.AppServicePlansClient
AppServicesClient *web.AppsClient
AppServiceEnvironmentsClient *web.AppServiceEnvironmentsClient
CertificatesClient *web.CertificatesClient
CertificatesOrderClient *web.AppServiceCertificateOrdersClient
BaseClient *web.BaseClient
}

func BuildClient(o *common.ClientOptions) *Client {
AppServicePlansClient := web.NewAppServicePlansClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&AppServicePlansClient.Client, o.ResourceManagerAuthorizer)

AppServiceEnvironmentsClient := web.NewAppServiceEnvironmentsClient(o.SubscriptionId)
o.ConfigureClient(&AppServiceEnvironmentsClient.Client, o.ResourceManagerAuthorizer)

AppServicesClient := web.NewAppsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&AppServicesClient.Client, o.ResourceManagerAuthorizer)

Expand All @@ -30,10 +34,11 @@ func BuildClient(o *common.ClientOptions) *Client {
o.ConfigureClient(&BaseClient.Client, o.ResourceManagerAuthorizer)

return &Client{
AppServicePlansClient: &AppServicePlansClient,
AppServicesClient: &AppServicesClient,
CertificatesClient: &CertificatesClient,
CertificatesOrderClient: &CertificatesOrderClient,
BaseClient: &BaseClient,
AppServicePlansClient: &AppServicePlansClient,
AppServiceEnvironmentsClient: &AppServiceEnvironmentsClient,
AppServicesClient: &AppServicesClient,
CertificatesClient: &CertificatesClient,
CertificatesOrderClient: &CertificatesOrderClient,
BaseClient: &BaseClient,
}
}
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 @@ -188,6 +188,7 @@ func Provider() terraform.ResourceProvider {
"azurerm_app_service_slot": resourceArmAppServiceSlot(),
"azurerm_app_service_source_control_token": resourceArmAppServiceSourceControlToken(),
"azurerm_app_service": resourceArmAppService(),
"azurerm_app_service_environment": resourceArmAppServiceEnvironment(),
"azurerm_application_gateway": resourceArmApplicationGateway(),
"azurerm_application_insights_api_key": resourceArmApplicationInsightsAPIKey(),
"azurerm_application_insights": resourceArmApplicationInsights(),
Expand Down
2 changes: 1 addition & 1 deletion azurerm/resource_arm_app_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"time"

"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/resource_arm_app_service_active_slot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/resource_arm_app_service_certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/resource_arm_app_service_certificate_order.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/resource_arm_app_service_custom_hostname_binding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
Expand Down
Loading