Upgrade to Pulumi v3.0.0-beta.2

.github/workflows/master.yml

@@ -133,6 +133,8 @@ jobs:
         repo: pulumi/pulumictl
     - name: Install Pulumi CLI
       uses: pulumi/[email protected]
+      with:
+        pulumi-version: 3.0.0-beta.1
     - name: Run golangci
       run: make lint_provider
     - if: failure() && github.event_name == 'push'
@@ -169,6 +171,8 @@ jobs:
         repo: pulumi/pulumictl
     - name: Install Pulumi CLI
       uses: pulumi/[email protected]
+      with:
+        pulumi-version: 3.0.0-beta.1
     - name: Run golangci
       run: cd sdk/go/azuread && golangci-lint run -c ../../../.golangci.yml
     - if: failure() && github.event_name == 'push'

.goreleaser.prerelease.yml

@@ -30,6 +30,6 @@ builds:
 changelog:
   skip: true
 release:
-  prerelease: auto
+  disable: true
 snapshot:
   name_template: '{{ .Tag }}-SNAPSHOT'

examples/go.mod

@@ -5,8 +5,8 @@ go 1.16
 require (
 	github.com/onsi/ginkgo v1.12.0 // indirect
 	github.com/onsi/gomega v1.9.0 // indirect
-	github.com/pulumi/pulumi/pkg/v3 v3.0.0-20210324220902-b543e235f01d
-	github.com/pulumi/pulumi/sdk/v3 v3.0.0-20210324220902-b543e235f01d // indirect
+	github.com/pulumi/pulumi/pkg/v3 v3.0.0-beta.2
+	github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.2 // indirect
 	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
 	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
 )

examples/go.sum

@@ -723,6 +723,8 @@ github.com/pulumi/pulumi/pkg/v2 v2.22.1-0.20210309145724-0d5b3d375d56 h1:Gj/hkWP
 github.com/pulumi/pulumi/pkg/v2 v2.22.1-0.20210309145724-0d5b3d375d56/go.mod h1:bAbzFeU3gHu1diqcckqUqaFf5dP02BfJlP8dnHwm00k=
 github.com/pulumi/pulumi/pkg/v3 v3.0.0-20210324220902-b543e235f01d h1:1avqGOvRbUcsTMbAjhIdlpSOX23gdLXuBBq0YoHa5I4=
 github.com/pulumi/pulumi/pkg/v3 v3.0.0-20210324220902-b543e235f01d/go.mod h1:eMwJviOF/gL0fubZg6bW5CgleNqjNg90UE/Ww0MPtqg=
+github.com/pulumi/pulumi/pkg/v3 v3.0.0-beta.2 h1:9ZrTeR2CKNmyYjx4GprltxHGMRguno4shKRWedWBRvo=
+github.com/pulumi/pulumi/pkg/v3 v3.0.0-beta.2/go.mod h1:JCl+sZFEEeDQF1CLAYkxmQv7jxGsNVR7Sn2+gXTu/ag=
 github.com/pulumi/pulumi/sdk/v2 v2.2.1/go.mod h1:QNbWpL4gvf3X0lUFT7TXA2Jo1ff/Ti2l97AyFGYwvW4=
 github.com/pulumi/pulumi/sdk/v2 v2.9.3-0.20200901032843-632995149920 h1:LFtxbZuOINXf4jZB4FTQbsQJWfMp7TF11SjAO992i0Y=
 github.com/pulumi/pulumi/sdk/v2 v2.9.3-0.20200901032843-632995149920/go.mod h1:x84WPiFiuE+G4kJ5jUYkOxmnQJlWoJaHNeEYdqnCKA4=
@@ -731,6 +733,8 @@ github.com/pulumi/pulumi/sdk/v2 v2.22.1-0.20210309145724-0d5b3d375d56/go.mod h1:
 github.com/pulumi/pulumi/sdk/v3 v3.0.0-20210317132005-b866c3cc620e/go.mod h1:GBHyQ7awNQSRmiKp/p8kIKrGrMOZeA/k2czoM/GOqds=
 github.com/pulumi/pulumi/sdk/v3 v3.0.0-20210324220902-b543e235f01d h1:0ftlLO6CtdlI9nh4CEKEVh8t5fzT1SOVPw+c2n+YGfU=
 github.com/pulumi/pulumi/sdk/v3 v3.0.0-20210324220902-b543e235f01d/go.mod h1:GBHyQ7awNQSRmiKp/p8kIKrGrMOZeA/k2czoM/GOqds=
+github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.2 h1:uw3nUFEtygkBTSVjL+kvE12pS8imafKcALPewEFVv1c=
+github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.2/go.mod h1:GBHyQ7awNQSRmiKp/p8kIKrGrMOZeA/k2czoM/GOqds=
 github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8=
 github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af h1:gu+uRPtBe88sKxUCEXRoeCvVG90TJmwhiqRpvdhQFng=

provider/go.mod

@@ -3,8 +3,8 @@ module github.com/pulumi/pulumi-azuread/provider/v4
 go 1.16
 
 require (
-	github.com/pulumi/pulumi-terraform-bridge/v3 v3.0.0-20210325101119-03683ad99004
-	github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.1
+	github.com/pulumi/pulumi-terraform-bridge/v3 v3.0.0-beta.1
+	github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.2
 	github.com/terraform-providers/terraform-provider-azuread/shim v0.0.0
 )
 

provider/go.sum

@@ -705,10 +705,14 @@ github.com/pulumi/pulumi-terraform-bridge/v2 v2.22.1 h1:RkSW7kCuJY/afkoniEUlJ+bz
 github.com/pulumi/pulumi-terraform-bridge/v2 v2.22.1/go.mod h1:qaI8I+VbSqHC1LWNfr2mmCBRXanc9UT6l474CLtw/lY=
 github.com/pulumi/pulumi-terraform-bridge/v3 v3.0.0-20210325101119-03683ad99004 h1:1HJdKNMMNaCflAXE+7wMxOZ6b1zMvLiJy6Qw55i2JWo=
 github.com/pulumi/pulumi-terraform-bridge/v3 v3.0.0-20210325101119-03683ad99004/go.mod h1:IeFYW4fB+b0r7+LqSQGWdkzW9FLNilC/Ce7fU6PzcBY=
+github.com/pulumi/pulumi-terraform-bridge/v3 v3.0.0-beta.1 h1:PRhXkWZe81r0grnR7v8BoC3cns5yk6V6IvjmvM13NUg=
+github.com/pulumi/pulumi-terraform-bridge/v3 v3.0.0-beta.1/go.mod h1:ni4UwH2JZdaEcM9dz4qip2zB9gYOaNdEcGou4Bu2Dws=
 github.com/pulumi/pulumi/pkg/v2 v2.22.1-0.20210310211618-1f16423ede4c h1:ozWoZFocQfHmPahclxia6CGhP3eZ73XK6xznr4J5/cU=
 github.com/pulumi/pulumi/pkg/v2 v2.22.1-0.20210310211618-1f16423ede4c/go.mod h1:cghYgU9E3gorp3W0gIZshlUib4LtCh36XBTAzLQO7qI=
 github.com/pulumi/pulumi/pkg/v3 v3.0.0-20210324220902-b543e235f01d h1:1avqGOvRbUcsTMbAjhIdlpSOX23gdLXuBBq0YoHa5I4=
 github.com/pulumi/pulumi/pkg/v3 v3.0.0-20210324220902-b543e235f01d/go.mod h1:eMwJviOF/gL0fubZg6bW5CgleNqjNg90UE/Ww0MPtqg=
+github.com/pulumi/pulumi/pkg/v3 v3.0.0-beta.2 h1:9ZrTeR2CKNmyYjx4GprltxHGMRguno4shKRWedWBRvo=
+github.com/pulumi/pulumi/pkg/v3 v3.0.0-beta.2/go.mod h1:JCl+sZFEEeDQF1CLAYkxmQv7jxGsNVR7Sn2+gXTu/ag=
 github.com/pulumi/pulumi/sdk/v2 v2.2.1/go.mod h1:QNbWpL4gvf3X0lUFT7TXA2Jo1ff/Ti2l97AyFGYwvW4=
 github.com/pulumi/pulumi/sdk/v2 v2.22.1-0.20210310211618-1f16423ede4c h1:fQ8iJ0AwJSUt1j7A1CRpJSsi5Cr48b2XUxG6sl9vX2A=
 github.com/pulumi/pulumi/sdk/v2 v2.22.1-0.20210310211618-1f16423ede4c/go.mod h1:fCFhRV6NmidWetmgDPA76efL+s0JqLlS54JJIwfOt+o=
@@ -717,6 +721,8 @@ github.com/pulumi/pulumi/sdk/v3 v3.0.0-20210324220902-b543e235f01d h1:0ftlLO6Ctd
 github.com/pulumi/pulumi/sdk/v3 v3.0.0-20210324220902-b543e235f01d/go.mod h1:GBHyQ7awNQSRmiKp/p8kIKrGrMOZeA/k2czoM/GOqds=
 github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.1 h1:pJSaN1edck4ICJiSpeC7qdqPWNxQQ+/52aSCtFPWmT4=
 github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.1/go.mod h1:of2on912OvQZLA33FfNUcTEgRrTId7jvk9yFuvtaV88=
+github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.2 h1:uw3nUFEtygkBTSVjL+kvE12pS8imafKcALPewEFVv1c=
+github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.2/go.mod h1:GBHyQ7awNQSRmiKp/p8kIKrGrMOZeA/k2czoM/GOqds=
 github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e h1:Dik4Qe/+xguB8JagPyXNlbOnRiXGmq/PSPQTGunYnTk=
 github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e/go.mod h1:sZ9FUzGO+yM41hsQHs/yIcj/Y993qMdBxBU5mpDmAfQ=
 github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20201218231525-9cca98608a5e h1:jl43csgF3BSlNRmjo+TGgjW/uXk9h7+NoR3doKQ0BT4=

sdk/go.mod

@@ -5,5 +5,5 @@ go 1.16
 require (
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/pkg/errors v0.9.1
-	github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.1
+	github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.2
 )

sdk/go.sum

@@ -245,6 +245,8 @@ github.com/pulumi/pulumi/sdk/v3 v3.0.0-20210324220902-b543e235f01d h1:0ftlLO6Ctd
 github.com/pulumi/pulumi/sdk/v3 v3.0.0-20210324220902-b543e235f01d/go.mod h1:GBHyQ7awNQSRmiKp/p8kIKrGrMOZeA/k2czoM/GOqds=
 github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.1 h1:pJSaN1edck4ICJiSpeC7qdqPWNxQQ+/52aSCtFPWmT4=
 github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.1/go.mod h1:of2on912OvQZLA33FfNUcTEgRrTId7jvk9yFuvtaV88=
+github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.2 h1:uw3nUFEtygkBTSVjL+kvE12pS8imafKcALPewEFVv1c=
+github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.2/go.mod h1:GBHyQ7awNQSRmiKp/p8kIKrGrMOZeA/k2czoM/GOqds=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af h1:gu+uRPtBe88sKxUCEXRoeCvVG90TJmwhiqRpvdhQFng=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=

sdk/go/azuread/init.go

@@ -21,31 +21,32 @@ func (m *module) Version() semver.Version {
 func (m *module) Construct(ctx *pulumi.Context, name, typ, urn string) (r pulumi.Resource, err error) {
 	switch typ {
 	case "azuread:index/application:Application":
-		r, err = NewApplication(ctx, name, nil, pulumi.URN_(urn))
+		r = &Application{}
 	case "azuread:index/applicationAppRole:ApplicationAppRole":
-		r, err = NewApplicationAppRole(ctx, name, nil, pulumi.URN_(urn))
+		r = &ApplicationAppRole{}
 	case "azuread:index/applicationCertificate:ApplicationCertificate":
-		r, err = NewApplicationCertificate(ctx, name, nil, pulumi.URN_(urn))
+		r = &ApplicationCertificate{}
 	case "azuread:index/applicationOAuth2Permission:ApplicationOAuth2Permission":
-		r, err = NewApplicationOAuth2Permission(ctx, name, nil, pulumi.URN_(urn))
+		r = &ApplicationOAuth2Permission{}
 	case "azuread:index/applicationPassword:ApplicationPassword":
-		r, err = NewApplicationPassword(ctx, name, nil, pulumi.URN_(urn))
+		r = &ApplicationPassword{}
 	case "azuread:index/group:Group":
-		r, err = NewGroup(ctx, name, nil, pulumi.URN_(urn))
+		r = &Group{}
 	case "azuread:index/groupMember:GroupMember":
-		r, err = NewGroupMember(ctx, name, nil, pulumi.URN_(urn))
+		r = &GroupMember{}
 	case "azuread:index/servicePrincipal:ServicePrincipal":
-		r, err = NewServicePrincipal(ctx, name, nil, pulumi.URN_(urn))
+		r = &ServicePrincipal{}
 	case "azuread:index/servicePrincipalCertificate:ServicePrincipalCertificate":
-		r, err = NewServicePrincipalCertificate(ctx, name, nil, pulumi.URN_(urn))
+		r = &ServicePrincipalCertificate{}
 	case "azuread:index/servicePrincipalPassword:ServicePrincipalPassword":
-		r, err = NewServicePrincipalPassword(ctx, name, nil, pulumi.URN_(urn))
+		r = &ServicePrincipalPassword{}
 	case "azuread:index/user:User":
-		r, err = NewUser(ctx, name, nil, pulumi.URN_(urn))
+		r = &User{}
 	default:
 		return nil, fmt.Errorf("unknown resource type: %s", typ)
 	}
 
+	err = ctx.RegisterResource(typ, name, nil, r, pulumi.URN_(urn))
 	return
 }
 
@@ -62,7 +63,9 @@ func (p *pkg) ConstructProvider(ctx *pulumi.Context, name, typ, urn string) (pul
 		return nil, fmt.Errorf("unknown provider type: %s", typ)
 	}
 
-	return NewProvider(ctx, name, nil, pulumi.URN_(urn))
+	r := &Provider{}
+	err := ctx.RegisterResource(typ, name, nil, r, pulumi.URN_(urn))
+	return r, err
 }
 
 func init() {

sdk/python/pulumi_azuread/_inputs.py

@@ -5,8 +5,8 @@
 import warnings
 import pulumi
 import pulumi.runtime
-from typing import Any, Mapping, Optional, Sequence, Union
-from . import _utilities, _tables
+from typing import Any, Mapping, Optional, Sequence, Union, overload
+from . import _utilities
 
 __all__ = [
     'ApplicationAppRoleArgs',

sdk/python/pulumi_azuread/_utilities.py

@@ -81,5 +81,37 @@ def get_semver_version():
     # their own semver string.
     return SemverVersion(major=major, minor=minor, patch=patch, prerelease=prerelease)
 
+
 def get_version():
-	return str(get_semver_version())
+    return str(get_semver_version())
+
+
+def get_resource_args_opts(resource_args_type, resource_options_type, *args, **kwargs):
+    """
+    Return the resource args and options given the *args and **kwargs of a resource's
+    __init__ method.
+    """
+
+    resource_args, opts = None, None
+
+    # If the first item is the resource args type, save it and remove it from the args list.
+    if args and isinstance(args[0], resource_args_type):
+        resource_args, args = args[0], args[1:]
+
+    # Now look at the first item in the args list again.
+    # If the first item is the resource options class, save it.
+    if args and isinstance(args[0], resource_options_type):
+        opts = args[0]
+
+    # If resource_args is None, see if "args" is in kwargs, and, if so, if it's typed as the
+    # the resource args type.
+    if resource_args is None:
+        a = kwargs.get("args")
+        if isinstance(a, resource_args_type):
+            resource_args = a
+
+    # If opts is None, look it up in kwargs.
+    if opts is None:
+        opts = kwargs.get("opts")
+
+    return resource_args, opts