Skip to content

project name set by yaml must be identified by caller as opts.projectName #503

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

Merged
merged 2 commits into from
Nov 28, 2023
Merged

project name set by yaml must be identified by caller as opts.projectName #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb68bbf
project name set by yaml must be identified by caller as opts.project…
ndeloof Nov 27, 2023
5614cf9
name external resources if no explicit name is set
ndeloof Nov 27, 2023
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
1 change: 1 addition & 0 deletions loader/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ func load(ctx context.Context, configDetails types.ConfigDetails, opts *Options,
WorkingDir: configDetails.WorkingDir,
Environment: configDetails.Environment,
}
delete(dict, "name") // project name set by yaml must be identified by caller as opts.projectName
err = Transform(dict, project)
if err != nil {
return nil, err
Expand Down
1 change: 0 additions & 1 deletion loader/loader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,6 @@ networks:
config, err := Load(buildConfigDetails(dict, env), func(options *Options) {
options.SkipNormalization = true
options.SkipConsistencyCheck = true
options.SetProjectName("test", true)
})
assert.NilError(t, err)

Expand Down
17 changes: 12 additions & 5 deletions transform/external.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,21 @@ func transformMaybeExternal(data any, p tree.Path) (any, error) {
if !ok {
return resource, nil
}
name := resource["name"]
if ename, ok := external["name"]; ok {
name, named := resource["name"]
extname, extNamed := external["name"]
if extNamed {
logrus.Warnf("%s: external.name is deprecated. Please set name and external: true", p)
if name != nil && ename != name {
if named && extname != name {
return nil, fmt.Errorf("%s: name and external.name conflict; only use name", p)
}
if name == nil {
resource["name"] = ename
}
if !named {
if extNamed {
// adopt (deprecated) external.name if set
resource["name"] = extname
} else {
// otherwise, just replicate the mapping key for convenience
resource["name"] = p
}
}
resource["external"] = true
Expand Down