Split up nodejs SDK into multiple files

CHANGELOG.md

@@ -6,12 +6,11 @@
 
 ### Improvements
 
--   None
+-   Split up nodejs SDK into multiple files (https://github.com/pulumi/pulumi-kubernetes/pull/480)
 
 ### Bug fixes
 
 -   Check for unexpected RPC ID and return an error (https://github.com/pulumi/pulumi-kubernetes/pull/475)
-
 -   Fix an issue where the Python `pulumi_kubernetes` package was depending on an older `pulumi` package.
 
 ## 0.21.0 (Released March 6, 2019)

cmd/pulumi-gen-kubernetes/main.go

@@ -56,7 +56,8 @@ func main() {
 }
 
 func writeNodeJSClient(data map[string]interface{}, outdir, templateDir string) {
-	inputAPIts, ouputAPIts, providerts, helmts, packagejson, err := gen.NodeJSClient(data, templateDir)
+	inputAPIts, ouputAPIts, providerts, helmts, indexts, packagejson, groupsts, err := gen.NodeJSClient(
+		data, templateDir)
 	if err != nil {
 		panic(err)
 	}
@@ -87,11 +88,49 @@ func writeNodeJSClient(data map[string]interface{}, outdir, templateDir string)
 		panic(err)
 	}
 
+	for groupName, group := range groupsts {
+		groupDir := fmt.Sprintf("%s/%s", outdir, groupName)
+		err = os.MkdirAll(groupDir, 0700)
+		if err != nil {
+			panic(err)
+		}
+
+		for versionName, version := range group.Versions {
+			versionDir := fmt.Sprintf("%s/%s", groupDir, versionName)
+			err = os.MkdirAll(versionDir, 0700)
+			if err != nil {
+				panic(err)
+			}
+
+			for kindName, kind := range version.Kinds {
+				err = ioutil.WriteFile(fmt.Sprintf("%s/%s.ts", versionDir, kindName), []byte(kind), 0777)
+				if err != nil {
+					panic(err)
+				}
+			}
+
+			err = ioutil.WriteFile(fmt.Sprintf("%s/%s.ts", versionDir, "index"), []byte(version.Index), 0777)
+			if err != nil {
+				panic(err)
+			}
+		}
+
+		err = ioutil.WriteFile(fmt.Sprintf("%s/%s.ts", groupDir, "index"), []byte(group.Index), 0777)
+		if err != nil {
+			panic(err)
+		}
+	}
+
 	err = ioutil.WriteFile(fmt.Sprintf("%s/helm.ts", outdir), []byte(helmts), 0777)
 	if err != nil {
 		panic(err)
 	}
 
+	err = ioutil.WriteFile(fmt.Sprintf("%s/index.ts", outdir), []byte(indexts), 0777)
+	if err != nil {
+		panic(err)
+	}
+
 	err = ioutil.WriteFile(fmt.Sprintf("%s/package.json", outdir), []byte(packagejson), 0777)
 	if err != nil {
 		panic(err)

pkg/gen/nodejs-templates/kind.ts.mustache

@@ -0,0 +1,49 @@
+// *** WARNING: this file was generated by the Pulumi Kubernetes codegen tool. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+import * as pulumi from "@pulumi/pulumi";
+import * as inputApi from "../../types/input";
+import * as outputApi from "../../types/output";
+
+{{Comment}}
+export class {{Kind}} extends pulumi.CustomResource {
+  {{#Properties}}
+  {{Comment}}
+  public readonly {{Name}}: pulumi.Output<{{{PropType}}}>;
+
+  {{/Properties}}
+  /**
+   * Get the state of an existing `{{Kind}}` resource, as identified by `id`.
+   * Typically this ID  is of the form <namespace>/<name>; if <namespace> is omitted, then (per
+   * Kubernetes convention) the ID becomes default/<name>.
+   *
+   * Pulumi will keep track of this resource using `name` as the Pulumi ID.
+   *
+   * @param name _Unique_ name used to register this resource with Pulumi.
+   * @param id An ID for the Kubernetes resource to retrieve. Takes the form
+   *  <namespace>/<name> or <name>.
+   * @param opts Uniquely specifies a CustomResource to select.
+   */
+  public static get(name: string, id: pulumi.Input<pulumi.ID>, opts?: pulumi.CustomResourceOptions): {{Kind}} {
+      return new {{Kind}}(name, undefined, { ...opts, id: id });
+  }
+
+  public getInputs(): inputApi.{{Group}}.{{Version}}.{{Kind}} { return this.__inputs; }
+  private readonly __inputs: inputApi.{{Group}}.{{Version}}.{{Kind}};
+
+  /**
+   * Create a {{Group}}.{{Version}}.{{Kind}} resource with the given unique name, arguments, and options.
+   *
+   * @param name The _unique_ name of the resource.
+   * @param args The arguments to use to populate this resource's properties.
+   * @param opts A bag of options that control this resource's behavior.
+   */
+  constructor(name: string, args?: inputApi.{{Group}}.{{Version}}.{{Kind}}, opts?: pulumi.CustomResourceOptions) {
+      let inputs: pulumi.Inputs = {};
+      {{#Properties}}
+      inputs["{{Name}}"] = {{{DefaultValue}}};
+      {{/Properties}}
+      super("kubernetes:{{URNAPIVersion}}:{{Kind}}", name, inputs, opts);
+      this.__inputs = <any>args;
+  }
+}

pkg/gen/nodejs-templates/kindIndex.ts.mustache

@@ -0,0 +1,8 @@
+// *** WARNING: this file was generated by the Pulumi Kubernetes codegen tool. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+// Export members:
+{{#Kinds}}
+export * from "./{{Kind}}";
+{{/Kinds}}
+

pkg/gen/nodejs-templates/provider.ts.mustache

@@ -1,14 +1,14 @@
 // *** WARNING: this file was generated by the Pulumi Kubernetes codegen tool. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-import * as fs from "fs";
-
 import * as pulumi from "@pulumi/pulumi";
-import * as inputApi from "./types/input";
-import * as outputApi from "./types/output";
-import * as jsyaml from "js-yaml";
+import * as fs from "fs";
 import * as glob from "glob";
+import * as jsyaml from "js-yaml";
 import fetch from "node-fetch";
+import * as k8s from "./index";
+import * as inputApi from "./types/input";
+import * as outputApi from "./types/output";
 
 export namespace yaml {
     export interface ConfigGroupOpts {
@@ -113,8 +113,8 @@ export namespace yaml {
         {{#Groups}}
         {{#Versions}}
         {{#KindsAndAliases}}
-        public getResource(groupVersionKind: "{{RawAPIVersion}}/{{Kind}}", name: string): pulumi.Output<{{Group}}.{{Version}}.{{Kind}}>;
-        public getResource(groupVersionKind: "{{RawAPIVersion}}/{{Kind}}", namespace: string, name: string): pulumi.Output<{{Group}}.{{Version}}.{{Kind}}>;
+        public getResource(groupVersionKind: "{{RawAPIVersion}}/{{Kind}}", name: string): pulumi.Output<k8s.{{Group}}.{{Version}}.{{Kind}}>;
+        public getResource(groupVersionKind: "{{RawAPIVersion}}/{{Kind}}", namespace: string, name: string): pulumi.Output<k8s.{{Group}}.{{Version}}.{{Kind}}>;
         {{/KindsAndAliases}}
         {{/Versions}}
         {{/Groups}}
@@ -293,7 +293,7 @@ export namespace yaml {
             case "{{RawAPIVersion}}/{{Kind}}":
                 return [{
                     name: `{{RawAPIVersion}}/{{Kind}}::${id}`,
-                    resource: new {{Group}}.{{Version}}.{{Kind}}(id, obj, opts),
+                    resource: new k8s.{{Group}}.{{Version}}.{{Kind}}(id, obj, opts),
                 }];
             {{/KindsAndAliases}}
             {{/Versions}}
@@ -478,60 +478,3 @@ export interface ProviderArgs {
      */
     readonly namespace?: pulumi.Input<string>;
 }
-
-{{#Groups}}
-export namespace {{Group}} {
-  {{#Versions}}
-  export namespace {{Version}} {
-    {{#Kinds}}
-    {{{Comment}}}
-    export class {{Kind}} extends pulumi.CustomResource {
-      {{#Properties}}
-      {{{Comment}}}
-      public readonly {{Name}}: pulumi.Output<{{{PropType}}}>;
-
-      {{/Properties}}
-
-      /**
-       * Get the state of an existing `{{Kind}}` resource, as identified by `id`.
-       * Typically this ID  is of the form <namespace>/<name>; if <namespace> is omitted, then (per
-       * Kubernetes convention) the ID becomes default/<name>.
-       *
-       * Pulumi will keep track of this resource using `name` as the Pulumi ID.
-       *
-       * @param name _Unique_ name used to register this resource with Pulumi.
-       * @param id An ID for the Kubernetes resource to retrieve. Takes the form
-       *  <namespace>/<name> or <name>.
-       * @param opts Uniquely specifies a CustomResource to select.
-       */
-      public static get(name: string, id: pulumi.Input<pulumi.ID>, opts?: pulumi.CustomResourceOptions): {{Kind}} {
-          return new {{Kind}}(name, undefined, { ...opts, id: id });
-      }
-
-      public getInputs(): inputApi.{{Group}}.{{Version}}.{{Kind}} { return this.__inputs; }
-      private readonly __inputs: inputApi.{{Group}}.{{Version}}.{{Kind}};
-
-      /**
-      * Create a {{Group}}.{{Version}}.{{Kind}} resource with the given unique name, arguments, and options.
-      *
-      * @param name The _unique_ name of the resource.
-      * @param args The arguments to use to populate this resource's properties.
-      * @param opts A bag of options that control this resource's behavior.
-      */
-      constructor(name: string, args?: inputApi.{{Group}}.{{Version}}.{{Kind}}, opts?: pulumi.CustomResourceOptions) {
-          let inputs: pulumi.Inputs = {};
-          {{#Properties}}
-          inputs["{{Name}}"] = {{{DefaultValue}}};
-          {{/Properties}}
-          super("kubernetes:{{URNAPIVersion}}:{{Kind}}", name, inputs, opts);
-          this.__inputs = <any>args;
-      }
-    }
-
-    {{/Kinds}}
-  }
-
-  {{/Versions}}
-}
-
-{{/Groups}}

pkg/gen/nodejs-templates/providerIndex.ts.mustache

@@ -0,0 +1,15 @@
+// *** WARNING: this file was generated by the Pulumi Kubernetes codegen tool. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+export * from "./provider";
+import * as helm from "./helm";
+export { helm };
+
+// Import groups
+{{#Groups}}
+import * as {{Group}} from "./{{Group}}/index";
+{{/Groups}}
+
+// Export sub-modules
+export { {{#Groups}}{{Group}}, {{/Groups}} };
+

pkg/gen/nodejs-templates/versionIndex.ts.mustache

@@ -0,0 +1,11 @@
+// *** WARNING: this file was generated by the Pulumi Kubernetes codegen tool. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+// Import versions:
+{{#Versions}}
+import * as {{Version}} from "./{{Version}}/index";
+{{/Versions}}
+
+// Export sub-modules
+export { {{#Versions}}{{Version}}, {{/Versions}} };
+

pkg/gen/nodejs.go

@@ -27,10 +27,19 @@ import (
 
 // --------------------------------------------------------------------------
 
+type GroupTS struct {
+	Versions map[string]*VersionTS
+	Index    string
+}
+
+type VersionTS struct {
+	Kinds map[string]string
+	Index string
+}
+
 // NodeJSClient will generate a Pulumi Kubernetes provider client SDK for nodejs.
-func NodeJSClient(
-	swagger map[string]interface{}, templateDir string,
-) (inputsts, outputsts, providerts, helmts, packagejson string, err error) {
+func NodeJSClient(swagger map[string]interface{}, templateDir string,
+) (inputsts, outputsts, providerts, helmts, indexts, packagejson string, groupsts map[string]*GroupTS, err error) {
 	definitions := swagger["definitions"].(map[string]interface{})
 
 	groupsSlice := createGroups(definitions, nodeJSInputs())
@@ -39,7 +48,7 @@ func NodeJSClient(
 			"Groups": groupsSlice,
 		})
 	if err != nil {
-		return "", "", "", "", "", err
+		return
 	}
 
 	groupsSlice = createGroups(definitions, nodeJSOutputs())
@@ -48,33 +57,89 @@ func NodeJSClient(
 			"Groups": groupsSlice,
 		})
 	if err != nil {
-		return "", "", "", "", "", err
+		return
 	}
 
 	groupsSlice = createGroups(definitions, nodeJSProvider())
+	groupsts = make(map[string]*GroupTS)
+	for _, group := range groupsSlice {
+		groupTS := &GroupTS{}
+		for _, version := range group.Versions() {
+			if groupTS.Versions == nil {
+				groupTS.Versions = make(map[string]*VersionTS)
+			}
+			versionTS := &VersionTS{}
+			for _, kind := range version.Kinds() {
+				if versionTS.Kinds == nil {
+					versionTS.Kinds = make(map[string]string)
+				}
+				kindts, err := mustache.RenderFile(fmt.Sprintf("%s/kind.ts.mustache", templateDir),
+					map[string]interface{}{
+						"Comment":    kind.Comment(),
+						"Group":      group.Group(),
+						"Kind":       kind.Kind(),
+						"Properties": kind.Properties(),
+						"Version":    version.Version(),
+					})
+				if err != nil {
+					return "", "", "", "", "", "", nil, err
+				}
+				versionTS.Kinds[kind.Kind()] = kindts
+			}
+
+			kindIndexTS, err := mustache.RenderFile(fmt.Sprintf("%s/kindIndex.ts.mustache", templateDir),
+				map[string]interface{}{
+					"Kinds": version.Kinds(),
+				})
+			if err != nil {
+				return "", "", "", "", "", "", nil, err
+			}
+			versionTS.Index = kindIndexTS
+			groupTS.Versions[version.Version()] = versionTS
+		}
+
+		versionIndexTS, err := mustache.RenderFile(fmt.Sprintf("%s/versionIndex.ts.mustache", templateDir),
+			map[string]interface{}{
+				"Versions": group.Versions(),
+			})
+		if err != nil {
+			return "", "", "", "", "", "", nil, err
+		}
+		groupTS.Index = versionIndexTS
+		groupsts[group.Group()] = groupTS
+	}
+
 	providerts, err = mustache.RenderFile(fmt.Sprintf("%s/provider.ts.mustache", templateDir),
 		map[string]interface{}{
 			"Groups": groupsSlice,
 		})
 	if err != nil {
-		return "", "", "", "", "", err
+		return
 	}
 
 	helmts, err = mustache.RenderFile(fmt.Sprintf("%s/helm.ts.mustache", templateDir),
 		map[string]interface{}{
 			"Groups": groupsSlice,
 		})
 	if err != nil {
-		return "", "", "", "", "", err
+		return
 	}
 
 	packagejson, err = mustache.RenderFile(fmt.Sprintf("%s/package.json.mustache", templateDir),
 		map[string]interface{}{
 			"ProviderVersion": providerVersion.Version,
 		})
 	if err != nil {
-		return "", "", "", "", "", err
+		return
+	}
+
+	indexts, err = mustache.RenderFile(fmt.Sprintf("%s/providerIndex.ts.mustache", templateDir),
+		map[string]interface{}{
+			"Groups": groupsSlice,
+		})
+	if err != nil {
+		return
 	}
 
-	return inputsts, outputsts, providerts, helmts, packagejson, nil
+	return inputsts, outputsts, providerts, helmts, indexts, packagejson, groupsts, nil
 }