Skip to content

Commit

Permalink
fix: Use absolute path for reading manifest
Browse files Browse the repository at this point in the history
Closes: vmware#3550
  • Loading branch information
Xiol committed Sep 20, 2024
1 parent 3450f77 commit bd8f0c6
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 6 deletions.
12 changes: 6 additions & 6 deletions ovf/importer/importer.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"context"
"errors"
"fmt"
"os"
"path"
"path/filepath"
"strings"
Expand Down Expand Up @@ -58,15 +57,16 @@ type Importer struct {
Manifest map[string]*library.Checksum
}

func (imp *Importer) ReadManifest(fpath string) error {
func (imp *Importer) manifestPath(fpath string) string {
base := filepath.Base(fpath)
ext := filepath.Ext(base)
mfName := strings.Replace(base, ext, ".mf", 1)
return filepath.Join(filepath.Dir(fpath), strings.Replace(base, ext, ".mf", 1))
}

mf, _, err := imp.Archive.Open(mfName)
func (imp *Importer) ReadManifest(fpath string) error {
mf, _, err := imp.Archive.Open(imp.manifestPath(fpath))
if err != nil {
msg := fmt.Sprintf("manifest %q: %s", mf, err)
fmt.Fprintln(os.Stderr, msg)
msg := fmt.Sprintf("failed to read manifest %q: %s", mf, err)
return errors.New(msg)
}
imp.Manifest, err = library.ReadManifest(mf)
Expand Down
62 changes: 62 additions & 0 deletions ovf/importer/importer_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
Copyright (c) 2024-2024 VMware, Inc. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package importer

import (
"runtime"
"testing"
)

func TestImporter_manifestPath(t *testing.T) {
// We can only test filepath operations on the target OS
manifestTests := []struct {
goos string
name string
path string
expected string
}{
{
goos: "linux",
name: "linux path",
path: "/home/user/foo/bar/qux.ovf",
expected: "/home/user/foo/bar/qux.mf",
},
{
goos: "darwin",
name: "darwin path",
path: "/home/user/foo/bar/qux.ovf",
expected: "/home/user/foo/bar/qux.mf",
},
{
goos: "windows",
name: "windows path",
path: "C:\\ProgramData\\Foo\\Bar\\Qux.ovf",
expected: "C:\\ProgramData\\Foo\\Bar\\Qux.mf",
},
}

imp := Importer{}

for _, test := range manifestTests {
if test.goos == runtime.GOOS {
manifestPath := imp.manifestPath(test.path)
if manifestPath != test.expected {
t.Fatalf("'%s' failed: expected '%s', got '%s'", test.name, test.expected, manifestPath)
}
}
}
}

0 comments on commit bd8f0c6

Please sign in to comment.