Consolidate selected overlay acquisition
This commit is contained in:
@@ -66,30 +66,6 @@ func contextsForResolvedSources(resolved *resolvedFilesystemContext, sources []S
|
||||
return result, nil
|
||||
}
|
||||
|
||||
// contextsForAcquiredSources is retained for selected-overlay callers until
|
||||
// their request migration. Input acquisition resolves the facts at its own
|
||||
// lifecycle boundary and uses contextsForResolvedSources directly.
|
||||
func contextsForAcquiredSources(source Source, context *FilesystemContext, baseSource *SourceInfo, sources []SourceInfo) (map[string]ResourceContext, *Diagnostic) {
|
||||
if len(sources) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
if source.kind == sourceNone {
|
||||
if context == nil {
|
||||
return nil, nil
|
||||
}
|
||||
resolved, diagnostic := resolveAbsentFilesystemContext(context)
|
||||
if diagnostic != nil {
|
||||
return nil, diagnostic
|
||||
}
|
||||
return contextsForResolvedSources(&resolved, sources)
|
||||
}
|
||||
resolved, diagnostic := resolveFilesystemContext(source, context, parsedSource{source: baseSource}, nil)
|
||||
if diagnostic != nil {
|
||||
return nil, diagnostic
|
||||
}
|
||||
return contextsForResolvedSources(&resolved, sources)
|
||||
}
|
||||
|
||||
func mergeResourceContexts(target *map[string]ResourceContext, incoming map[string]ResourceContext) {
|
||||
if len(incoming) == 0 {
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user