Skip to content

Commit

Permalink
Merge pull request #95 from pulumi/stack72/pulumi-v2.9.0
Browse files Browse the repository at this point in the history
Upgrade to Pulumi v2.9.0
  • Loading branch information
stack72 authored Aug 21, 2020
2 parents bdb2426 + 86efbe9 commit c2b8c59
Show file tree
Hide file tree
Showing 35 changed files with 4,157 additions and 964 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ CHANGELOG
=========

## HEAD (Unreleased)
_(none)_
* Upgrade to Pulumi v2.9.0, which adds type annotations and input/output classes to Python
* Upgrade to pulumi-terraform-bridge v2.7.2

---

Expand Down
7 changes: 4 additions & 3 deletions provider/cmd/pulumi-resource-azuread/schema.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.14

require (
github.com/hashicorp/terraform-plugin-sdk v1.7.0
github.com/pulumi/pulumi-terraform-bridge/v2 v2.5.2
github.com/pulumi/pulumi/sdk/v2 v2.5.1-0.20200630091945-bb358c4d2173
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.2
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200821035132-629254334213
github.com/terraform-providers/terraform-provider-azuread v0.11.0
)

Expand Down
133 changes: 133 additions & 0 deletions provider/go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,10 @@ func Provider() tfbridge.ProviderInfo {
},
},
Python: &tfbridge.PythonInfo{
// List any Python dependencies and their version ranges
Requires: map[string]string{
"pulumi": ">=2.0.0,<3.0.0",
"pulumi": ">=2.9.0,<3.0.0",
},
UsesIOClasses: true,
},
CSharp: &tfbridge.CSharpInfo{
PackageReferences: map[string]string{
Expand Down
10 changes: 10 additions & 0 deletions sdk/dotnet/Pulumi.AzureAD.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@
<NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup>

<PropertyGroup>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="version.txt" />
<Content Include="version.txt" />
Expand Down
15 changes: 0 additions & 15 deletions sdk/nodejs/README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
The Microsoft Azure Active Directory (Azure AD) provider package offers support for all Azure AD services and their properties.
Services are exposed as types such as `Application`, `Group`, and `User`, among many others. Using this
package allows you to programmatically declare instances of any Azure AD services using infrastructure as code, which
Pulumi then uses to drive the Azure REST API.

This package is typically used in conjunction with the [Pulumi Azure provider](https://www.pulumi.com/docs/reference/pkg/nodejs/pulumi/azure/).

If this is your first time using this package, these two resources may be helpful:

* [Azure Getting Started Guide](https://www.pulumi.com/docs/quickstart/azure): Get up and running quickly.
* [Azure Pulumi Setup Documentation](https://www.pulumi.com/docs/quickstart/azure/configure/): How to configure Pulumi
for use with your Azure account.

Use the navigation below to see detailed documentation, including sample code, for each of the supported Azure services.

> This provider is a derived work of the [Terraform Provider](https://github.com/terraform-providers/terraform-provider-azuread)
> distributed under [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). If you encounter a bug or missing feature,
> first check the [`pulumi/pulumi-azuread` repo](https://github.com/pulumi/pulumi-azuread/issues); however, if that doesn't turn up anything,
Expand Down
2 changes: 0 additions & 2 deletions sdk/nodejs/config/vars.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// *** Do not edit by hand unless you're certain you know what you are doing! ***

import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as utilities from "../utilities";

let __config = new pulumi.Config("azuread");
Expand Down
20 changes: 11 additions & 9 deletions sdk/nodejs/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,17 @@ export class Provider extends pulumi.ProviderResource {
*/
constructor(name: string, args?: ProviderArgs, opts?: pulumi.ResourceOptions) {
let inputs: pulumi.Inputs = {};
inputs["clientCertificatePassword"] = (args ? args.clientCertificatePassword : undefined) || (utilities.getEnv("ARM_CLIENT_CERTIFICATE_PASSWORD") || "");
inputs["clientCertificatePath"] = (args ? args.clientCertificatePath : undefined) || (utilities.getEnv("ARM_CLIENT_CERTIFICATE_PATH") || "");
inputs["clientId"] = (args ? args.clientId : undefined) || (utilities.getEnv("ARM_CLIENT_ID") || "");
inputs["clientSecret"] = (args ? args.clientSecret : undefined) || (utilities.getEnv("ARM_CLIENT_SECRET") || "");
inputs["environment"] = (args ? args.environment : undefined) || (utilities.getEnv("ARM_ENVIRONMENT") || "public");
inputs["msiEndpoint"] = (args ? args.msiEndpoint : undefined) || (utilities.getEnv("ARM_MSI_ENDPOINT") || "");
inputs["subscriptionId"] = (args ? args.subscriptionId : undefined) || (utilities.getEnv("ARM_SUBSCRIPTION_ID") || "");
inputs["tenantId"] = (args ? args.tenantId : undefined) || (utilities.getEnv("ARM_TENANT_ID") || "");
inputs["useMsi"] = pulumi.output((args ? args.useMsi : undefined) || (<any>utilities.getEnvBoolean("ARM_USE_MSI") || false)).apply(JSON.stringify);
{
inputs["clientCertificatePassword"] = (args ? args.clientCertificatePassword : undefined) || (utilities.getEnv("ARM_CLIENT_CERTIFICATE_PASSWORD") || "");
inputs["clientCertificatePath"] = (args ? args.clientCertificatePath : undefined) || (utilities.getEnv("ARM_CLIENT_CERTIFICATE_PATH") || "");
inputs["clientId"] = (args ? args.clientId : undefined) || (utilities.getEnv("ARM_CLIENT_ID") || "");
inputs["clientSecret"] = (args ? args.clientSecret : undefined) || (utilities.getEnv("ARM_CLIENT_SECRET") || "");
inputs["environment"] = (args ? args.environment : undefined) || (utilities.getEnv("ARM_ENVIRONMENT") || "public");
inputs["msiEndpoint"] = (args ? args.msiEndpoint : undefined) || (utilities.getEnv("ARM_MSI_ENDPOINT") || "");
inputs["subscriptionId"] = (args ? args.subscriptionId : undefined) || (utilities.getEnv("ARM_SUBSCRIPTION_ID") || "");
inputs["tenantId"] = (args ? args.tenantId : undefined) || (utilities.getEnv("ARM_TENANT_ID") || "");
inputs["useMsi"] = pulumi.output((args ? args.useMsi : undefined) || (<any>utilities.getEnvBoolean("ARM_USE_MSI") || false)).apply(JSON.stringify);
}
if (!opts) {
opts = {}
}
Expand Down
7 changes: 7 additions & 0 deletions sdk/python/pulumi_azuread/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,10 @@
from .service_principal_certificate import *
from .service_principal_password import *
from .user import *
from ._inputs import *
from . import outputs

# Make subpackages available:
from . import (
config,
)
Loading

0 comments on commit c2b8c59

Please sign in to comment.