Merge pull request #77 from pulumi/update-pulumi-codegen

pulumi · Feb 8, 2022 · 2f13359 · 2f13359
2 parents 7ac1a6d + 2f481c3
commit 2f13359
Show file tree

Hide file tree

Showing 28 changed files with 391 additions and 119 deletions.
diff --git a/cmd/kube2pulumi/all/cli.go b/cmd/kube2pulumi/all/cli.go
@@ -14,26 +14,27 @@ func Command() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			dirPath := viper.GetString("directory")
 			filePath := viper.GetString("file")
+			outputFile := viper.GetString("outputFile")
 
-			python, err := util.RunConversion(dirPath, filePath, "python")
+			python, err := util.RunConversion(dirPath, filePath, outputFile, "python")
 			if err != nil {
 				return err
 			}
 			fmt.Printf("Conversion successful! Generated File: %s\n", python)
 
-			typescript, err := util.RunConversion(dirPath, filePath, "typescript")
+			typescript, err := util.RunConversion(dirPath, filePath, outputFile, "typescript")
 			if err != nil {
 				return err
 			}
 			fmt.Printf("Conversion successful! Generated File: %s\n", typescript)
 
-			csharp, err := util.RunConversion(dirPath, filePath, "csharp")
+			csharp, err := util.RunConversion(dirPath, filePath, outputFile, "csharp")
 			if err != nil {
 				return err
 			}
 			fmt.Printf("Conversion successful! Generated File: %s\n", csharp)
 
-			golang, err := util.RunConversion(dirPath, filePath, "go")
+			golang, err := util.RunConversion(dirPath, filePath, outputFile, "go")
 			if err != nil {
 				return err
 			}

diff --git a/cmd/kube2pulumi/csharp/cli.go b/cmd/kube2pulumi/csharp/cli.go
@@ -15,7 +15,8 @@ func Command() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			dirPath := viper.GetString("directory")
 			filePath := viper.GetString("file")
-			result, err := util.RunConversion(dirPath, filePath, "csharp")
+			outputFile := viper.GetString("outputFile")
+			result, err := util.RunConversion(dirPath, filePath, outputFile, "csharp")
 			if err != nil {
 				return err
 			}

diff --git a/cmd/kube2pulumi/go/cli.go b/cmd/kube2pulumi/go/cli.go
@@ -15,7 +15,8 @@ func Command() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			dirPath := viper.GetString("directory")
 			filePath := viper.GetString("file")
-			result, err := util.RunConversion(dirPath, filePath, "go")
+			outputFile := viper.GetString("outputFile")
+			result, err := util.RunConversion(dirPath, filePath, outputFile, "go")
 			if err != nil {
 				return err
 			}

diff --git a/cmd/kube2pulumi/main.go b/cmd/kube2pulumi/main.go
@@ -17,6 +17,7 @@ import (
 var (
 	manifestFile  string
 	directoryPath string
+	outputFile    string
 )
 
 func configureCLI() *cobra.Command {
@@ -32,6 +33,9 @@ func configureCLI() *cobra.Command {
 	rootCmd.PersistentFlags().StringVarP(&manifestFile, "file", "f", "", "YAML file to convert")
 	viper.BindPFlag("file", rootCmd.PersistentFlags().Lookup("file"))
 
+	rootCmd.PersistentFlags().StringVarP(&outputFile, "outputFile", "o", "", "The name of the output file to write to")
+	viper.BindPFlag("outputFile", rootCmd.PersistentFlags().Lookup("outputFile"))
+
 	rootCmd.PersistentFlags().StringVarP(&directoryPath, "directory", "d", "", "file path for directory to convert")
 	viper.BindPFlag("directory", rootCmd.PersistentFlags().Lookup("directory"))
 

diff --git a/cmd/kube2pulumi/python/cli.go b/cmd/kube2pulumi/python/cli.go
@@ -15,7 +15,8 @@ func Command() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			dirPath := viper.GetString("directory")
 			filePath := viper.GetString("file")
-			result, err := util.RunConversion(dirPath, filePath, "python")
+			outputFile := viper.GetString("outputFile")
+			result, err := util.RunConversion(dirPath, filePath, outputFile, "python")
 			if err != nil {
 				return err
 			}

diff --git a/cmd/kube2pulumi/typescript/cli.go b/cmd/kube2pulumi/typescript/cli.go
@@ -15,7 +15,8 @@ func Command() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			dirPath := viper.GetString("directory")
 			filePath := viper.GetString("file")
-			result, err := util.RunConversion(dirPath, filePath, "typescript")
+			outputFile := viper.GetString("outputFile")
+			result, err := util.RunConversion(dirPath, filePath, outputFile, "typescript")
 			if err != nil {
 				return err
 			}

diff --git a/cmd/kube2pulumi/util/conversion.go b/cmd/kube2pulumi/util/conversion.go
@@ -7,7 +7,7 @@ import (
 	"os"
 )
 
-func RunConversion(dirPath string, filePath string, language string) (string, error) {
+func RunConversion(dirPath string, filePath string, outputFile string, language string) (string, error) {
 	if filePath == "" && dirPath == "" {
 		path, err := os.Getwd()
 		if err != nil {
@@ -23,12 +23,12 @@ func RunConversion(dirPath string, filePath string, language string) (string, er
 	diags := hcl.Diagnostics{}
 	// filepath only
 	if filePath != "" {
-		outPath, diags, err = kube2pulumi.Kube2PulumiFile(filePath, language)
+		outPath, diags, err = kube2pulumi.Kube2PulumiFile(filePath, outputFile, language)
 		if err != nil {
 			return "", err
 		}
 	} else { // dir only
-		outPath, diags, err = kube2pulumi.Kube2PulumiDirectory(dirPath, language)
+		outPath, diags, err = kube2pulumi.Kube2PulumiDirectory(dirPath, outputFile, language)
 		if err != nil {
 			return "", err
 		}

diff --git a/go.mod b/go.mod
@@ -5,8 +5,8 @@ go 1.16
 require (
 	github.com/goccy/go-yaml v1.8.0
 	github.com/hashicorp/hcl/v2 v2.3.0
-	github.com/pulumi/pulumi/pkg/v3 v3.4.0
-	github.com/pulumi/pulumi/sdk/v3 v3.4.0 // indirect
+	github.com/pulumi/pulumi/pkg/v3 v3.24.1
+	github.com/pulumi/pulumi/sdk/v3 v3.24.1 // indirect
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.4.0