Skip to content

dependencies: bump go-azure-sdk to v0.20230606.1092251 #22053

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

Merged
stephybun merged 3 commits into from
Jun 6, 2023
Merged

dependencies: bump go-azure-sdk to v0.20230606.1092251 #22053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0e9eaa
bump go-azure-sdk to v0.20230606.1092251
stephybun Jun 6, 2023
b1aa97b
use expand and flatten for user assigned identity map
stephybun Jun 6, 2023
cf007c7
goimports
stephybun Jun 6, 2023
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 go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.1.2
github.com/hashicorp/go-azure-helpers v0.56.0
github.com/hashicorp/go-azure-sdk v0.20230523.1140858
github.com/hashicorp/go-azure-sdk v0.20230606.1092251
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-uuid v1.0.3
github.com/hashicorp/go-version v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
github.com/hashicorp/go-azure-helpers v0.12.0/go.mod h1:Zc3v4DNeX6PDdy7NljlYpnrdac1++qNW0I4U+ofGwpg=
github.com/hashicorp/go-azure-helpers v0.56.0 h1:KxDXISHwWe4PKEz6FSSPG8vCXNrFGsCcCn/AI94ccig=
github.com/hashicorp/go-azure-helpers v0.56.0/go.mod h1:MbnCV9jPmlkbdH7VsoBK8IbCHvo3pLWRbRvq+F6u9sI=
github.com/hashicorp/go-azure-sdk v0.20230523.1140858 h1:pstzTqIYBr2XnthdjCen/1DefYSGls6hSfQqYGWMuZo=
github.com/hashicorp/go-azure-sdk v0.20230523.1140858/go.mod h1:x2r7/U5MKlTHUO6/hFHRNO03qkRLBYyeQOuEUHkZmEg=
github.com/hashicorp/go-azure-sdk v0.20230606.1092251 h1:8A7dj8V+gQxumfncEDzmHEM9RnKyMWDu+jXjqOV8/II=
github.com/hashicorp/go-azure-sdk v0.20230606.1092251/go.mod h1:x2r7/U5MKlTHUO6/hFHRNO03qkRLBYyeQOuEUHkZmEg=
github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU=
github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg=
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
Expand Down
5 changes: 3 additions & 2 deletions internal/services/resource/resource_deployment_script_azure_cli_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"time"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-sdk/resource-manager/resources/2020-10-01/deploymentscripts"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
Expand Down Expand Up @@ -73,7 +74,7 @@ func (r ResourceDeploymentScriptAzureCliResource) Create() sdk.ResourceFunc {
},
}

identityValue, err := expandManagedServiceIdentityModel(metadata.ResourceData.Get("identity").([]interface{}))
identityValue, err := identity.ExpandUserAssignedMap(metadata.ResourceData.Get("identity").([]interface{}))
if err != nil {
return err
}
Expand Down Expand Up @@ -149,7 +150,7 @@ func (r ResourceDeploymentScriptAzureCliResource) Read() sdk.ResourceFunc {
Location: location.Normalize(model.Location),
}

identityValue, err := flattenManagedServiceIdentityModel(model.Identity)
identityValue, err := identity.FlattenUserAssignedMap(model.Identity)
if err != nil {
return err
}
Expand Down
5 changes: 3 additions & 2 deletions internal/services/resource/resource_deployment_script_azure_power_shell_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"time"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-sdk/resource-manager/resources/2020-10-01/deploymentscripts"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
Expand Down Expand Up @@ -73,7 +74,7 @@ func (r ResourceDeploymentScriptAzurePowerShellResource) Create() sdk.ResourceFu
},
}

identityValue, err := expandManagedServiceIdentityModel(metadata.ResourceData.Get("identity").([]interface{}))
identityValue, err := identity.ExpandUserAssignedMap(metadata.ResourceData.Get("identity").([]interface{}))
if err != nil {
return err
}
Expand Down Expand Up @@ -149,7 +150,7 @@ func (r ResourceDeploymentScriptAzurePowerShellResource) Read() sdk.ResourceFunc
Location: location.Normalize(model.Location),
}

identityValue, err := flattenManagedServiceIdentityModel(model.Identity)
identityValue, err := identity.FlattenUserAssignedMap(model.Identity)
if err != nil {
return err
}
Expand Down
54 changes: 0 additions & 54 deletions internal/services/resource/resource_deployment_script_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"time"

"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
"github.com/hashicorp/go-azure-sdk/resource-manager/resources/2020-10-01/deploymentscripts"
"github.com/hashicorp/terraform-provider-azurerm/helpers/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
Expand Down Expand Up @@ -455,33 +454,6 @@ func expandEnvironmentVariableModelArray(inputList []EnvironmentVariableModel) *
return &outputList
}

func expandManagedServiceIdentityModel(inputList []interface{}) (*deploymentscripts.ManagedServiceIdentity, error) {
if len(inputList) == 0 {
return nil, nil
}

identityValue, err := identity.ExpandUserAssignedMap(inputList)
if err != nil {
return nil, fmt.Errorf("expanding `identity`: %+v", err)
}

userAssignedIdentities := make(map[string]deploymentscripts.UserAssignedIdentity)
for k, v := range identityValue.IdentityIds {
userAssignedIdentities[k] = deploymentscripts.UserAssignedIdentity{
ClientId: v.ClientId,
PrincipalId: v.PrincipalId,
}
}

identityType := deploymentscripts.ManagedServiceIdentityType(identityValue.Type)
output := deploymentscripts.ManagedServiceIdentity{
Type: &identityType,
UserAssignedIdentities: &userAssignedIdentities,
}

return &output, nil
}

func expandStorageAccountConfigurationModel(inputList []StorageAccountConfigurationModel) *deploymentscripts.StorageAccountConfiguration {
if len(inputList) == 0 {
return nil
Expand Down Expand Up @@ -551,32 +523,6 @@ func flattenEnvironmentVariableModelArray(inputList *[]deploymentscripts.Environ
return outputList
}

func flattenManagedServiceIdentityModel(input *deploymentscripts.ManagedServiceIdentity) (*[]interface{}, error) {
var transform *identity.UserAssignedMap

if input != nil {
transform = &identity.UserAssignedMap{
Type: identity.TypeNone,
IdentityIds: make(map[string]identity.UserAssignedIdentityDetails),
}

if input.Type != nil {
transform.Type = identity.Type(*input.Type)
}

if input.UserAssignedIdentities != nil {
for k, v := range *input.UserAssignedIdentities {
transform.IdentityIds[k] = identity.UserAssignedIdentityDetails{
ClientId: v.ClientId,
PrincipalId: v.PrincipalId,
}
}
}
}

return identity.FlattenUserAssignedMap(transform)
}

func flattenStorageAccountConfigurationModel(input *deploymentscripts.StorageAccountConfiguration, originalList []StorageAccountConfigurationModel) []StorageAccountConfigurationModel {
var outputList []StorageAccountConfigurationModel
if input == nil {
Expand Down
25 changes: 0 additions & 25 deletions ...shicorp/go-azure-sdk/resource-manager/resources/2020-10-01/deploymentscripts/constants.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions ...azure-sdk/resource-manager/resources/2020-10-01/deploymentscripts/model_azurecliscript.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions ...dk/resource-manager/resources/2020-10-01/deploymentscripts/model_azurepowershellscript.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions ...k/resource-manager/resources/2020-10-01/deploymentscripts/model_managedserviceidentity.go
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions ...sdk/resource-manager/resources/2020-10-01/deploymentscripts/model_userassignedidentity.go
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/errors.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 29 additions & 4 deletions vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/poller_lro.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ github.com/hashicorp/go-azure-helpers/resourcemanager/tags
github.com/hashicorp/go-azure-helpers/resourcemanager/zones
github.com/hashicorp/go-azure-helpers/sender
github.com/hashicorp/go-azure-helpers/storage
# github.com/hashicorp/go-azure-sdk v0.20230523.1140858
# github.com/hashicorp/go-azure-sdk v0.20230606.1092251
## explicit; go 1.19
github.com/hashicorp/go-azure-sdk/resource-manager/aad/2021-05-01/domainservices
github.com/hashicorp/go-azure-sdk/resource-manager/aadb2c/2021-04-01-preview
Expand Down