Skip to content

Fix file matching within artifact #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chrisroberts wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix file matching within artifact #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion post-processor/hcp-vagrant-registry/post-processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"io"
"log"
"os"
"path"
"strings"

"github.com/hashicorp/hcl/v2/hcldec"
Expand Down Expand Up @@ -410,7 +411,7 @@ func metadataFromVagrantBox(boxfile string) (metadata map[string]interface{}, er
return nil, fmt.Errorf("Failed reading header info from box tar archive: %w", err)
}

if hdr.Name == "metadata.json" {
if path.Base(hdr.Name) == "metadata.json" {
var contents []byte
contents, err = io.ReadAll(tr)
if err != nil {
Expand Down
58 changes: 58 additions & 0 deletions post-processor/hcp-vagrant-registry/post-processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,64 @@ func TestPostProcessor(t *testing.T) {
c["no_direct_upload"] = false
},
},
{
desc: "OK - archive paths are relative",
stack: []stubResponse{
{
Method: "POST",
Path: "/oauth2/token",
Response: `{"access_token": "TEST_TOKEN", "expiry": 0}`,
StatusCode: 200,
},
{
Method: "GET",
Path: "/vagrant/2022-09-30/registry/hashicorp/box/precise64",
Response: `{}`,
StatusCode: 200,
},
{
Method: "GET",
Path: "/vagrant/2022-09-30/registry/hashicorp/box/precise64/version/0.5",
Response: `{"version": {"state": "UNRELEASED"}}`,
StatusCode: 200,
},
{
Method: "GET",
Path: "/vagrant/2022-09-30/registry/hashicorp/box/precise64/version/0.5/provider/virtualbox",
Response: `{}`,
StatusCode: 200,
},
{
Method: "GET",
Path: "/vagrant/2022-09-30/registry/hashicorp/box/precise64/version/0.5/provider/virtualbox/architecture/amd64",
Response: `{}`,
StatusCode: 200,
},
{
Method: "PUT",
Path: "/vagrant/2022-09-30/registry/hashicorp/box/precise64/version/0.5/provider/virtualbox/architecture/amd64",
Response: `{}`,
StatusCode: 200,
},
{
Method: "GET",
Path: "/vagrant/2022-09-30/registry/hashicorp/box/precise64/version/0.5/provider/virtualbox/architecture/amd64/upload",
Response: fmt.Sprintf(`{"url": "%s"}`, uploadURL),
StatusCode: 200,
},
{
Method: "PUT",
Path: "/vagrant/2022-09-30/registry/hashicorp/box/precise64/version/0.5/release",
Response: `{}`,
StatusCode: 200,
},
},
files: tarFiles{
{"./foo.txt", "This is a foo file"},
{"./bar.txt", "This is a bar file"},
{"./metadata.json", `{"provider": "virtualbox", "architecture": "amd64"}`},
},
},
}

for _, tc := range testCases {
Expand Down