feat(cdsctl): add import with url for all entities (#3777)

cli/cdsctl/action.go

@@ -3,12 +3,9 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io"
 	"io/ioutil"
-	"os"
 	"path"
 	"reflect"
-	"regexp"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -158,29 +155,14 @@ cdsctl action import myAction.yml`,
 
 func actionImportRun(v cli.Values) error {
 	path := v.GetString("path")
-	var contentFile io.Reader
-	var err error
-
-	format := "yaml"
-	if strings.HasSuffix(path, ".json") {
-		format = "json"
-	}
-
-	if isURL, _ := regexp.MatchString(`http[s]?:\/\/(.*)`, path); isURL {
-		contentFile, _, err = exportentities.OpenURL(path, format)
-		if err != nil {
-			return err
-		}
-	} else {
-		f, err := os.Open(path)
-		if err != nil {
-			return err
-		}
-		defer f.Close()
-		contentFile = f
+	contentFile, format, err := exportentities.OpenPath(path)
+	if err != nil {
+		return err
 	}
+	defer contentFile.Close() //nolint
+	formatStr, _ := exportentities.GetFormatStr(format)
 
-	if errImport := client.ActionImport(contentFile, format); errImport != nil {
+	if errImport := client.ActionImport(contentFile, formatStr); errImport != nil {
 		return errImport
 	}
 

cli/cdsctl/application.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"os"
 	"reflect"
-	"strings"
 
 	"github.com/spf13/cobra"
 
 	"github.com/ovh/cds/cli"
 	"github.com/ovh/cds/sdk"
+	"github.com/ovh/cds/sdk/exportentities"
 )
 
 var applicationCmd = cli.Command{
@@ -101,12 +101,12 @@ func applicationDeleteRun(v cli.Values) error {
 
 var applicationImportCmd = cli.Command{
 	Name:  "import",
-	Short: "Import an application",
+	Short: "Import an application with a local filepath or an URL",
 	Ctx: []cli.Arg{
 		{Name: _ProjectKey},
 	},
 	Args: []cli.Arg{
-		{Name: "filename"},
+		{Name: "path"},
 	},
 	Flags: []cli.Flag{
 		{
@@ -119,19 +119,15 @@ var applicationImportCmd = cli.Command{
 }
 
 func applicationImportRun(c cli.Values) error {
-	path := c.GetString("filename")
-	f, err := os.Open(path)
+	path := c.GetString("path")
+	contentFile, format, err := exportentities.OpenPath(path)
 	if err != nil {
 		return err
 	}
-	defer f.Close()
+	defer contentFile.Close() //nolint
+	formatStr, _ := exportentities.GetFormatStr(format)
 
-	var format = "yaml"
-	if strings.HasSuffix(path, ".json") {
-		format = "json"
-	}
-
-	msgs, err := client.ApplicationImport(c.GetString(_ProjectKey), f, format, c.GetBool("force"))
+	msgs, err := client.ApplicationImport(c.GetString(_ProjectKey), contentFile, formatStr, c.GetBool("force"))
 	if err != nil {
 		if msgs != nil {
 			for _, msg := range msgs {

cli/cdsctl/environment.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"os"
 	"reflect"
-	"strings"
 
 	"github.com/spf13/cobra"
 
 	"github.com/ovh/cds/cli"
 	"github.com/ovh/cds/sdk"
+	"github.com/ovh/cds/sdk/exportentities"
 )
 
 var environmentCmd = cli.Command{
@@ -89,12 +89,12 @@ func environmentDeleteRun(v cli.Values) error {
 
 var environmentImportCmd = cli.Command{
 	Name:  "import",
-	Short: "Import an environment",
+	Short: "Import an environment with local filepath or URL",
 	Ctx: []cli.Arg{
 		{Name: _ProjectKey},
 	},
 	Args: []cli.Arg{
-		{Name: "filename"},
+		{Name: "path"},
 	},
 	Flags: []cli.Flag{
 		{
@@ -107,19 +107,15 @@ var environmentImportCmd = cli.Command{
 }
 
 func environmentImportRun(c cli.Values) error {
-	path := c.GetString("filename")
-	f, err := os.Open(path)
+	path := c.GetString("path")
+	contentFile, format, err := exportentities.OpenPath(path)
 	if err != nil {
 		return err
 	}
-	defer f.Close()
+	defer contentFile.Close() //nolint
+	formatStr, _ := exportentities.GetFormatStr(format)
 
-	var format = "yaml"
-	if strings.HasSuffix(path, ".json") {
-		format = "json"
-	}
-
-	msgs, err := client.EnvironmentImport(c.GetString(_ProjectKey), f, format, c.GetBool("force"))
+	msgs, err := client.EnvironmentImport(c.GetString(_ProjectKey), contentFile, formatStr, c.GetBool("force"))
 	if err != nil {
 		return err
 	}

cli/cdsctl/worker_model.go

@@ -66,7 +66,7 @@ func workerModelListRun(v cli.Values) (cli.ListResult, error) {
 
 var workerModelImportCmd = cli.Command{
 	Name:    "import",
-	Example: "cdsctl worker model import my_worker_model_file.yml",
+	Example: "cdsctl worker model import my_worker_model_file.yml https://mydomain.com/myworkermodel.yml",
 	Long: `
 Available model type :
 - Docker images ("docker")
@@ -81,7 +81,7 @@ For admin:
 		"add",
 	},
 	VariadicArgs: cli.Arg{
-		Name: "filepath",
+		Name: "path",
 	},
 	Flags: []cli.Flag{
 		{
@@ -101,23 +101,25 @@ For admin:
 
 func workerModelImportRun(c cli.Values) error {
 	force := c.GetBool("force")
-	if c.GetString("filepath") == "" {
-		return fmt.Errorf("filepath for worker model is mandatory")
+	if c.GetString("path") == "" {
+		return fmt.Errorf("path for worker model is mandatory")
 	}
-	files := strings.Split(c.GetString("filepath"), ",")
+	files := strings.Split(c.GetString("path"), ",")
 
 	for _, filepath := range files {
-		reader, format, err := exportentities.OpenFile(filepath)
+		contentFile, format, err := exportentities.OpenPath(filepath)
 		if err != nil {
-			return fmt.Errorf("Error: Cannot read file %s (%v)", filepath, err)
+			return err
 		}
-
 		formatStr, _ := exportentities.GetFormatStr(format)
-		wm, err := client.WorkerModelImport(reader, formatStr, force)
+
+		wm, err := client.WorkerModelImport(contentFile, formatStr, force)
 		if err != nil {
+			_ = contentFile.Close()
 			return err
 		}
 		fmt.Printf("Worker model %s imported with success\n", wm.Name)
+		_ = contentFile.Close()
 	}
 
 	return nil

cli/cdsctl/workflow_import.go

@@ -2,18 +2,17 @@ package main
 
 import (
 	"fmt"
-	"os"
 	"reflect"
-	"strings"
 
 	"github.com/ovh/cds/cli"
+	"github.com/ovh/cds/sdk/exportentities"
 )
 
 var workflowImportCmd = cli.Command{
 	Name:  "import",
 	Short: "Import a workflow",
 	Long: `
-In case you want to import just your workflow.
+In case you want to import just your workflow. Instead of use a local file you can also use an URL to your yaml file.
 
 If you want to update also dependencies likes pipelines, applications or environments at same time you have to use workflow push instead workflow import.
 
@@ -22,7 +21,7 @@ If you want to update also dependencies likes pipelines, applications or environ
 		{Name: _ProjectKey},
 	},
 	Args: []cli.Arg{
-		{Name: "filename"},
+		{Name: "path"},
 	},
 	Flags: []cli.Flag{
 		{
@@ -35,19 +34,15 @@ If you want to update also dependencies likes pipelines, applications or environ
 }
 
 func workflowImportRun(c cli.Values) error {
-	path := c.GetString("filename")
-	f, err := os.Open(path)
+	path := c.GetString("path")
+	contentFile, format, err := exportentities.OpenPath(path)
 	if err != nil {
 		return err
 	}
-	defer f.Close()
+	defer contentFile.Close() //nolint
+	formatStr, _ := exportentities.GetFormatStr(format)
 
-	var format = "yaml"
-	if strings.HasSuffix(path, ".json") {
-		format = "json"
-	}
-
-	msgs, err := client.WorkflowImport(c.GetString(_ProjectKey), f, format, c.GetBool("force"))
+	msgs, err := client.WorkflowImport(c.GetString(_ProjectKey), contentFile, formatStr, c.GetBool("force"))
 	if err != nil {
 		return err
 	}

sdk/exportentities/common.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
+	"regexp"
 	"strings"
 	"time"
 
@@ -14,6 +15,8 @@ import (
 	"github.com/ovh/cds/sdk"
 )
 
+var rxURL = regexp.MustCompile(`http[s]?:\/\/(.*)`)
+
 //GetFormat return a format
 func GetFormat(f string) (Format, error) {
 	s := strings.ToLower(f)
@@ -141,3 +144,29 @@ func OpenURL(u string, f string) (io.ReadCloser, Format, error) {
 	response, err := netClient.Get(u)
 	return response.Body, format, err
 }
+
+// OpenPath opens an URL or a file
+func OpenPath(path string) (io.ReadCloser, Format, error) {
+	var contentFile io.ReadCloser
+	formatStr := "yaml"
+	if strings.HasSuffix(path, ".json") {
+		formatStr = "json"
+	}
+	format, _ := GetFormat(formatStr)
+
+	if rxURL.MatchString(path) {
+		var err error
+		contentFile, format, err = OpenURL(path, formatStr)
+		if err != nil {
+			return nil, format, err
+		}
+	} else {
+		f, err := os.Open(path)
+		if err != nil {
+			return nil, format, err
+		}
+		contentFile = f
+	}
+
+	return contentFile, format, nil
+}