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

dependencies: update containerservice to 2023-06-02-preview #24473

Merged
merged 1 commit into from
Jan 31, 2024

Conversation

ms-henglu
Copy link
Contributor

No description provided.

@ms-henglu ms-henglu marked this pull request as ready for review January 12, 2024 04:09
@tombuildsstuff tombuildsstuff added the upstream/pandora This issue/PR has a dependency on an issue in `github.com/hashicorp/pandora` label Jan 12, 2024
@tombuildsstuff tombuildsstuff added this to the Blocked milestone Jan 12, 2024
@tombuildsstuff
Copy link
Member

Dependent on hashicorp/pandora#3612

go.mod Outdated
@@ -17,7 +17,7 @@ require (
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.1
github.com/hashicorp/go-azure-helpers v0.65.0
github.com/hashicorp/go-azure-sdk v0.20240111.1094251
github.com/hashicorp/go-azure-sdk v0.20240111.1120634
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's been mentioned frequently that the go-azure-sdk should always be bumped in a separate PR to avoid conflicts and the versions becoming outdated quickly, which has already happened in this case. Please remove this.

Comment on lines 1446 to 1448
func flattenClusterDataSourceIdentity(input *managedclusters.ManagedClusterIdentity) (*[]interface{}, error) {
if input == nil {
return nil, nil
}
identityIds := make(map[string]identity.UserAssignedIdentityDetails)
if input.UserAssignedIdentities != nil {
for k, v := range *input.UserAssignedIdentities {
identityIds[k] = identity.UserAssignedIdentityDetails{
PrincipalId: v.PrincipalId,
ClientId: v.ClientId,
}
}
}

out := identity.SystemOrUserAssignedMap{
IdentityIds: identityIds,
}
if input.Type != nil {
out.Type = identity.Type(*input.Type)
}
if input.PrincipalId != nil {
out.PrincipalId = *input.PrincipalId
}
if input.TenantId != nil {
out.TenantId = *input.TenantId
}

return identity.FlattenSystemOrUserAssignedMap(&out)
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't be necessary anymore since a fix for this was pushed to Pandora
hashicorp/pandora#3614

Suggested change
func flattenClusterDataSourceIdentity(input *managedclusters.ManagedClusterIdentity) (*[]interface{}, error) {
if input == nil {
return nil, nil
}
identityIds := make(map[string]identity.UserAssignedIdentityDetails)
if input.UserAssignedIdentities != nil {
for k, v := range *input.UserAssignedIdentities {
identityIds[k] = identity.UserAssignedIdentityDetails{
PrincipalId: v.PrincipalId,
ClientId: v.ClientId,
}
}
}
out := identity.SystemOrUserAssignedMap{
IdentityIds: identityIds,
}
if input.Type != nil {
out.Type = identity.Type(*input.Type)
}
if input.PrincipalId != nil {
out.PrincipalId = *input.PrincipalId
}
if input.TenantId != nil {
out.TenantId = *input.TenantId
}
return identity.FlattenSystemOrUserAssignedMap(&out)
}

@stephybun stephybun removed the upstream/pandora This issue/PR has a dependency on an issue in `github.com/hashicorp/pandora` label Jan 22, 2024
@tombuildsstuff
Copy link
Member

hey @ms-henglu

We’ve made some structural changes to hashicorp/go-azure-sdk which have split the SDK into multiple Go Modules. This means that the SDK which previously existed at github.com/hashicorp/go-azure-sdk now exists at:

  • github.com/hashicorp/go-azure-sdk/resource-manager - for the Resource Manager SDK.
  • github.com/hashicorp/go-azure-sdk/sdk - for the base layer.

We’ve updated the Provider to use the new Go Module structure in PR #24636 - as such would you mind rebasing this Pull Request on top of main to remove the merge conflict?

Thanks!

@ms-henglu ms-henglu closed this Jan 30, 2024
@github-actions github-actions bot added size/XS and removed size/XL labels Jan 30, 2024
@ms-henglu ms-henglu deleted the branch-240112-update-aks-sdk branch January 30, 2024 08:10
@ms-henglu ms-henglu restored the branch-240112-update-aks-sdk branch January 30, 2024 08:10
@ms-henglu ms-henglu reopened this Jan 30, 2024
@github-actions github-actions bot added size/XL and removed size/XS labels Jan 30, 2024
@ms-henglu
Copy link
Contributor Author

Hi @tombuildsstuff , thanks! I've rebased this PR. Please take another look.

Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests look fine, thanks @ms-henglu LGTM 👍

@stephybun stephybun removed this from the Blocked milestone Jan 31, 2024
@stephybun stephybun merged commit 7561c11 into hashicorp:main Jan 31, 2024
31 checks passed
@github-actions github-actions bot added this to the v3.90.0 milestone Jan 31, 2024
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants