Merge pull request #47 from pulumi/stack72/pulumi-v2.9.0

Upgrade to Pulumi v2.9.0

CHANGELOG.md

@@ -2,7 +2,8 @@ CHANGELOG
 =========
 
 ## HEAD (Unreleased)
-_(none)_
+* Upgrade to pulumi-terraform-bridge v2.7.0
+* Upgrade to Pulumi v2.9.0, which adds type annotations and input/output classes to Python
 
 ---
 

README.md

@@ -1,4 +1,10 @@
-[![Build Status](https://travis-ci.com/pulumi/pulumi-keycloak.svg?token=eHg7Zp5zdDDJfTjY8ejq&branch=master)](https://travis-ci.com/pulumi/pulumi-keycloak)
+[![Actions Status](https://github.com/pulumi/pulumi-keycloak/workflows/master/badge.svg)](https://github.com/pulumi/pulumi-keycloak/actions)
+[![Slack](http://www.pulumi.com/images/docs/badges/slack.svg)](https://slack.pulumi.com)
+[![NPM version](https://badge.fury.io/js/%40pulumi%2Fkeycloak.svg)](https://www.npmjs.com/package/@pulumi/keycloak)
+[![Python version](https://badge.fury.io/py/pulumi-keycloak.svg)](https://pypi.org/project/pulumi-keycloak)
+[![NuGet version](https://badge.fury.io/nu/pulumi.keycloak.svg)](https://badge.fury.io/nu/pulumi.keycloak)
+[![PkgGoDev](https://pkg.go.dev/badge/github.com/pulumi/pulumi-keycloak/sdk/v3/go)](https://pkg.go.dev/github.com/pulumi/pulumi-keycloak/sdk/v3/go)
+[![License](https://img.shields.io/npm/l/%40pulumi%2Fpulumi.svg)](https://github.com/pulumi/pulumi-keycloak/blob/master/LICENSE)
 
 # Keycloak Resource Provider
 

provider/go.mod

@@ -11,6 +11,6 @@ replace (
 require (
 	github.com/hashicorp/terraform-plugin-sdk v1.7.0
 	github.com/mrparkers/terraform-provider-keycloak v0.0.0-00010101000000-000000000000
-	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
 )

provider/resources.go

@@ -270,10 +270,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{

sdk/dotnet/Pulumi.Keycloak.csproj

@@ -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" />

sdk/go/keycloak/getRealm.go

@@ -31,7 +31,7 @@ import (
 // 			return err
 // 		}
 // 		_, err = keycloak.NewRole(ctx, "group", &keycloak.RoleArgs{
-// 			RealmId: pulumi.String(data.Keycloak_realm.Id),
+// 			RealmId: pulumi.Any(data.Keycloak_realm.Id),
 // 		})
 // 		if err != nil {
 // 			return err

sdk/go/keycloak/role.go

@@ -78,7 +78,7 @@ import (
 // 			return err
 // 		}
 // 		_, err = keycloak.NewRole(ctx, "clientRole", &keycloak.RoleArgs{
-// 			ClientId:    pulumi.String(keycloak_client.Client.Id),
+// 			ClientId:    pulumi.Any(keycloak_client.Client.Id),
 // 			Description: pulumi.String("My Client Role"),
 // 			RealmId:     realm.ID(),
 // 		})
@@ -144,7 +144,7 @@ import (
 // 			return err
 // 		}
 // 		_, err = keycloak.NewRole(ctx, "clientRole", &keycloak.RoleArgs{
-// 			ClientId:    pulumi.String(keycloak_client.Client.Id),
+// 			ClientId:    pulumi.Any(keycloak_client.Client.Id),
 // 			Description: pulumi.String("My Client Role"),
 // 			RealmId:     realm.ID(),
 // 		})

sdk/go/keycloak/saml/userAttributeProtocolMapper.go

@@ -42,14 +42,14 @@ import (
 // 		}
 // 		samlClient, err := saml.NewClient(ctx, "samlClient", &saml.ClientArgs{
 // 			ClientId: pulumi.String("test-saml-client"),
-// 			RealmId:  pulumi.String(keycloak_realm.Test.Id),
+// 			RealmId:  pulumi.Any(keycloak_realm.Test.Id),
 // 		})
 // 		if err != nil {
 // 			return err
 // 		}
 // 		_, err = saml.NewUserAttributeProtocolMapper(ctx, "samlUserAttributeMapper", &saml.UserAttributeProtocolMapperArgs{
 // 			ClientId:                samlClient.ID(),
-// 			RealmId:                 pulumi.String(keycloak_realm.Test.Id),
+// 			RealmId:                 pulumi.Any(keycloak_realm.Test.Id),
 // 			SamlAttributeName:       pulumi.String("displayName"),
 // 			SamlAttributeNameFormat: pulumi.String("Unspecified"),
 // 			UserAttribute:           pulumi.String("displayName"),

sdk/go/keycloak/saml/userPropertyProtocolMapper.go

@@ -42,14 +42,14 @@ import (
 // 		}
 // 		samlClient, err := saml.NewClient(ctx, "samlClient", &saml.ClientArgs{
 // 			ClientId: pulumi.String("test-saml-client"),
-// 			RealmId:  pulumi.String(keycloak_realm.Test.Id),
+// 			RealmId:  pulumi.Any(keycloak_realm.Test.Id),
 // 		})
 // 		if err != nil {
 // 			return err
 // 		}
 // 		_, err = saml.NewUserPropertyProtocolMapper(ctx, "samlUserPropertyMapper", &saml.UserPropertyProtocolMapperArgs{
 // 			ClientId:                samlClient.ID(),
-// 			RealmId:                 pulumi.String(keycloak_realm.Test.Id),
+// 			RealmId:                 pulumi.Any(keycloak_realm.Test.Id),
 // 			SamlAttributeName:       pulumi.String("email"),
 // 			SamlAttributeNameFormat: pulumi.String("Unspecified"),
 // 			UserProperty:            pulumi.String("email"),

sdk/nodejs/config/vars.ts

@@ -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("keycloak");

sdk/nodejs/provider.ts

@@ -35,17 +35,19 @@ export class Provider extends pulumi.ProviderResource {
      */
     constructor(name: string, args?: ProviderArgs, opts?: pulumi.ResourceOptions) {
         let inputs: pulumi.Inputs = {};
-        inputs["basePath"] = args ? args.basePath : undefined;
-        inputs["clientId"] = (args ? args.clientId : undefined) || utilities.getEnv("KEYCLOAK_CLIENT_ID");
-        inputs["clientSecret"] = (args ? args.clientSecret : undefined) || utilities.getEnv("KEYCLOAK_CLIENT_SECRET");
-        inputs["clientTimeout"] = pulumi.output((args ? args.clientTimeout : undefined) || (<any>utilities.getEnvNumber("KEYCLOAK_CLIENT_TIMEOUT") || 5)).apply(JSON.stringify);
-        inputs["initialLogin"] = pulumi.output(args ? args.initialLogin : undefined).apply(JSON.stringify);
-        inputs["password"] = (args ? args.password : undefined) || utilities.getEnv("KEYCLOAK_PASSWORD");
-        inputs["realm"] = (args ? args.realm : undefined) || (utilities.getEnv("KEYCLOAK_REALM") || "master");
-        inputs["rootCaCertificate"] = args ? args.rootCaCertificate : undefined;
-        inputs["tlsInsecureSkipVerify"] = pulumi.output(args ? args.tlsInsecureSkipVerify : undefined).apply(JSON.stringify);
-        inputs["url"] = (args ? args.url : undefined) || utilities.getEnv("KEYCLOAK_URL");
-        inputs["username"] = (args ? args.username : undefined) || utilities.getEnv("KEYCLOAK_USER");
+        {
+            inputs["basePath"] = args ? args.basePath : undefined;
+            inputs["clientId"] = (args ? args.clientId : undefined) || utilities.getEnv("KEYCLOAK_CLIENT_ID");
+            inputs["clientSecret"] = (args ? args.clientSecret : undefined) || utilities.getEnv("KEYCLOAK_CLIENT_SECRET");
+            inputs["clientTimeout"] = pulumi.output((args ? args.clientTimeout : undefined) || (<any>utilities.getEnvNumber("KEYCLOAK_CLIENT_TIMEOUT") || 5)).apply(JSON.stringify);
+            inputs["initialLogin"] = pulumi.output(args ? args.initialLogin : undefined).apply(JSON.stringify);
+            inputs["password"] = (args ? args.password : undefined) || utilities.getEnv("KEYCLOAK_PASSWORD");
+            inputs["realm"] = (args ? args.realm : undefined) || (utilities.getEnv("KEYCLOAK_REALM") || "master");
+            inputs["rootCaCertificate"] = args ? args.rootCaCertificate : undefined;
+            inputs["tlsInsecureSkipVerify"] = pulumi.output(args ? args.tlsInsecureSkipVerify : undefined).apply(JSON.stringify);
+            inputs["url"] = (args ? args.url : undefined) || utilities.getEnv("KEYCLOAK_URL");
+            inputs["username"] = (args ? args.username : undefined) || utilities.getEnv("KEYCLOAK_USER");
+        }
         if (!opts) {
             opts = {}
         }

sdk/python/README.md

@@ -1,4 +1,10 @@
-[![Build Status](https://travis-ci.com/pulumi/pulumi-keycloak.svg?token=eHg7Zp5zdDDJfTjY8ejq&branch=master)](https://travis-ci.com/pulumi/pulumi-keycloak)
+[![Actions Status](https://github.com/pulumi/pulumi-keycloak/workflows/master/badge.svg)](https://github.com/pulumi/pulumi-keycloak/actions)
+[![Slack](http://www.pulumi.com/images/docs/badges/slack.svg)](https://slack.pulumi.com)
+[![NPM version](https://badge.fury.io/js/%40pulumi%2Fkeycloak.svg)](https://www.npmjs.com/package/@pulumi/keycloak)
+[![Python version](https://badge.fury.io/py/pulumi-keycloak.svg)](https://pypi.org/project/pulumi-keycloak)
+[![NuGet version](https://badge.fury.io/nu/pulumi.keycloak.svg)](https://badge.fury.io/nu/pulumi.keycloak)
+[![PkgGoDev](https://pkg.go.dev/badge/github.com/pulumi/pulumi-keycloak/sdk/v3/go)](https://pkg.go.dev/github.com/pulumi/pulumi-keycloak/sdk/v3/go)
+[![License](https://img.shields.io/npm/l/%40pulumi%2Fpulumi.svg)](https://github.com/pulumi/pulumi-keycloak/blob/master/LICENSE)
 
 # Keycloak Resource Provider
 

sdk/python/pulumi_keycloak/__init__.py

@@ -2,7 +2,6 @@
 # *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
 # *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-import importlib
 # Export this package's modules as members:
 from .attribute_importer_identity_provider_mapper import *
 from .attribute_to_role_identity_mapper import *
@@ -28,16 +27,15 @@
 from .user import *
 from .user_roles import *
 from .user_template_importer_identity_provider_mapper import *
+from ._inputs import *
+from . import outputs
 
 # Make subpackages available:
-_submodules = [
-    'authentication',
-    'config',
-    'ldap',
-    'oidc',
-    'openid',
-    'saml',
-]
-for pkg in _submodules:
-    if pkg != 'config':
-        importlib.import_module(f'{__name__}.{pkg}')
+from . import (
+    authentication,
+    config,
+    ldap,
+    oidc,
+    openid,
+    saml,
+)