maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

support jar files

Browse source
This commit is contained in:
Lee Briggs 2020-08-10 14:15:35 -07:00
parent 2cd0c000bd
commit 574a9151db
No known key found for this signature in database
GPG key ID: A4D09B96FDFEB505
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
pkg/resource/testdata/test_dir.jar vendored Normal file
View file

Binary file not shown.

4
sdk/go/common/resource/asset.go
View file

@ -1130,6 +1130,7 @@ const (
TarArchive // a POSIX tar archive.
TarGZIPArchive // a POSIX tar archive that has been subsequently compressed using GZip.
ZIPArchive // a multi-file ZIP archive.
JARArchive // a Java JAR file
)
// ArchiveExts maps from a file extension and its associated archive and/or compression format.
@ -1138,6 +1139,7 @@ var ArchiveExts = map[string]ArchiveFormat{
".tgz": TarGZIPArchive,
".tar.gz": TarGZIPArchive,
".zip": ZIPArchive,
".jar": JARArchive,
}
// detectArchiveFormat takes a path and infers its archive format based on the file extension.
@ -1159,7 +1161,7 @@ func readArchive(ar io.ReadCloser, format ArchiveFormat) (ArchiveReader, error)
return readTarArchive(ar)
case TarGZIPArchive:
return readTarGZIPArchive(ar)
case ZIPArchive:
case ZIPArchive, JARArchive:
// Unfortunately, the ZIP archive reader requires ReaderAt functionality. If it's a file, we can recover this
// with a simple stat. Otherwise, we will need to go ahead and make a copy in memory.
var ra io.ReaderAt

19
sdk/go/common/resource/asset_test.go
View file

@ -320,7 +320,7 @@ func TestArchiveTar(t *testing.T) {
arch, err := NewPathArchive("../../../../pkg/resource/testdata/test_dir.tar")
assert.Nil(t, err)
assert.Equal(t, "c618d74a40f87de3092ca6a6c4cca834aa5c6a3956c6ceb2054b40d04bb4cd76", arch.Hash)
validateTestDirArchive(t, arch)
validateTestDirArchive(t, arch, 3)
}
func TestArchiveTgz(t *testing.T) {
@ -328,7 +328,7 @@ func TestArchiveTgz(t *testing.T) {
arch, err := NewPathArchive("../../../../pkg/resource/testdata/test_dir.tgz")
assert.Nil(t, err)
assert.Equal(t, "f9b33523b6a3538138aff0769ff9e7d522038e33c5cfe28b258332b3f15790c8", arch.Hash)
validateTestDirArchive(t, arch)
validateTestDirArchive(t, arch, 3)
}
func TestArchiveZip(t *testing.T) {
@ -336,7 +336,14 @@ func TestArchiveZip(t *testing.T) {
arch, err := NewPathArchive("../../../../pkg/resource/testdata/test_dir.zip")
assert.Nil(t, err)
assert.Equal(t, "343da72cec1302441efd4a490d66f861d393fb270afb3ced27f92a0d96abc068", arch.Hash)
validateTestDirArchive(t, arch)
validateTestDirArchive(t, arch, 3)
}
func TestArchiveJar(t *testing.T) {
arch, err := NewPathArchive("../../../../pkg/resource/testdata/test_dir.jar")
assert.Nil(t, err)
assert.Equal(t, "dfb9eb69f433564b07df524068621c5ac65c08868e6094b8fa4ee388a5ee66e7", arch.Hash)
validateTestDirArchive(t, arch, 4)
}
func findRepositoryRoot() (string, error) {
@ -463,6 +470,7 @@ func TestFileExtentionSniffing(t *testing.T) {
assert.Equal(t, ArchiveFormat(TarArchive), detectArchiveFormat("./some/path/my.tar"))
assert.Equal(t, ArchiveFormat(TarGZIPArchive), detectArchiveFormat("./some/path/my.tar.gz"))
assert.Equal(t, ArchiveFormat(TarGZIPArchive), detectArchiveFormat("./some/path/my.tgz"))
assert.Equal(t, ArchiveFormat(JARArchive), detectArchiveFormat("./some/path/my.jar"))
assert.Equal(t, ArchiveFormat(NotArchive), detectArchiveFormat("./some/path/who.knows"))
// In #2589 we had cases where a file would look like it had an longer extension, because the suffix would include
@ -471,6 +479,7 @@ func TestFileExtentionSniffing(t *testing.T) {
assert.Equal(t, ArchiveFormat(TarArchive), detectArchiveFormat("./some/path/my.file.tar"))
assert.Equal(t, ArchiveFormat(TarGZIPArchive), detectArchiveFormat("./some/path/my.file.tar.gz"))
assert.Equal(t, ArchiveFormat(TarGZIPArchive), detectArchiveFormat("./some/path/my.file.tgz"))
assert.Equal(t, ArchiveFormat(JARArchive), detectArchiveFormat("./some/path/my.file.jar"))
assert.Equal(t, ArchiveFormat(NotArchive), detectArchiveFormat("./some/path/who.even.knows"))
}
@ -487,7 +496,7 @@ func TestInvalidPathArchive(t *testing.T) {
assert.Error(t, err)
}
func validateTestDirArchive(t *testing.T, arch *Archive) {
func validateTestDirArchive(t *testing.T, arch *Archive, expected int) {
r, err := arch.Open()
assert.Nil(t, err)
defer func() {
@ -518,7 +527,7 @@ func validateTestDirArchive(t *testing.T, arch *Archive) {
subs[name] = text.String()
}
assert.Equal(t, 3, len(subs))
assert.Equal(t, expected, len(subs))
lorem := subs["Lorem_ipsum.txt"]
assert.Equal(t, lorem,