Skip to content

Commit

Permalink
Upgrade to v1.3.0 of the AzureAD Terraform Provider (#142)
Browse files Browse the repository at this point in the history
  • Loading branch information
stack72 authored Feb 1, 2021
1 parent 9a1cf21 commit c5aef08
Show file tree
Hide file tree
Showing 59 changed files with 538 additions and 498 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CHANGELOG

## HEAD (Unreleased)
* Upgrading pulumi-terraform-bridge to v2.18.1
* Upgrade to v1.3.0 of the AzureAD Terraform Provider

---

Expand Down
138 changes: 82 additions & 56 deletions provider/cmd/pulumi-resource-azuread/schema.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,8 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/terraform-providers/terraform-provider-archive v1.3.0 h1:8WzDXMwTdTd4Z7KAUjnYwopk1DgGJ/DLH0xowJ8h+/8=
github.com/terraform-providers/terraform-provider-archive v1.3.0/go.mod h1:7oAwNW55F65KauS++/XmAnrXhLfQRTYt549eYs4zU0w=
github.com/terraform-providers/terraform-provider-azuread v1.2.2 h1:OPKVhxDpLwNvjrDhcDNF0AN8OISuTNiyAlvdd2AuSc4=
github.com/terraform-providers/terraform-provider-azuread v1.2.2/go.mod h1:d1LNrgnJ25DXzPYXL74mgunQ5+05m/f2pbddG8K5hr4=
github.com/terraform-providers/terraform-provider-azuread v1.3.0 h1:yB5a4qJdcPkLfCfZPIGYNBBHDOuiEiC/HzBbKAGAEr8=
github.com/terraform-providers/terraform-provider-azuread v1.3.0/go.mod h1:d1LNrgnJ25DXzPYXL74mgunQ5+05m/f2pbddG8K5hr4=
github.com/terraform-providers/terraform-provider-http v1.2.0 h1:pOP/SNlLjB18CydtTJJwzkZGkHYX3LWzIoQpYQuBdyw=
github.com/terraform-providers/terraform-provider-http v1.2.0/go.mod h1:2Iot921OkLVSZr8FbIkvRN84ZV3w+oFKb7RlmPTQQAQ=
github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6 h1:9VTskZOIRf2vKF3UL8TuWElry5pgUpV1tFSe/e/0m/E=
Expand Down
2 changes: 1 addition & 1 deletion provider/shim/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.15

require (
github.com/hashicorp/terraform-plugin-sdk/v2 v2.3.0
github.com/terraform-providers/terraform-provider-azuread v1.2.2
github.com/terraform-providers/terraform-provider-azuread v1.3.0
)

replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20201218231525-9cca98608a5e
4 changes: 2 additions & 2 deletions provider/shim/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/terraform-providers/terraform-provider-azuread v1.2.2 h1:OPKVhxDpLwNvjrDhcDNF0AN8OISuTNiyAlvdd2AuSc4=
github.com/terraform-providers/terraform-provider-azuread v1.2.2/go.mod h1:d1LNrgnJ25DXzPYXL74mgunQ5+05m/f2pbddG8K5hr4=
github.com/terraform-providers/terraform-provider-azuread v1.3.0 h1:yB5a4qJdcPkLfCfZPIGYNBBHDOuiEiC/HzBbKAGAEr8=
github.com/terraform-providers/terraform-provider-azuread v1.3.0/go.mod h1:d1LNrgnJ25DXzPYXL74mgunQ5+05m/f2pbddG8K5hr4=
github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok=
github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ=
Expand Down
4 changes: 2 additions & 2 deletions sdk/dotnet/Application.cs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public partial class Application : Pulumi.CustomResource
public Output<ImmutableArray<Outputs.ApplicationAppRole>> AppRoles { get; private set; } = null!;

/// <summary>
/// The Application ID.
/// The Application ID (Client ID).
/// </summary>
[Output("applicationId")]
public Output<string> ApplicationId { get; private set; } = null!;
Expand Down Expand Up @@ -478,7 +478,7 @@ public InputList<Inputs.ApplicationAppRoleGetArgs> AppRoles
}

/// <summary>
/// The Application ID.
/// The Application ID (Client ID).
/// </summary>
[Input("applicationId")]
public Input<string>? ApplicationId { get; set; }
Expand Down
50 changes: 21 additions & 29 deletions sdk/dotnet/ApplicationCertificate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,6 @@ namespace Pulumi.AzureAD
///
/// &gt; **NOTE:** If you're authenticating using a Service Principal then it must have permissions to both `Read and write all applications` and `Sign in and read user profile` within the `Windows Azure Active Directory` API.
///
/// ## Example Usage
///
/// ```csharp
/// using System.IO;
/// using Pulumi;
/// using AzureAD = Pulumi.AzureAD;
///
/// class MyStack : Stack
/// {
/// public MyStack()
/// {
/// var exampleApplication = new AzureAD.Application("exampleApplication", new AzureAD.ApplicationArgs
/// {
/// });
/// var exampleApplicationCertificate = new AzureAD.ApplicationCertificate("exampleApplicationCertificate", new AzureAD.ApplicationCertificateArgs
/// {
/// ApplicationObjectId = exampleApplication.Id,
/// Type = "AsymmetricX509Cert",
/// Value = File.ReadAllText("cert.pem"),
/// EndDate = "2021-05-01T01:02:03Z",
/// });
/// }
///
/// }
/// ```
///
/// ## Import
///
/// Certificates can be imported using the `object id` of an Application and the `key id` of the certificate, e.g.
Expand All @@ -57,6 +31,12 @@ public partial class ApplicationCertificate : Pulumi.CustomResource
[Output("applicationObjectId")]
public Output<string> ApplicationObjectId { get; private set; } = null!;

/// <summary>
/// Specifies the encoding used for the supplied certificate data. Must be one of `pem`, `base64` or `hex`. Defaults to `pem`.
/// </summary>
[Output("encoding")]
public Output<string?> Encoding { get; private set; } = null!;

/// <summary>
/// The End Date which the Certificate is valid until, formatted as a RFC3339 date string (e.g. `2018-01-01T01:02:03Z`). Changing this field forces a new resource to be created.
/// </summary>
Expand Down Expand Up @@ -88,7 +68,7 @@ public partial class ApplicationCertificate : Pulumi.CustomResource
public Output<string?> Type { get; private set; } = null!;

/// <summary>
/// The Certificate for this Service Principal.
/// The certificate data, which can be PEM encoded, base64 encoded DER or hexadecimal encoded DER. See also the `encoding` argument.
/// </summary>
[Output("value")]
public Output<string> Value { get; private set; } = null!;
Expand Down Expand Up @@ -145,6 +125,12 @@ public sealed class ApplicationCertificateArgs : Pulumi.ResourceArgs
[Input("applicationObjectId", required: true)]
public Input<string> ApplicationObjectId { get; set; } = null!;

/// <summary>
/// Specifies the encoding used for the supplied certificate data. Must be one of `pem`, `base64` or `hex`. Defaults to `pem`.
/// </summary>
[Input("encoding")]
public Input<string>? Encoding { get; set; }

/// <summary>
/// The End Date which the Certificate is valid until, formatted as a RFC3339 date string (e.g. `2018-01-01T01:02:03Z`). Changing this field forces a new resource to be created.
/// </summary>
Expand Down Expand Up @@ -176,7 +162,7 @@ public sealed class ApplicationCertificateArgs : Pulumi.ResourceArgs
public Input<string>? Type { get; set; }

/// <summary>
/// The Certificate for this Service Principal.
/// The certificate data, which can be PEM encoded, base64 encoded DER or hexadecimal encoded DER. See also the `encoding` argument.
/// </summary>
[Input("value", required: true)]
public Input<string> Value { get; set; } = null!;
Expand All @@ -194,6 +180,12 @@ public sealed class ApplicationCertificateState : Pulumi.ResourceArgs
[Input("applicationObjectId")]
public Input<string>? ApplicationObjectId { get; set; }

/// <summary>
/// Specifies the encoding used for the supplied certificate data. Must be one of `pem`, `base64` or `hex`. Defaults to `pem`.
/// </summary>
[Input("encoding")]
public Input<string>? Encoding { get; set; }

/// <summary>
/// The End Date which the Certificate is valid until, formatted as a RFC3339 date string (e.g. `2018-01-01T01:02:03Z`). Changing this field forces a new resource to be created.
/// </summary>
Expand Down Expand Up @@ -225,7 +217,7 @@ public sealed class ApplicationCertificateState : Pulumi.ResourceArgs
public Input<string>? Type { get; set; }

/// <summary>
/// The Certificate for this Service Principal.
/// The certificate data, which can be PEM encoded, base64 encoded DER or hexadecimal encoded DER. See also the `encoding` argument.
/// </summary>
[Input("value")]
public Input<string>? Value { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/GetApplication.cs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public sealed class GetApplicationResult
/// </summary>
public readonly ImmutableArray<Outputs.GetApplicationRequiredResourceAccessResult> RequiredResourceAccesses;
/// <summary>
/// The type of the permission
/// Specifies whether the id property references an `OAuth2Permission` or an `AppRole`.
/// </summary>
public readonly string Type;

Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/GetDomains.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public GetDomainsArgs()
public sealed class GetDomainsResult
{
/// <summary>
/// One or more `domain` blocks as defined below.
/// A list of domains. Each `domain` object provides the attributes documented below.
/// </summary>
public readonly ImmutableArray<Outputs.GetDomainsDomainResult> Domains;
/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/GetUsers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public sealed class GetUsersResult
/// </summary>
public readonly ImmutableArray<string> UserPrincipalNames;
/// <summary>
/// An Array of Azure AD Users. Each `user` object consists of the fields documented below.
/// A list of Azure AD Users. Each `user` object provides the attributes documented below.
/// </summary>
public readonly ImmutableArray<Outputs.GetUsersUserResult> Users;

Expand Down
6 changes: 6 additions & 0 deletions sdk/dotnet/Group.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ public partial class Group : Pulumi.CustomResource
[Output("name")]
public Output<string> Name { get; private set; } = null!;

/// <summary>
/// The Object ID of the Group.
/// </summary>
[Output("objectId")]
public Output<string> ObjectId { get; private set; } = null!;

Expand Down Expand Up @@ -236,6 +239,9 @@ public InputList<string> Members
[Input("name")]
public Input<string>? Name { get; set; }

/// <summary>
/// The Object ID of the Group.
/// </summary>
[Input("objectId")]
public Input<string>? ObjectId { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Inputs/ApplicationOauth2PermissionArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public sealed class ApplicationOauth2PermissionArgs : Pulumi.ResourceArgs
public Input<string>? AdminConsentDisplayName { get; set; }

/// <summary>
/// The unique identifier for one of the `OAuth2Permission` or `AppRole` instances that the resource application exposes.
/// The unique identifier of the app role. This attribute is computed and cannot be specified manually in this block. If you need to specify a custom `id`, it's recommended to use the azuread.ApplicationAppRole resource.
/// </summary>
[Input("id")]
public Input<string>? Id { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Inputs/ApplicationOauth2PermissionGetArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public sealed class ApplicationOauth2PermissionGetArgs : Pulumi.ResourceArgs
public Input<string>? AdminConsentDisplayName { get; set; }

/// <summary>
/// The unique identifier for one of the `OAuth2Permission` or `AppRole` instances that the resource application exposes.
/// The unique identifier of the app role. This attribute is computed and cannot be specified manually in this block. If you need to specify a custom `id`, it's recommended to use the azuread.ApplicationAppRole resource.
/// </summary>
[Input("id")]
public Input<string>? Id { get; set; }
Expand Down
8 changes: 4 additions & 4 deletions sdk/dotnet/Inputs/GetApplicationOauth2PermissionArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ public sealed class GetApplicationOauth2PermissionArgs : Pulumi.InvokeArgs
public string AdminConsentDisplayName { get; set; } = null!;

/// <summary>
/// The unique identifier of the `app_role`.
/// The unique identifier for one of the `OAuth2Permission` or `AppRole` instances that the resource application exposes.
/// </summary>
[Input("id", required: true)]
public string Id { get; set; } = null!;

/// <summary>
/// Determines if the app role is enabled.
/// Is this permission enabled?
/// </summary>
[Input("isEnabled", required: true)]
public bool IsEnabled { get; set; }

/// <summary>
/// The type of the permission
/// Specifies whether the id property references an `OAuth2Permission` or an `AppRole`.
/// </summary>
[Input("type", required: true)]
public string Type { get; set; } = null!;
Expand All @@ -55,7 +55,7 @@ public sealed class GetApplicationOauth2PermissionArgs : Pulumi.InvokeArgs
public string UserConsentDisplayName { get; set; } = null!;

/// <summary>
/// Specifies the value of the roles claim that the application should expect in the authentication and access tokens.
/// The name of this permission
/// </summary>
[Input("value", required: true)]
public string Value { get; set; } = null!;
Expand Down
6 changes: 3 additions & 3 deletions sdk/dotnet/Inputs/GetServicePrincipalOauth2PermissionArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ public sealed class GetServicePrincipalOauth2PermissionArgs : Pulumi.InvokeArgs
public string AdminConsentDisplayName { get; set; } = null!;

/// <summary>
/// The unique identifier of the `app_role`.
/// The unique identifier for one of the `OAuth2Permission`
/// </summary>
[Input("id", required: true)]
public string Id { get; set; } = null!;

/// <summary>
/// Determines if the app role is enabled.
/// Is this permission enabled?
/// </summary>
[Input("isEnabled", required: true)]
public bool IsEnabled { get; set; }
Expand All @@ -55,7 +55,7 @@ public sealed class GetServicePrincipalOauth2PermissionArgs : Pulumi.InvokeArgs
public string UserConsentDisplayName { get; set; } = null!;

/// <summary>
/// Specifies the value of the roles claim that the application should expect in the authentication and access tokens.
/// The name of this permission
/// </summary>
[Input("value", required: true)]
public string Value { get; set; } = null!;
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Inputs/ServicePrincipalAppRoleArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public InputList<string> AllowedMemberTypes
public Input<string>? Description { get; set; }

/// <summary>
/// The Display Name of the Azure Active Directory Application associated with this Service Principal.
/// The Display Name of the Application associated with this Service Principal.
/// </summary>
[Input("displayName")]
public Input<string>? DisplayName { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Inputs/ServicePrincipalAppRoleGetArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public InputList<string> AllowedMemberTypes
public Input<string>? Description { get; set; }

/// <summary>
/// The Display Name of the Azure Active Directory Application associated with this Service Principal.
/// The Display Name of the Application associated with this Service Principal.
/// </summary>
[Input("displayName")]
public Input<string>? DisplayName { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Outputs/ApplicationOauth2Permission.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public sealed class ApplicationOauth2Permission
/// </summary>
public readonly string? AdminConsentDisplayName;
/// <summary>
/// The unique identifier for one of the `OAuth2Permission` or `AppRole` instances that the resource application exposes.
/// The unique identifier of the app role. This attribute is computed and cannot be specified manually in this block. If you need to specify a custom `id`, it's recommended to use the azuread.ApplicationAppRole resource.
/// </summary>
public readonly string? Id;
/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions sdk/dotnet/Outputs/GetApplicationAppRoleResult.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ public sealed class GetApplicationAppRoleResult
/// </summary>
public readonly string DisplayName;
/// <summary>
/// The unique identifier of the `app_role`.
/// The unique identifier for one of the `OAuth2Permission` or `AppRole` instances that the resource application exposes.
/// </summary>
public readonly string Id;
/// <summary>
/// Determines if the app role is enabled.
/// Is this permission enabled?
/// </summary>
public readonly bool IsEnabled;
/// <summary>
/// Specifies the value of the roles claim that the application should expect in the authentication and access tokens.
/// The name of this permission
/// </summary>
public readonly string Value;

Expand Down
8 changes: 4 additions & 4 deletions sdk/dotnet/Outputs/GetApplicationOauth2PermissionResult.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ public sealed class GetApplicationOauth2PermissionResult
/// </summary>
public readonly string AdminConsentDisplayName;
/// <summary>
/// The unique identifier of the `app_role`.
/// The unique identifier for one of the `OAuth2Permission` or `AppRole` instances that the resource application exposes.
/// </summary>
public readonly string Id;
/// <summary>
/// Determines if the app role is enabled.
/// Is this permission enabled?
/// </summary>
public readonly bool IsEnabled;
/// <summary>
/// The type of the permission
/// Specifies whether the id property references an `OAuth2Permission` or an `AppRole`.
/// </summary>
public readonly string Type;
/// <summary>
Expand All @@ -42,7 +42,7 @@ public sealed class GetApplicationOauth2PermissionResult
/// </summary>
public readonly string UserConsentDisplayName;
/// <summary>
/// Specifies the value of the roles claim that the application should expect in the authentication and access tokens.
/// The name of this permission
/// </summary>
public readonly string Value;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ namespace Pulumi.AzureAD.Outputs
public sealed class GetApplicationRequiredResourceAccessResourceAccessResult
{
/// <summary>
/// The unique identifier of the `app_role`.
/// The unique identifier for one of the `OAuth2Permission` or `AppRole` instances that the resource application exposes.
/// </summary>
public readonly string Id;
/// <summary>
/// The type of the permission
/// Specifies whether the id property references an `OAuth2Permission` or an `AppRole`.
/// </summary>
public readonly string Type;

Expand Down
6 changes: 3 additions & 3 deletions sdk/dotnet/Outputs/GetServicePrincipalAppRoleResult.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ public sealed class GetServicePrincipalAppRoleResult
/// </summary>
public readonly string DisplayName;
/// <summary>
/// The unique identifier of the `app_role`.
/// The unique identifier for one of the `OAuth2Permission`
/// </summary>
public readonly string Id;
/// <summary>
/// Determines if the app role is enabled.
/// Is this permission enabled?
/// </summary>
public readonly bool IsEnabled;
/// <summary>
/// Specifies the value of the roles claim that the application should expect in the authentication and access tokens.
/// The name of this permission
/// </summary>
public readonly string Value;

Expand Down
Loading

0 comments on commit c5aef08

Please sign in to comment.