From 01187163f6f2c3b62197c62ed5988fe753447816 Mon Sep 17 00:00:00 2001 From: Josh Kodroff Date: Mon, 22 Nov 2021 09:11:08 -0500 Subject: [PATCH] Upgrade to v2.10.0 of the Azure AD Terraform provider. (#214) --- CHANGELOG.md | 2 +- provider/cmd/pulumi-resource-azuread/schema.json | 1 + provider/go.sum | 4 ++-- provider/shim/go.mod | 2 +- provider/shim/go.sum | 4 ++-- sdk/dotnet/Outputs/GetApplicationApiResult.cs | 3 +++ sdk/go/azuread/pulumiTypes.go | 7 +++++-- sdk/nodejs/types/output.ts | 3 +++ sdk/python/pulumi_azuread/outputs.py | 4 ++++ 9 files changed, 22 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2ae30da9..21909046b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ CHANGELOG ========= ## HEAD (Unreleased) -_(none)_ +* Upgrade to v2.9.0 of the AzureAD Terraform Provider --- diff --git a/provider/cmd/pulumi-resource-azuread/schema.json b/provider/cmd/pulumi-resource-azuread/schema.json index 29208ec0d..2296a26e2 100644 --- a/provider/cmd/pulumi-resource-azuread/schema.json +++ b/provider/cmd/pulumi-resource-azuread/schema.json @@ -1400,6 +1400,7 @@ "items": { "$ref": "#/types/azuread:index/getApplicationApiOauth2PermissionScope:getApplicationApiOauth2PermissionScope" }, + "description": "One or more `oauth2_permission_scope` blocks as documented below, to describe delegated permissions exposed by the web API represented by this application.\n", "language": { "python": { "mapCase": false diff --git a/provider/go.sum b/provider/go.sum index 671443516..5af621f24 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -482,8 +482,8 @@ github.com/hashicorp/terraform-plugin-sdk v1.7.0 h1:B//oq0ZORG+EkVrIJy0uPGSonvmX github.com/hashicorp/terraform-plugin-sdk v1.7.0/go.mod h1:OjgQmey5VxnPej/buEhe+YqKm0KNvV3QqU4hkqHqPCY= github.com/hashicorp/terraform-plugin-test v1.2.0 h1:AWFdqyfnOj04sxTdaAF57QqvW7XXrT8PseUHkbKsE8I= github.com/hashicorp/terraform-plugin-test v1.2.0/go.mod h1:QIJHYz8j+xJtdtLrFTlzQVC0ocr3rf/OjIpgZLK56Hs= -github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20211112012122-666ed0072b40 h1:uRjg9oMb+aHBwdOCT7BsYxeq0m1P9RrDnwgWQBlZOsY= -github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20211112012122-666ed0072b40/go.mod h1:QmnJXzFxwL1gDVJaCay7d/B0fS/LpjXsjl6BlxUp4dY= +github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20211119032845-8ecf7635d696 h1:43A3pzar6OuHQRqy6IlxTKQquxfk3UPXLqB2HaoY3k4= +github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20211119032845-8ecf7635d696/go.mod h1:QmnJXzFxwL1gDVJaCay7d/B0fS/LpjXsjl6BlxUp4dY= github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg= github.com/hashicorp/terraform-svchost v0.0.0-20191119180714-d2e4933b9136 h1:81Dg7SK6Q5vzqFItO8e1iIF2Nj8bLXV23NXjEgbev/s= github.com/hashicorp/terraform-svchost v0.0.0-20191119180714-d2e4933b9136/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg= diff --git a/provider/shim/go.mod b/provider/shim/go.mod index 9d5e4a291..c632795b7 100644 --- a/provider/shim/go.mod +++ b/provider/shim/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.8.0 - github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20211112012122-666ed0072b40 + github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20211119032845-8ecf7635d696 ) replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20201218231525-9cca98608a5e diff --git a/provider/shim/go.sum b/provider/shim/go.sum index 16ec3fe60..28f83b767 100644 --- a/provider/shim/go.sum +++ b/provider/shim/go.sum @@ -254,8 +254,8 @@ github.com/hashicorp/terraform-json v0.8.0 h1:XObQ3PgqU52YLQKEaJ08QtUshAfN3yu4u8 github.com/hashicorp/terraform-json v0.8.0/go.mod h1:3defM4kkMfttwiE7VakJDwCd4R+umhSQnvJwORXbprE= github.com/hashicorp/terraform-plugin-go v0.1.0 h1:kyXZ0nkHxiRev/q18N40IbRRk4AV0zE/MDJkDM3u8dY= github.com/hashicorp/terraform-plugin-go v0.1.0/go.mod h1:10V6F3taeDWVAoLlkmArKttR3IULlRWFAGtQIQTIDr4= -github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20211112012122-666ed0072b40 h1:uRjg9oMb+aHBwdOCT7BsYxeq0m1P9RrDnwgWQBlZOsY= -github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20211112012122-666ed0072b40/go.mod h1:QmnJXzFxwL1gDVJaCay7d/B0fS/LpjXsjl6BlxUp4dY= +github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20211119032845-8ecf7635d696 h1:43A3pzar6OuHQRqy6IlxTKQquxfk3UPXLqB2HaoY3k4= +github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20211119032845-8ecf7635d696/go.mod h1:QmnJXzFxwL1gDVJaCay7d/B0fS/LpjXsjl6BlxUp4dY= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864 h1:Y4V+SFe7d3iH+9pJCoeWIOS5/xBJIFsltS7E+KJSsJY= diff --git a/sdk/dotnet/Outputs/GetApplicationApiResult.cs b/sdk/dotnet/Outputs/GetApplicationApiResult.cs index 418a0eb87..33221bc97 100644 --- a/sdk/dotnet/Outputs/GetApplicationApiResult.cs +++ b/sdk/dotnet/Outputs/GetApplicationApiResult.cs @@ -21,6 +21,9 @@ public sealed class GetApplicationApiResult /// Allows an application to use claims mapping without specifying a custom signing key. /// public readonly bool MappedClaimsEnabled; + /// + /// One or more `oauth2_permission_scope` blocks as documented below, to describe delegated permissions exposed by the web API represented by this application. + /// public readonly ImmutableArray Oauth2PermissionScopes; /// /// The access token version expected by this resource. Possible values are `1` or `2`. diff --git a/sdk/go/azuread/pulumiTypes.go b/sdk/go/azuread/pulumiTypes.go index 4b2467ff6..7009e3f72 100644 --- a/sdk/go/azuread/pulumiTypes.go +++ b/sdk/go/azuread/pulumiTypes.go @@ -4545,7 +4545,8 @@ type GetApplicationApi struct { // A set of application IDs (client IDs), used for bundling consent if you have a solution that contains two parts: a client app and a custom web API app. KnownClientApplications []string `pulumi:"knownClientApplications"` // Allows an application to use claims mapping without specifying a custom signing key. - MappedClaimsEnabled bool `pulumi:"mappedClaimsEnabled"` + MappedClaimsEnabled bool `pulumi:"mappedClaimsEnabled"` + // One or more `oauth2PermissionScope` blocks as documented below, to describe delegated permissions exposed by the web API represented by this application. Oauth2PermissionScopes []GetApplicationApiOauth2PermissionScope `pulumi:"oauth2PermissionScopes"` // The access token version expected by this resource. Possible values are `1` or `2`. RequestedAccessTokenVersion int `pulumi:"requestedAccessTokenVersion"` @@ -4566,7 +4567,8 @@ type GetApplicationApiArgs struct { // A set of application IDs (client IDs), used for bundling consent if you have a solution that contains two parts: a client app and a custom web API app. KnownClientApplications pulumi.StringArrayInput `pulumi:"knownClientApplications"` // Allows an application to use claims mapping without specifying a custom signing key. - MappedClaimsEnabled pulumi.BoolInput `pulumi:"mappedClaimsEnabled"` + MappedClaimsEnabled pulumi.BoolInput `pulumi:"mappedClaimsEnabled"` + // One or more `oauth2PermissionScope` blocks as documented below, to describe delegated permissions exposed by the web API represented by this application. Oauth2PermissionScopes GetApplicationApiOauth2PermissionScopeArrayInput `pulumi:"oauth2PermissionScopes"` // The access token version expected by this resource. Possible values are `1` or `2`. RequestedAccessTokenVersion pulumi.IntInput `pulumi:"requestedAccessTokenVersion"` @@ -4633,6 +4635,7 @@ func (o GetApplicationApiOutput) MappedClaimsEnabled() pulumi.BoolOutput { return o.ApplyT(func(v GetApplicationApi) bool { return v.MappedClaimsEnabled }).(pulumi.BoolOutput) } +// One or more `oauth2PermissionScope` blocks as documented below, to describe delegated permissions exposed by the web API represented by this application. func (o GetApplicationApiOutput) Oauth2PermissionScopes() GetApplicationApiOauth2PermissionScopeArrayOutput { return o.ApplyT(func(v GetApplicationApi) []GetApplicationApiOauth2PermissionScope { return v.Oauth2PermissionScopes }).(GetApplicationApiOauth2PermissionScopeArrayOutput) } diff --git a/sdk/nodejs/types/output.ts b/sdk/nodejs/types/output.ts index 5e454a3a4..7a36889d7 100644 --- a/sdk/nodejs/types/output.ts +++ b/sdk/nodejs/types/output.ts @@ -384,6 +384,9 @@ export interface GetApplicationApi { * Allows an application to use claims mapping without specifying a custom signing key. */ mappedClaimsEnabled: boolean; + /** + * One or more `oauth2PermissionScope` blocks as documented below, to describe delegated permissions exposed by the web API represented by this application. + */ oauth2PermissionScopes: outputs.GetApplicationApiOauth2PermissionScope[]; /** * The access token version expected by this resource. Possible values are `1` or `2`. diff --git a/sdk/python/pulumi_azuread/outputs.py b/sdk/python/pulumi_azuread/outputs.py index 0831ce079..8c8071d06 100644 --- a/sdk/python/pulumi_azuread/outputs.py +++ b/sdk/python/pulumi_azuread/outputs.py @@ -2070,6 +2070,7 @@ def __init__(__self__, *, """ :param Sequence[str] known_client_applications: A set of application IDs (client IDs), used for bundling consent if you have a solution that contains two parts: a client app and a custom web API app. :param bool mapped_claims_enabled: Allows an application to use claims mapping without specifying a custom signing key. + :param Sequence['GetApplicationApiOauth2PermissionScopeArgs'] oauth2_permission_scopes: One or more `oauth2_permission_scope` blocks as documented below, to describe delegated permissions exposed by the web API represented by this application. :param int requested_access_token_version: The access token version expected by this resource. Possible values are `1` or `2`. """ pulumi.set(__self__, "known_client_applications", known_client_applications) @@ -2096,6 +2097,9 @@ def mapped_claims_enabled(self) -> bool: @property @pulumi.getter(name="oauth2PermissionScopes") def oauth2_permission_scopes(self) -> Sequence['outputs.GetApplicationApiOauth2PermissionScopeResult']: + """ + One or more `oauth2_permission_scope` blocks as documented below, to describe delegated permissions exposed by the web API represented by this application. + """ return pulumi.get(self, "oauth2_permission_scopes") @property