Merge branch 'evan/fixArchive' of https://github.com/pulumi/pulumi into evan/fixArchive

CHANGELOG.md

@@ -29,6 +29,9 @@ CHANGELOG
 - Add overloads to Output.All in .NET
   [#4321](https://github.com/pulumi/pulumi/pull/4321)
 
+- Change default format of FileArchive to be zip instead of tar
+  [#4018](https://github.com/pulumi/pulumi/pull/4018)
+  
 - Add helper methods for stack outputs in the Go SDK
   [#4341](https://github.com/pulumi/pulumi/pull/4341)
 

sdk/go/common/resource/asset.go

@@ -1034,8 +1034,10 @@ func addNextFileToZIP(r ArchiveReader, zw *zip.Writer, seenFiles map[string]bool
 
 	fh := &zip.FileHeader{
 		// These are the two fields set by zw.Create()
-		Name:   file,
-		Method: zip.Deflate,
+		Name:           file,
+		Method:         zip.Deflate,
+		CreatorVersion: 3 << 8,      // indicates Unix
+		ExternalAttrs:  33279 << 16, // -rwxr-xr-x file permissions
 	}
 
 	// Set a nonzero -- but constant -- modification time. Otherwise, some agents (e.g. Azure
@@ -1108,9 +1110,9 @@ func (a *Archive) EnsureHash() error {
 				return err
 			}
 		} else {
-			// Otherwise, it's not an archive; we'll need to transform it into one.  Pick tar since it avoids
-			// any superfluous compression which doesn't actually help us in this situation.
-			err := a.Archive(TarArchive, hash)
+			// Otherwise, it's not an archive; we'll need to transform it into one.
+			// Pick ZIP as default for compat with lambda.
+			err := a.Archive(ZIPArchive, hash)
 			if err != nil {
 				return err
 			}

sdk/go/common/resource/asset_test.go

@@ -88,7 +88,7 @@ func TestAssetSerialize(t *testing.T) {
 			assert.Equal(t, "d8ce0142b3b10300c7c76487fad770f794c1e84e1b0c73a4b2e1503d4fbac093", arch.Hash)
 		default:
 			// Go 1.10 introduced breaking changes to archive/zip and archive/tar headers
-			assert.Equal(t, "27ab4a14a617df10cff3e1cf4e30cf510302afe56bf4cc91f84041c9f7b62fd8", arch.Hash)
+			assert.Equal(t, "a2ab3787a392db8da781000b544cf5d84f49108000bf938dcb75183e510c1871", arch.Hash)
 		}
 		archSer := arch.Serialize()
 		archDes, isarch, err := DeserializeArchive(archSer)
@@ -103,7 +103,7 @@ func TestAssetSerialize(t *testing.T) {
 			assert.Equal(t, "d8ce0142b3b10300c7c76487fad770f794c1e84e1b0c73a4b2e1503d4fbac093", archDes.Hash)
 		default:
 			// Go 1.10 introduced breaking changes to archive/zip and archive/tar headers
-			assert.Equal(t, "27ab4a14a617df10cff3e1cf4e30cf510302afe56bf4cc91f84041c9f7b62fd8", archDes.Hash)
+			assert.Equal(t, "a2ab3787a392db8da781000b544cf5d84f49108000bf938dcb75183e510c1871", archDes.Hash)
 		}
 	}
 	{
@@ -126,7 +126,7 @@ func TestAssetSerialize(t *testing.T) {
 			assert.Equal(t, "23f6c195eb154be262216cd97209f2dcc8a40038ac8ec18ca6218d3e3dfacd4e", arch.Hash)
 		default:
 			// Go 1.10 introduced breaking changes to archive/zip and archive/tar headers
-			assert.Equal(t, "d2587a875f82cdf3d3e6cfe9f8c6e6032be5dde8c344466e664e628da15757b0", arch.Hash)
+			assert.Equal(t, "f5df7a2bf6bb11ba941b0d01845cf4fb7eb053186288ef75f4b9a583ddd25a16", arch.Hash)
 		}
 		archSer := arch.Serialize()
 		archDes, isarch, err := DeserializeArchive(archSer)
@@ -141,7 +141,7 @@ func TestAssetSerialize(t *testing.T) {
 			assert.Equal(t, "23f6c195eb154be262216cd97209f2dcc8a40038ac8ec18ca6218d3e3dfacd4e", archDes.Hash)
 		default:
 			// Go 1.10 introduced breaking changes to archive/zip and archive/tar headers
-			assert.Equal(t, "d2587a875f82cdf3d3e6cfe9f8c6e6032be5dde8c344466e664e628da15757b0", archDes.Hash)
+			assert.Equal(t, "f5df7a2bf6bb11ba941b0d01845cf4fb7eb053186288ef75f4b9a583ddd25a16", archDes.Hash)
 		}
 	}
 	{
@@ -164,7 +164,7 @@ func TestAssetSerialize(t *testing.T) {
 			assert.Equal(t, "23f6c195eb154be262216cd97209f2dcc8a40038ac8ec18ca6218d3e3dfacd4e", arch.Hash)
 		default:
 			// Go 1.10 introduced breaking changes to archive/zip and archive/tar headers
-			assert.Equal(t, "d2587a875f82cdf3d3e6cfe9f8c6e6032be5dde8c344466e664e628da15757b0", arch.Hash)
+			assert.Equal(t, "f5df7a2bf6bb11ba941b0d01845cf4fb7eb053186288ef75f4b9a583ddd25a16", arch.Hash)
 		}
 		archSer := arch.Serialize()
 		archDes, isarch, err := DeserializeArchive(archSer)
@@ -179,7 +179,7 @@ func TestAssetSerialize(t *testing.T) {
 			assert.Equal(t, "23f6c195eb154be262216cd97209f2dcc8a40038ac8ec18ca6218d3e3dfacd4e", archDes.Hash)
 		default:
 			// Go 1.10 introduced breaking changes to archive/zip and archive/tar headers
-			assert.Equal(t, "d2587a875f82cdf3d3e6cfe9f8c6e6032be5dde8c344466e664e628da15757b0", archDes.Hash)
+			assert.Equal(t, "f5df7a2bf6bb11ba941b0d01845cf4fb7eb053186288ef75f4b9a583ddd25a16", archDes.Hash)
 		}
 	}
 	{
@@ -310,7 +310,7 @@ func TestArchiveDir(t *testing.T) {
 		assert.Equal(t, "35ddf9c48ce6ac5ba657573d388db6ce41f3ed6965346a3086fb70a550fe0864", arch.Hash)
 	default:
 		// Go 1.10 introduced breaking changes to archive/zip and archive/tar headers
-		assert.Equal(t, "489e9a9dad271922ecfbda590efc40e48788286a06bd406a357ab8d13f0b6abf", arch.Hash)
+		assert.Equal(t, "210b1be2839cbe60157a18b6aeffb6cf8e1b052d230925fe794637c94b128744", arch.Hash)
 	}
 	validateTestDirArchive(t, arch)
 }

sdk/go/common/resource/plugin/rpc_test.go

@@ -78,7 +78,7 @@ func TestAssetSerialize(t *testing.T) {
 		assert.Equal(t, "d8ce0142b3b10300c7c76487fad770f794c1e84e1b0c73a4b2e1503d4fbac093", arch.Hash)
 	default:
 		// Go 1.10 introduced breaking changes to archive/zip and archive/tar headers
-		assert.Equal(t, "27ab4a14a617df10cff3e1cf4e30cf510302afe56bf4cc91f84041c9f7b62fd8", arch.Hash)
+		assert.Equal(t, "a2ab3787a392db8da781000b544cf5d84f49108000bf938dcb75183e510c1871", arch.Hash)
 	}
 	archProps, err := MarshalPropertyValue(resource.NewArchiveProperty(arch), MarshalOptions{})
 	assert.Nil(t, err)
@@ -95,7 +95,7 @@ func TestAssetSerialize(t *testing.T) {
 		assert.Equal(t, "d8ce0142b3b10300c7c76487fad770f794c1e84e1b0c73a4b2e1503d4fbac093", archDes.Hash)
 	default:
 		// Go 1.10 introduced breaking changes to archive/zip and archive/tar headers
-		assert.Equal(t, "27ab4a14a617df10cff3e1cf4e30cf510302afe56bf4cc91f84041c9f7b62fd8", archDes.Hash)
+		assert.Equal(t, "a2ab3787a392db8da781000b544cf5d84f49108000bf938dcb75183e510c1871", archDes.Hash)
 	}
 
 	// Ensure that an invalid archive produces an error.