Skip to content
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

Jump to bottom

Fix hang on large YAML files #974

Merged
merged 2 commits into from
Feb 3, 2020
Merged

Fix hang on large YAML files #974

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5075f51
Fix hang on large YAML files
lblackstone Jan 31, 2020
8c43527
Add regression test
lblackstone Jan 31, 2020
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
13 changes: 6 additions & 7 deletions pkg/gen/nodejs-templates/yaml.ts.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ import * as outputs from "../types/output";

export interface ConfigOpts {
/** JavaScript objects representing Kubernetes resources. */
objs: pulumi.Input<pulumi.Input<any>[]>;
pgavlin marked this conversation as resolved.
Show resolved Hide resolved
objs: Promise<any[]>;

/**
* A set of transformations to apply to Kubernetes resource definitions before registering
Expand Down Expand Up @@ -182,7 +182,7 @@ import * as outputs from "../types/output";
}

if (config.objs !== undefined) {
const objs = Array.isArray(config.objs) ? config.objs: [config.objs];
const objs: Promise<any[]> = Array.isArray(config.objs) ? Promise.resolve(config.objs) : Promise.resolve([config.objs]);
const docResources = parseYamlDocument({objs, transformations: config.transformations}, opts);
resources = pulumi.all([resources, docResources]).apply(([rs, drs]) => ({...rs, ...drs}));
}
Expand Down Expand Up @@ -335,14 +335,13 @@ import * as outputs from "../types/output";
config: ConfigOpts,
opts?: pulumi.CustomResourceOptions,
): pulumi.Output<{[key: string]: pulumi.CustomResource}> {
return pulumi.output(config.objs).apply(configObjs => {
const objs = configObjs
const objs = config.objs.then(configObjs => {
return configObjs
.map(obj => parseYamlObject(obj, config.transformations, config.resourcePrefix, opts))
.reduce((array, objs) => (array.concat(...objs)), []);

return pulumi.output(objs).apply(objs => objs
.reduce((map: {[key: string]: pulumi.CustomResource}, val) => (map[val.name] = val.resource, map), {}))
});
return pulumi.output(objs).apply(objs => objs
.reduce((map: {[key: string]: pulumi.CustomResource}, val) => (map[val.name] = val.resource, map), {}));
}

/** @ignore */ function parseYamlObject(
Expand Down
2 changes: 1 addition & 1 deletion pkg/provider/invoke_decode_yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func decodeYaml(text, defaultNamespace string, clientSet *clients.DynamicClientS
resources = append(resources, resource)
}

result := make([]interface{}, len(resources))
result := make([]interface{}, 0, len(resources))
for _, resource := range resources {
result = append(result, resource.Object)
}
Expand Down
13 changes: 6 additions & 7 deletions sdk/nodejs/yaml/yaml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ import * as outputs from "../types/output";

export interface ConfigOpts {
/** JavaScript objects representing Kubernetes resources. */
objs: pulumi.Input<pulumi.Input<any>[]>;
objs: Promise<any[]>;

/**
* A set of transformations to apply to Kubernetes resource definitions before registering
Expand Down Expand Up @@ -182,7 +182,7 @@ import * as outputs from "../types/output";
}

if (config.objs !== undefined) {
const objs = Array.isArray(config.objs) ? config.objs: [config.objs];
const objs: Promise<any[]> = Array.isArray(config.objs) ? Promise.resolve(config.objs) : Promise.resolve([config.objs]);
const docResources = parseYamlDocument({objs, transformations: config.transformations}, opts);
resources = pulumi.all([resources, docResources]).apply(([rs, drs]) => ({...rs, ...drs}));
}
Expand Down Expand Up @@ -2477,14 +2477,13 @@ import * as outputs from "../types/output";
config: ConfigOpts,
opts?: pulumi.CustomResourceOptions,
): pulumi.Output<{[key: string]: pulumi.CustomResource}> {
return pulumi.output(config.objs).apply(configObjs => {
const objs = configObjs
const objs = config.objs.then(configObjs => {
return configObjs
.map(obj => parseYamlObject(obj, config.transformations, config.resourcePrefix, opts))
.reduce((array, objs) => (array.concat(...objs)), []);

return pulumi.output(objs).apply(objs => objs
.reduce((map: {[key: string]: pulumi.CustomResource}, val) => (map[val.name] = val.resource, map), {}))
});
return pulumi.output(objs).apply(objs => objs
.reduce((map: {[key: string]: pulumi.CustomResource}, val) => (map[val.name] = val.resource, map), {}));
}

/** @ignore */ function parseYamlObject(
Expand Down