Merge branch 'justin/testresource' into jar-extract

CHANGELOG.md

@@ -6,6 +6,10 @@ CHANGELOG
 - Fix support for CheckFailures in Python Dynamic Providers
   [#5138](https://github.com/pulumi/pulumi/pull/5138)
 
+- Add support for extracting jar files in archive resources
+  [#5150](https://github.com/pulumi/pulumi/pull/5150)
+
+
 ## 2.8.2 (2020-08-07)
 
 - Add nuget badge to README [#5117](https://github.com/pulumi/pulumi/pull/5117)

sdk/go/common/resource/asset_test.go

@@ -312,7 +312,7 @@ func TestArchiveDir(t *testing.T) {
 		// Go 1.10 introduced breaking changes to archive/zip and archive/tar headers
 		assert.Equal(t, "489e9a9dad271922ecfbda590efc40e48788286a06bd406a357ab8d13f0b6abf", arch.Hash)
 	}
-	validateTestDirArchive(t, arch)
+	validateTestDirArchive(t, arch, 3)
 }
 
 func TestArchiveTar(t *testing.T) {

sdk/nodejs/tests/unwrap.spec.ts

@@ -15,7 +15,7 @@
 // tslint:disable
 
 import * as assert from "assert";
-import { all, output, Output, unknown } from "../index";
+import { all, output, Output, Resource, unknown } from "../index";
 import { asyncTest } from "./util";
 
 function test(val: any, expected: any) {
@@ -51,7 +51,7 @@ function testResources(val: any, expected: any, resources: TestResource[], allRe
         assert.deepStrictEqual(asyncResources, new Set(allResources));
 
         for (const res of syncResources) {
-            if (!asyncResources.has(<TestResource>res)) {
+            if (!asyncResources.has(<Resource><any>res)) {
                 assert.fail(`async resources did not contain: ${(<TestResource><any>res).name}`)
             }
         }