maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Deal with circularities in package structure when computing codepaths. (#2049)

Browse source
This commit is contained in:
CyrusNajmabadi 2018-10-11 14:57:21 -07:00 committed by GitHub
parent ae87c469c5
commit b509ff42f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sdk/nodejs/runtime/closure/codePaths.ts
View file

@ -200,9 +200,18 @@ function allFoldersForPackages(
} }
} }
// package.json files can contain circularities. For example es6-iterator depends
// on es5-ext, which depends on es6-iterator, which depends on es5-ext:
// https://github.com/medikoo/es6-iterator/blob/0eac672d3f4bb3ccc986bbd5b7ffc718a0822b74/package.json#L20
// https://github.com/medikoo/es5-ext/blob/792c9051e5ad9d7671dd4e3957eee075107e9e43/package.json#L29
//
// So keep track of the paths we've looked and don't recurse if we hit something again.
const seenPaths = new Set<string>();
const normalizedPackagePaths = new Set<string>(); const normalizedPackagePaths = new Set<string>();
for (const pkg of referencedPackages) { for (const pkg of referencedPackages) {
addPackageAndDependenciesToSet(root, pkg, normalizedPackagePaths, excludedPackages); addPackageAndDependenciesToSet(
root, pkg, seenPaths, normalizedPackagePaths, excludedPackages);
} }
return resolve(normalizedPackagePaths); return resolve(normalizedPackagePaths);
@ -254,7 +263,7 @@ function computeDependenciesDirectlyFromPackageFile(path: string, logResource: R
// addPackageAndDependenciesToSet adds all required dependencies for the requested pkg name from the given root package // addPackageAndDependenciesToSet adds all required dependencies for the requested pkg name from the given root package
// into the set. It will recurse into all dependencies of the package. // into the set. It will recurse into all dependencies of the package.
function addPackageAndDependenciesToSet( function addPackageAndDependenciesToSet(
root: readPackageTree.Node, pkg: string, root: readPackageTree.Node, pkg: string, seenPaths: Set<string>,
normalizedPackagePaths: Set<string>, excludedPackages: Set<string>) { normalizedPackagePaths: Set<string>, excludedPackages: Set<string>) {
// Don't process this packages if it was in the set the user wants to exclude. // Don't process this packages if it was in the set the user wants to exclude.
@ -268,6 +277,13 @@ function addPackageAndDependenciesToSet(
return; return;
} }
// Don't process a child path if we've already encountered it.
const normalizedPath = upath.normalize(child.path);
if (seenPaths.has(normalizedPath)) {
return;
}
seenPaths.add(normalizedPath);
if (child.package.pulumi) { if (child.package.pulumi) {
// This was a pulumi deployment-time package. Check if it had a: // This was a pulumi deployment-time package. Check if it had a:
// //
@ -286,7 +302,7 @@ function addPackageAndDependenciesToSet(
else { else {
// Normal package. Add the normalized path to it, and all transitively add all of its // Normal package. Add the normalized path to it, and all transitively add all of its
// dependencies. // dependencies.
normalizedPackagePaths.add(upath.normalize(child.path)); normalizedPackagePaths.add(normalizedPath);
recurse(child.package.dependencies); recurse(child.package.dependencies);
} }
@ -295,7 +311,8 @@ function addPackageAndDependenciesToSet(
function recurse(dependencies: any) { function recurse(dependencies: any) {
if (dependencies) { if (dependencies) {
for (const dep of Object.keys(dependencies)) { for (const dep of Object.keys(dependencies)) {
addPackageAndDependenciesToSet(child!, dep, normalizedPackagePaths, excludedPackages); addPackageAndDependenciesToSet(
child!, dep, seenPaths, normalizedPackagePaths, excludedPackages);
} }
} }
} }