From 12e1ab6ced8b040d0e44edd3cf60bc76d4ba2d49 Mon Sep 17 00:00:00 2001 From: njucz Date: Wed, 3 Mar 2021 17:28:51 +0800 Subject: [PATCH] update --- .../services/authorization/role_assignment_resource.go | 10 ++++++++-- .../mgmt/2018-09-01-preview/authorization/CHANGELOG.md | 5 ----- .../mgmt/2020-04-01-preview/authorization/CHANGELOG.md | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-09-01-preview/authorization/CHANGELOG.md diff --git a/azurerm/internal/services/authorization/role_assignment_resource.go b/azurerm/internal/services/authorization/role_assignment_resource.go index 0db46d38e3f6..302f27e7994a 100644 --- a/azurerm/internal/services/authorization/role_assignment_resource.go +++ b/azurerm/internal/services/authorization/role_assignment_resource.go @@ -177,11 +177,17 @@ func resourceArmRoleAssignmentCreate(d *schema.ResourceData, meta interface{}) e RoleDefinitionID: utils.String(roleDefinitionId), PrincipalID: utils.String(principalId), Description: utils.String(d.Get("description").(string)), - Condition: utils.String(d.Get("condition").(string)), - ConditionVersion: utils.String(d.Get("condition_version").(string)), }, } + if v, ok := d.GetOk("condition"); ok { + properties.RoleAssignmentProperties.Condition = utils.String(v.(string)) + } + + if v, ok := d.GetOk("condition_version"); ok { + properties.RoleAssignmentProperties.ConditionVersion = utils.String(v.(string)) + } + skipPrincipalCheck := d.Get("skip_service_principal_aad_check").(bool) if skipPrincipalCheck { properties.RoleAssignmentProperties.PrincipalType = authorization.ServicePrincipal diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-09-01-preview/authorization/CHANGELOG.md b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-09-01-preview/authorization/CHANGELOG.md deleted file mode 100644 index dbf52bd3fd29..000000000000 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-09-01-preview/authorization/CHANGELOG.md +++ /dev/null @@ -1,5 +0,0 @@ -Generated from https://github.com/Azure/azure-rest-api-specs/tree/3c764635e7d442b3e74caf593029fcd440b3ef82//specification/authorization/resource-manager/readme.md tag: `package-2018-09-01-preview` - -Code generator @microsoft.azure/autorest.go@2.1.175 - - diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2020-04-01-preview/authorization/CHANGELOG.md b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2020-04-01-preview/authorization/CHANGELOG.md index 55f3674ff701..428025fdb575 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2020-04-01-preview/authorization/CHANGELOG.md +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2020-04-01-preview/authorization/CHANGELOG.md @@ -1,5 +1,5 @@ Generated from https://github.com/Azure/azure-rest-api-specs/tree/d4bad535d456ee82c7fd17d1ec2b8802a0b83205//specification/authorization/resource-manager/readme.md tag: `package-2020-04-01-preview` -Code generator @microsoft.azure/autorest.go@2.1.171 +Code generator @microsoft.azure/autorest.go@2.1.175