Merge #10468 #13265 #13316

10468: Update pulumictl to 0.0.42 r=Frassle a=Frassle



13265: Fix isInstance methods on generated provider types in the nodejs sdks r=Frassle a=Frassle

<!--- 
Thanks so much for your contribution! If this is your first time contributing, please ensure that you have read the [CONTRIBUTING](https://github.com/pulumi/pulumi/blob/master/CONTRIBUTING.md) documentation.
-->

# Description

<!--- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. -->

Fixes #12584

## Checklist

- [x] I have run `make tidy` to update any new dependencies
- [x] I have run `make lint` to verify my code passes the lint check
  - [ ] I have formatted my code using `gofumpt`

<!--- Please provide details if the checkbox below is to be left unchecked. -->
- [x] I have added tests that prove my fix is effective or that my feature works
<!--- 
User-facing changes require a CHANGELOG entry.
-->
- [x] I have run `make changelog` and committed the `changelog/pending/<file>` documenting my change
<!--
If the change(s) in this PR is a modification of an existing call to the Pulumi Cloud,
then the service should honor older versions of the CLI where this change would not exist.
You must then bump the API version in /pkg/backend/httpstate/client/api.go, as well as add
it to the service.
-->
- [ ] Yes, there are changes in this PR that warrants bumping the Pulumi Cloud API version
  <!-- `@Pulumi` employees: If yes, you must submit corresponding changes in the service repo. -->


13316: Test duplicate outputs r=Frassle a=Frassle

<!--- 
Thanks so much for your contribution! If this is your first time contributing, please ensure that you have read the [CONTRIBUTING](https://github.com/pulumi/pulumi/blob/master/CONTRIBUTING.md) documentation.
-->

# Description

<!--- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. -->

Regression test to cover #9411

## Checklist

- [x] I have run `make tidy` to update any new dependencies
- [x] I have run `make lint` to verify my code passes the lint check
  - [x] I have formatted my code using `gofumpt`

<!--- Please provide details if the checkbox below is to be left unchecked. -->
- [x] I have added tests that prove my fix is effective or that my feature works
<!--- 
User-facing changes require a CHANGELOG entry.
-->
- [ ] I have run `make changelog` and committed the `changelog/pending/<file>` documenting my change
<!--
If the change(s) in this PR is a modification of an existing call to the Pulumi Cloud,
then the service should honor older versions of the CLI where this change would not exist.
You must then bump the API version in /pkg/backend/httpstate/client/api.go, as well as add
it to the service.
-->
- [ ] Yes, there are changes in this PR that warrants bumping the Pulumi Cloud API version
  <!-- `@Pulumi` employees: If yes, you must submit corresponding changes in the service repo. -->


Co-authored-by: Fraser Waters <fraser@pulumi.com>

.devcontainer/Dockerfile

@@ -6,7 +6,7 @@ RUN version=1.42.1 \
     && golangci-lint version
 
 # Install pulumictl
-RUN version=0.0.25 \
+RUN version=0.0.42 \
     && curl -fsSLO https://github.com/pulumi/pulumictl/releases/download/v$version/pulumictl-v$version-linux-amd64.tar.gz \
     && tar -xzf pulumictl-v$version-linux-amd64.tar.gz --directory /usr/local/bin --no-same-owner pulumictl \
     && rm -f pulumictl-v$version-linux-amd64.tar.gz \

.github/workflows/ci-run-test.yml

@@ -203,7 +203,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
         with:
           repo: pulumi/pulumictl
-          tag: v0.0.32
+          tag: v0.0.42
           cache: enable
       - name: Install gotestsum
         uses: jaxxstorm/action-install-gh-release@v1.7.1

.github/workflows/release.yml

@@ -175,7 +175,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
         with:
           repo: pulumi/pulumictl
-          tag: v0.0.32
+          tag: v0.0.42
           cache: enable
       - name: Repository Dispatch
         run: ${{ matrix.job.run-command }}

.gitpod/Dockerfile

@@ -8,7 +8,7 @@ ENV PATH="$HOME/.pulumi:$HOME/.pulumi/bin:$PATH"
 RUN mkdir -p /home/gitpod/dotnet && \
      curl -fsSL https://download.visualstudio.microsoft.com/download/pr/f65a8eb0-4537-4e69-8ff3-1a80a80d9341/cc0ca9ff8b9634f3d9780ec5915c1c66/dotnet-sdk-3.1.201-linux-x64.tar.gz \
      | tar xz -C /home/gitpod/dotnet && \
-     wget -qO- https://github.com/pulumi/pulumictl/releases/download/v0.0.28/pulumictl-v0.0.28-linux-amd64.tar.gz | sudo tar zxvf - -C /usr/local/bin
+     wget -qO- https://github.com/pulumi/pulumictl/releases/download/v0.0.42/pulumictl-v0.0.42-linux-amd64.tar.gz | sudo tar zxvf - -C /usr/local/bin
 
 
 ENV DOTNET_ROOT=/home/gitpod/dotnet

changelog/pending/20230624--sdkgen-nodejs--fix-isinstance-methods-for-generated-provider-types.yaml

@@ -0,0 +1,4 @@
+changes:
+- type: fix
+  scope: sdkgen/nodejs
+  description: Fix isInstance methods for generated provider types.

pkg/codegen/nodejs/gen.go

@@ -692,7 +692,17 @@ func (mod *modContext) genResource(w io.Writer, r *schema.Resource) (resourceFil
 	fmt.Fprintf(w, "        if (obj === undefined || obj === null) {\n")
 	fmt.Fprintf(w, "            return false;\n")
 	fmt.Fprintf(w, "        }\n")
-	fmt.Fprintf(w, "        return obj['__pulumiType'] === %s.__pulumiType;\n", name)
+
+	typeExpression := fmt.Sprintf("%s.__pulumiType", name)
+	if r.IsProvider {
+		// We pass __pulumiType to the ProviderResource constructor as the "type" for this provider, the
+		// ProviderResource constructor in the SDK then prefixes "pulumi:providers:" to that token and passes that
+		// down to the CustomResource constructor, which then assigns that type token to the newly constructed
+		// objects __pulumiType field. As such we also need to prefix "pulumi:providers:" when doing the equality
+		// check here.
+		typeExpression = "\"pulumi:providers:\" + " + typeExpression
+	}
+	fmt.Fprintf(w, "        return obj['__pulumiType'] === %s;\n", typeExpression)
 	fmt.Fprintf(w, "    }\n")
 	fmt.Fprintf(w, "\n")
 

pkg/codegen/testing/test/testdata/azure-native-nested-types/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/cyclic-types/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/dash-named-schema/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/dashed-import-schema/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/different-enum/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/embedded-crd-types/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/enum-reference/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/external-enum/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/external-node-compatibility/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/functions-secrets/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/hyphen-url/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/naming-collisions/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/nested-module-thirdparty/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/nested-module/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/output-funcs/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/plain-and-default/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/provider.ts

@@ -21,7 +21,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/provider.ts

@@ -21,7 +21,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/plain-schema-gh6957/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/provider.ts

@@ -19,7 +19,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/provider-type-schema/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/regress-8403/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/regress-node-8110/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/replace-on-change/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/resource-args-python-case-insensitive/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/resource-args-python/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/resource-property-overlap/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/secrets/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/simple-enum-schema/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/simple-methods-schema-single-value-returns/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/simple-methods-schema/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/simple-plain-schema-with-root-package/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/simple-plain-schema/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }
 
 

pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/provider.ts

@@ -16,7 +16,7 @@ export class Provider extends pulumi.ProviderResource {
         if (obj === undefined || obj === null) {
             return false;
         }
-        return obj['__pulumiType'] === Provider.__pulumiType;
+        return obj['__pulumiType'] === "pulumi:providers:" + Provider.__pulumiType;
     }