From 63b7530ddcc0301075515e06d472a3edfdecdd98 Mon Sep 17 00:00:00 2001 From: Parisa Date: Mon, 4 Apr 2022 15:48:00 -0400 Subject: [PATCH 1/4] 6 --- cmd/docs.go | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/cmd/docs.go b/cmd/docs.go index 41943a6b..6bb24405 100644 --- a/cmd/docs.go +++ b/cmd/docs.go @@ -2,13 +2,36 @@ package cmd import ( "fmt" + "github.com/elasticpath/epcc-cli/external/resources" "github.com/spf13/cobra" + "os/exec" + "runtime" ) var docsCommand = &cobra.Command{ Use: "docs ", Short: "Opens up API documentation for the resource", RunE: func(cmd *cobra.Command, args []string) error { - return fmt.Errorf("This function is not implemented") + + if len(args) != 0 { + resource := resources.Resources[args[0]] + url := resource.Docs + + switch runtime.GOOS { + case "linux": + exec.Command("xdg-open", url).Start() + case "windows": + exec.Command("rundll32", "url.dll,FileProtocolHandler", url).Start() + case "darwin": + exec.Command("open", url).Start() + default: + fmt.Errorf("unsupported platform") + } + return nil + // return fmt.Errorf("This function is not implemented") + + } else { + return fmt.Errorf("You must supply a resource type to the docs command") + } }, } From a8481cd933f22432b972374a8a577c4c67a61c5a Mon Sep 17 00:00:00 2001 From: Parisa Date: Mon, 4 Apr 2022 17:14:56 -0400 Subject: [PATCH 2/4] #6-ocs command support --- cmd/docs.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/docs.go b/cmd/docs.go index 6bb24405..4c388fd2 100644 --- a/cmd/docs.go +++ b/cmd/docs.go @@ -12,7 +12,6 @@ var docsCommand = &cobra.Command{ Use: "docs ", Short: "Opens up API documentation for the resource", RunE: func(cmd *cobra.Command, args []string) error { - if len(args) != 0 { resource := resources.Resources[args[0]] url := resource.Docs From fccc1130b70939d94dd39f6b19901875f0232926 Mon Sep 17 00:00:00 2001 From: Parisa Date: Tue, 5 Apr 2022 15:01:15 -0400 Subject: [PATCH 3/4] fix Command docs- Issue6 --- cmd/docs.go | 27 +++++++++------------------ cmd/share.go | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 cmd/share.go diff --git a/cmd/docs.go b/cmd/docs.go index 4c388fd2..866f40c8 100644 --- a/cmd/docs.go +++ b/cmd/docs.go @@ -4,8 +4,6 @@ import ( "fmt" "github.com/elasticpath/epcc-cli/external/resources" "github.com/spf13/cobra" - "os/exec" - "runtime" ) var docsCommand = &cobra.Command{ @@ -14,23 +12,16 @@ var docsCommand = &cobra.Command{ RunE: func(cmd *cobra.Command, args []string) error { if len(args) != 0 { resource := resources.Resources[args[0]] - url := resource.Docs - - switch runtime.GOOS { - case "linux": - exec.Command("xdg-open", url).Start() - case "windows": - exec.Command("rundll32", "url.dll,FileProtocolHandler", url).Start() - case "darwin": - exec.Command("open", url).Start() - default: - fmt.Errorf("unsupported platform") + if len(resource.Docs) > 0 { + url := resource.Docs + err := OpenUrl(url) + if err != nil { + return nil + } + } else { + return fmt.Errorf("You must supply a valid resource type to the docs command") } - return nil - // return fmt.Errorf("This function is not implemented") - - } else { - return fmt.Errorf("You must supply a resource type to the docs command") } + return fmt.Errorf("You must supply a resource type to the docs command") }, } diff --git a/cmd/share.go b/cmd/share.go new file mode 100644 index 00000000..52a39308 --- /dev/null +++ b/cmd/share.go @@ -0,0 +1,23 @@ +package cmd + +import ( + "fmt" + "os/exec" + "runtime" +) + +func OpenUrl(cmUrl string) error { + + switch runtime.GOOS { + case "linux": + exec.Command("xdg-open", cmUrl).Start() + case "windows": + exec.Command("rundll32", "url.dll,FileProtocolHandler", cmUrl).Start() + case "darwin": + exec.Command("open", cmUrl).Start() + default: + return fmt.Errorf("unsupported platform") + } + + return nil +} From c4dd5fe6f84ae8244558c8dd1c507a245277b06a Mon Sep 17 00:00:00 2001 From: Parisa Date: Tue, 5 Apr 2022 15:07:31 -0400 Subject: [PATCH 4/4] fix CommerceManager funcOpenUrl --- cmd/commercemanager.go | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/cmd/commercemanager.go b/cmd/commercemanager.go index 154148e8..de1a6f3a 100644 --- a/cmd/commercemanager.go +++ b/cmd/commercemanager.go @@ -4,8 +4,6 @@ import ( "fmt" "github.com/spf13/cobra" "net/url" - "os/exec" - "runtime" ) var cmCommand = &cobra.Command{ @@ -29,18 +27,7 @@ var cmCommand = &cobra.Command{ fmt.Printf("Don't know where Commerce Manager is for $EPCC_API_BASE_URL=%s \n", u) return err } - - switch runtime.GOOS { - case "linux": - err = exec.Command("xdg-open", cmUrl).Start() - case "windows": - err = exec.Command("rundll32", "url.dll,FileProtocolHandler", cmUrl).Start() - case "darwin": - err = exec.Command("open", cmUrl).Start() - default: - err = fmt.Errorf("unsupported platform") - } - + err = OpenUrl(cmUrl) if err != nil { fmt.Println(err) return err