overlays part 1

pulumi · Jun 17, 2020 · 702004e · 702004e
1 parent 1760f3c
commit 702004e
Show file tree

Hide file tree

Showing 12 changed files with 541 additions and 49 deletions.
diff --git a/provider/cmd/pulumi-gen-kubernetes/main.go b/provider/cmd/pulumi-gen-kubernetes/main.go
@@ -174,25 +174,32 @@ func writeNodeJSClient(pkg *schema.Package, outdir, templateDir string) {
 }
 
 func writePythonClient(pkg *schema.Package, outdir string, templateDir string) {
-	//resources, err := pythongen.LanguageResources("pulumigen", pkg)
-	//if err != nil {
-	//	panic(err)
-	//}
-	//
-	//templateResources := gen.TemplateResources{}
-	//for _, resource := range resources {
-	//	r := gen.TemplateResource{
-	//		Name: resource.Name,
-	//		Package: resource.Package,
-	//		Token: resource.Token,
-	//	}
-	//	templateResources.Resources = append(templateResources.Resources, r)
-	//}
-	//sort.Slice(templateResources.Resources, func(i, j int) bool {
-	//	return templateResources.Resources[i].Token < templateResources.Resources[j].Token
-	//})
-
-	files, err := pythongen.GeneratePackage("pulumigen", pkg, nil)
+	resources, err := pythongen.LanguageResources("pulumigen", pkg)
+	if err != nil {
+		panic(err)
+	}
+
+	templateResources := gen.TemplateResources{}
+	for _, resource := range resources {
+		r := gen.TemplateResource{
+			Name:    resource.Name,
+			Package: resource.Package,
+			Token:   resource.Token,
+		}
+		templateResources.Resources = append(templateResources.Resources, r)
+	}
+	sort.Slice(templateResources.Resources, func(i, j int) bool {
+		return templateResources.Resources[i].Token < templateResources.Resources[j].Token
+	})
+
+	overlays := map[string][]byte{
+		"apiextensions/custom_resource.py": mustLoadFile(filepath.Join(templateDir, "apiextensions", "custom_resource.py")),
+		"helm/v2/helm.py":                  mustLoadFile(filepath.Join(templateDir, "helm", "v2", "helm.py")),
+		"helm/v3/helm.py":                  mustLoadFile(filepath.Join(templateDir, "helm", "v2", "helm.py")), // v3 support is currently identical to v2
+		// "pulumi_kubernetes/yaml.py": mustRenderTemplate(filepath.Join(templateDir, "yaml", "yaml.tmpl"), templateResources),
+	}
+
+	files, err := pythongen.GeneratePackage("pulumigen", pkg, overlays)
 	if err != nil {
 		panic(err)
 	}

diff --git a/...kg/gen/python-templates/CustomResource.py → ...emplates/apiextensions/custom_resource.py b/...kg/gen/python-templates/CustomResource.py → ...emplates/apiextensions/custom_resource.py
diff --git a/provider/pkg/gen/python-templates/helm/__init__.py b/provider/pkg/gen/python-templates/helm/__init__.py
diff --git a/provider/pkg/gen/python-templates/helm/v2/__init__.py b/provider/pkg/gen/python-templates/helm/v2/__init__.py
diff --git a/provider/pkg/gen/python-templates/helm/v3/__init__.py b/provider/pkg/gen/python-templates/helm/v3/__init__.py
diff --git a/sdk/python/pulumi_kubernetes/__init__.py b/sdk/python/pulumi_kubernetes/__init__.py
@@ -4,7 +4,7 @@
 
 import importlib
 # Make subpackages available:
-__all__ = ['admissionregistration', 'apiextensions', 'apiregistration', 'apps', 'auditregistration', 'authentication', 'authorization', 'autoscaling', 'batch', 'certificates', 'coordination', 'core', 'discovery', 'events', 'extensions', 'flowcontrol', 'meta', 'networking', 'node', 'policy', 'rbac', 'scheduling', 'settings', 'storage']
+__all__ = ['admissionregistration', 'apiextensions', 'apiregistration', 'apps', 'auditregistration', 'authentication', 'authorization', 'autoscaling', 'batch', 'certificates', 'coordination', 'core', 'discovery', 'events', 'extensions', 'flowcontrol', 'helm', 'meta', 'networking', 'node', 'policy', 'rbac', 'scheduling', 'settings', 'storage']
 for pkg in __all__:
     if pkg != 'config':
         importlib.import_module(f'{__name__}.{pkg}')

diff --git a/sdk/python/pulumi_kubernetes/apiextensions/__init__.py b/sdk/python/pulumi_kubernetes/apiextensions/__init__.py
@@ -8,3 +8,6 @@
 for pkg in __all__:
     if pkg != 'config':
         importlib.import_module(f'{__name__}.{pkg}')
+
+# Export this package's modules as members:
+from .custom_resource import *
diff --git a/...ubernetes/apiextensions/CustomResource.py → ...bernetes/apiextensions/custom_resource.py b/...ubernetes/apiextensions/CustomResource.py → ...bernetes/apiextensions/custom_resource.py
diff --git a/sdk/python/pulumi_kubernetes/helm/__init__.py b/sdk/python/pulumi_kubernetes/helm/__init__.py
@@ -1,9 +1,10 @@
 # coding=utf-8
-# *** WARNING: this file was generated by the Pulumi Kubernetes codegen tool. ***
+# *** WARNING: this file was generated by pulumigen. ***
 # *** Do not edit by hand unless you're certain you know what you are doing! ***
 
+import importlib
 # Make subpackages available:
-__all__ = [
-    "v2",
-    "v3",
-]
+__all__ = ['v2', 'v3']
+for pkg in __all__:
+    if pkg != 'config':
+        importlib.import_module(f'{__name__}.{pkg}')
diff --git a/sdk/python/pulumi_kubernetes/helm/v2/__init__.py b/sdk/python/pulumi_kubernetes/helm/v2/__init__.py
@@ -1,5 +1,5 @@
 # coding=utf-8
-# *** WARNING: this file was generated by the Pulumi Kubernetes codegen tool. ***
+# *** WARNING: this file was generated by pulumigen. ***
 # *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 # Export this package's modules as members:

diff --git a/sdk/python/pulumi_kubernetes/helm/v3/__init__.py b/sdk/python/pulumi_kubernetes/helm/v3/__init__.py
@@ -1,6 +1,6 @@
 # coding=utf-8
-# *** WARNING: this file was generated by the Pulumi Kubernetes codegen tool. ***
+# *** WARNING: this file was generated by pulumigen. ***
 # *** Do not edit by hand unless you're certain you know what you are doing! ***
 
 # Export this package's modules as members:
-from ..v2.helm import *  # v3 support is identical to v2
+from .helm import *