Skip to content

Commit

Permalink
Commit codegen changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@RobbieMcKinstry
RobbieMcKinstry committed Oct 14, 2022
1 parent 06747b3 commit 9e69c6b
Show file tree
Hide file tree
Showing 42 changed files with 41 additions and 28 deletions.
7 changes: 1 addition & 6 deletions pkg/codegen/nodejs/gen.go
View file
Expand Up @@ -1778,12 +1778,7 @@ func (ns *namespace) intoIOFiles(ctx *ioContext, parent string) ([]*ioFile, erro
if parent != "./types" && ctx.input {
var indexPath = path.Join(dirRoot, "index.ts")
var file = newIOFile(indexPath)
ctx.mod.genHeader(
file.writer(),
ctx.mod.sdkImportsWithPath(false, false, dirRoot),
ctx.externalImports,
ctx.imports,
)
ctx.mod.genHeader(file.writer(), nil, nil, nil)
fmt.Fprintf(file.writer(), "export * from \"./%s\";\n", "input")
fmt.Fprintf(file.writer(), "export * from \"./%s\";\n", "output")
fmt.Fprintf(file.writer(), "export * as %s from \"./%s\";\n", "inputs", "input")
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/cyclic-types/nodejs/types/input.ts
View file
Expand Up @@ -4,4 +4,5 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as utilities from "../utilities";

1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/cyclic-types/nodejs/types/output.ts
View file
Expand Up @@ -4,4 +4,5 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as utilities from "../utilities";

1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/dashed-import-schema/nodejs/types/input.ts
View file
Expand Up @@ -5,7 +5,6 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as enums from "../types/enums";

import * as utilities from "../utilities";

export interface ContainerArgs {
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/dashed-import-schema/nodejs/types/output.ts
View file
Expand Up @@ -5,7 +5,6 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as enums from "../types/enums";

import * as utilities from "../utilities";

export interface Container {
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/types/input.ts
View file
Expand Up @@ -5,6 +5,7 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as enums from "../types/enums";
import * as utilities from "../utilities";

/**
* Configuration filters
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/types/output.ts
View file
Expand Up @@ -5,6 +5,7 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as enums from "../types/enums";
import * as utilities from "../utilities";

/**
* Availability information of a product system.
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/types/input.ts
View file
Expand Up @@ -4,6 +4,7 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as utilities from "../utilities";

export interface GetAmiIdsFilter {
name: string;
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/types/output.ts
View file
Expand Up @@ -4,6 +4,7 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as utilities from "../utilities";

export interface GetAmiIdsFilter {
name: string;
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/output-funcs/nodejs/types/input.ts
View file
Expand Up @@ -4,6 +4,7 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as utilities from "../utilities";

/**
* Bastion Shareable Link.
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/output-funcs/nodejs/types/output.ts
View file
Expand Up @@ -4,6 +4,7 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as utilities from "../utilities";

/**
* Ssis environment reference.
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/plain-and-default/nodejs/types/input.ts
View file
Expand Up @@ -5,4 +5,5 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as enums from "../types/enums";
import * as utilities from "../utilities";

1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/plain-and-default/nodejs/types/output.ts
View file
Expand Up @@ -5,4 +5,5 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as enums from "../types/enums";
import * as utilities from "../utilities";

1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/types/input.ts
View file
Expand Up @@ -4,7 +4,6 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";

import * as utilities from "../utilities";

/**
Expand Down
2 changes: 2 additions & 0 deletions pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/types/mod1/index.ts
View file
Expand Up @@ -3,3 +3,5 @@

export * from "./input";
export * from "./output";
export * as inputs from "./input";
export * as outputs from "./output";
3 changes: 1 addition & 2 deletions pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/types/mod1/input.ts
View file
Expand Up @@ -4,8 +4,7 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../../types/input";
import * as outputs from "../../types/output";

import * as utilities from "../utilities";
import * as utilities from "../../utilities";

/**
* A test for namespaces (mod 1)
Expand Down
3 changes: 1 addition & 2 deletions pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/types/mod1/output.ts
View file
Expand Up @@ -4,6 +4,5 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../../types/input";
import * as outputs from "../../types/output";

import * as utilities from "../utilities";
import * as utilities from "../../utilities";

2 changes: 2 additions & 0 deletions pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/types/mod2/index.ts
View file
Expand Up @@ -3,3 +3,5 @@

export * from "./input";
export * from "./output";
export * as inputs from "./input";
export * as outputs from "./output";
3 changes: 1 addition & 2 deletions pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/types/mod2/input.ts
View file
Expand Up @@ -4,8 +4,7 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../../types/input";
import * as outputs from "../../types/output";

import * as utilities from "../utilities";
import * as utilities from "../../utilities";

/**
* A test for namespaces (mod 2)
Expand Down
3 changes: 1 addition & 2 deletions pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/types/mod2/output.ts
View file
Expand Up @@ -4,6 +4,5 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../../types/input";
import * as outputs from "../../types/output";

import * as utilities from "../utilities";
import * as utilities from "../../utilities";

1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/types/output.ts
View file
Expand Up @@ -4,7 +4,6 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";

import * as utilities from "../utilities";

/**
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/types/input.ts
View file
Expand Up @@ -4,7 +4,6 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";

import * as utilities from "../utilities";

/**
Expand Down
2 changes: 2 additions & 0 deletions pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/types/mod1/index.ts
View file
Expand Up @@ -3,3 +3,5 @@

export * from "./input";
export * from "./output";
export * as inputs from "./input";
export * as outputs from "./output";
3 changes: 1 addition & 2 deletions pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/types/mod1/input.ts
View file
Expand Up @@ -4,8 +4,7 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../../types/input";
import * as outputs from "../../types/output";

import * as utilities from "../utilities";
import * as utilities from "../../utilities";

/**
* A test for namespaces (mod 1)
Expand Down
3 changes: 1 addition & 2 deletions pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/types/mod1/output.ts
View file
Expand Up @@ -4,6 +4,5 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../../types/input";
import * as outputs from "../../types/output";

import * as utilities from "../utilities";
import * as utilities from "../../utilities";

2 changes: 2 additions & 0 deletions pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/types/mod2/index.ts
View file
Expand Up @@ -3,3 +3,5 @@

export * from "./input";
export * from "./output";
export * as inputs from "./input";
export * as outputs from "./output";
3 changes: 1 addition & 2 deletions pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/types/mod2/input.ts
View file
Expand Up @@ -4,8 +4,7 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../../types/input";
import * as outputs from "../../types/output";

import * as utilities from "../utilities";
import * as utilities from "../../utilities";

/**
* A test for namespaces (mod 2)
Expand Down
3 changes: 1 addition & 2 deletions pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/types/mod2/output.ts
View file
Expand Up @@ -4,6 +4,5 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../../types/input";
import * as outputs from "../../types/output";

import * as utilities from "../utilities";
import * as utilities from "../../utilities";

1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/types/output.ts
View file
Expand Up @@ -4,7 +4,6 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";

import * as utilities from "../utilities";

/**
Expand Down
2 changes: 2 additions & 0 deletions pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/types/config/index.ts
View file
Expand Up @@ -3,3 +3,5 @@

export * from "./input";
export * from "./output";
export * as inputs from "./input";
export * as outputs from "./output";
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/types/config/input.ts
View file
Expand Up @@ -5,4 +5,5 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../../types/input";
import * as outputs from "../../types/output";
import * as enums from "../../types/enums";
import * as utilities from "../../utilities";

1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/types/config/output.ts
View file
Expand Up @@ -5,6 +5,7 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../../types/input";
import * as outputs from "../../types/output";
import * as enums from "../../types/enums";
import * as utilities from "../../utilities";

export interface Sandwich {
bread?: string;
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/types/input.ts
View file
Expand Up @@ -5,5 +5,6 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as enums from "../types/enums";
import * as utilities from "../utilities";

export * as config from "./config";
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/types/output.ts
View file
Expand Up @@ -5,6 +5,7 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as enums from "../types/enums";
import * as utilities from "../utilities";

export interface Child {
age?: number;
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/regress-8403/nodejs/types/input.ts
View file
Expand Up @@ -4,4 +4,5 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as utilities from "../utilities";

1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/regress-8403/nodejs/types/output.ts
View file
Expand Up @@ -4,6 +4,7 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as utilities from "../utilities";

export interface GetCustomDbRolesResult {
}
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/regress-node-8110/nodejs/types/input.ts
View file
Expand Up @@ -5,4 +5,5 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as enums from "../types/enums";
import * as utilities from "../utilities";

1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/regress-node-8110/nodejs/types/output.ts
View file
Expand Up @@ -5,4 +5,5 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as enums from "../types/enums";
import * as utilities from "../utilities";

1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/replace-on-change/nodejs/types/input.ts
View file
Expand Up @@ -4,6 +4,7 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as utilities from "../utilities";

import {Cat, Dog} from "..";

1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/replace-on-change/nodejs/types/output.ts
View file
Expand Up @@ -4,6 +4,7 @@
import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as utilities from "../utilities";

import {Cat, Dog} from "..";

Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/types/input.ts
View file
Expand Up @@ -5,6 +5,7 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as enums from "../types/enums";
import * as utilities from "../utilities";

import {Resource} from "..";

Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/types/output.ts
View file
Expand Up @@ -5,6 +5,7 @@ import * as pulumi from "@pulumi/pulumi";
import * as inputs from "../types/input";
import * as outputs from "../types/output";
import * as enums from "../types/enums";
import * as utilities from "../utilities";

import {Resource} from "..";

Expand Down

0 comments on commit 9e69c6b

Please sign in to comment.