airship/airshipctl
Code Issues Proposed changes

Merge "Fix metadata loading by config module"

Browse Source
This commit is contained in:
Zuul 2020-07-20 19:29:32 +00:00 committed by Gerrit Code Review
commit e12c15a4c8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/config/config.go
View File

@ -1088,7 +1088,7 @@ func (c *Config) CurrentContextManifestMetadata() (*Metadata, error) {
return nil, err
}
meta := &Metadata{}
err = util.ReadYAMLFile(manifest.MetadataPath, meta)
err = util.ReadYAMLFile(filepath.Join(manifest.TargetPath, manifest.MetadataPath), meta)
if err != nil {
return nil, err
}

4
pkg/config/config_test.go
View File

@ -594,7 +594,7 @@ func TestCurrentContextManifestMetadata(t *testing.T) {
}{
{
name: "default metadata",
metaPath: "testdata/metadata.yaml",
metaPath: "metadata.yaml",
expectErr: false,
currentContext: "testContext",
meta: &config.Metadata{
@ -630,7 +630,7 @@ func TestCurrentContextManifestMetadata(t *testing.T) {
}
manifest := &config.Manifest{
MetadataPath: tt.metaPath,
TargetPath: ".",
TargetPath: "testdata",
}
conf.Manifests = map[string]*config.Manifest{
"testManifest": manifest,