Merge pull request #37 from Doer-org/feature/hostname-option

feat(push) : Add host option
Doer-org · May 10, 2024 · 9177fbb · 9177fbb
2 parents b9beafe + f150d4d
commit 9177fbb
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 17 deletions.
diff --git a/cmd/pull.go b/cmd/pull.go
@@ -22,8 +22,12 @@ var pullCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
+		host, err := cmd.Flags().GetString("host")
+		if err != nil {
+			return err
+		}
 
-		port, err := api.ReceiveTarGzFromServer(id)
+		port, err := api.ReceiveTarGzFromServer(host, id)
 		if err != nil {
 			return err
 		}
@@ -48,6 +52,7 @@ var pullCmd = &cobra.Command{
 func init() {
 	rootCmd.AddCommand(pullCmd)
 	pullCmd.Flags().StringP("id", "i", "", "ketos docker image id")
+	pushCmd.Flags().StringP("host", "h", "", "URL of the server to use")
 
 	// Here you will define your flags and configuration settings.
 

diff --git a/cmd/push.go b/cmd/push.go
@@ -35,6 +35,10 @@ var pushCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
+		host, err := cmd.Flags().GetString("host")
+		if err != nil {
+			return err
+		}
 		dockerfile, err := cmd.Flags().GetBool("dockerfile")
 		if err != nil {
 			return err
@@ -57,7 +61,7 @@ var pushCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		err = api.SendTarToServer(publishList, envList)
+		err = api.SendTarToServer(host, publishList, envList)
 		if err != nil {
 			return err
 		}
@@ -70,6 +74,7 @@ func init() {
 	pushCmd.Flags().StringP("directory", "d", "", "Directory path to create docker image")
 	pushCmd.Flags().StringP("language", "l", "", "Language type to create docker image")
 	pushCmd.Flags().StringP("filename", "f", "", "Dockerfile name to create docker image")
+	pushCmd.Flags().StringP("host", "h", "", "URL of the server to use")
 	pushCmd.Flags().BoolP("dockerfile", "D", false, "Dockerfile or buildpacks")
 	pushCmd.Flags().StringSliceP("publish", "p", []string{}, "Publish a container's port(s) to the host")
 	pushCmd.Flags().StringSliceP("env", "e", []string{}, "Set environment variable(s)")

diff --git a/cmd/root.go b/cmd/root.go
@@ -1,6 +1,5 @@
 /*
 Copyright © 2024 NAME HERE <EMAIL ADDRESS>
-
 */
 package cmd
 
@@ -10,8 +9,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-
-
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:   "ketos",
@@ -47,5 +44,3 @@ func init() {
 	// when this action is called directly.
 	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }
-
-
diff --git a/internal/api/receive_file.go b/internal/api/receive_file.go
@@ -10,11 +10,11 @@ import (
 )
 
 type Response struct {
-    Port string `json:"port"`
-	ID string `json:"id"`
+	Port string `json:"port"`
+	ID   string `json:"id"`
 }
 
-func GetServerInfo(id string) (string,error) {
+func GetServerInfo(id string) (string, error) {
 	fullURL := fmt.Sprintf("%s/info/%s", BackendURL, id)
 	response, err := http.Get(fullURL)
 	if err != nil {
@@ -33,19 +33,22 @@ func GetServerInfo(id string) (string,error) {
 	if err != nil {
 		return "", err
 	}
-	fmt.Printf("%s/info/%s\n", FrontURL, id)	
+	fmt.Printf("%s/info/%s\n", FrontURL, id)
 	return resp.Port, nil
 }
 
-func ReceiveTarGzFromServer(id string) (string, error) {
-	fullURL := fmt.Sprintf("%s/%s", BackendURL, id)
+func ReceiveTarGzFromServer(host string, id string) (string, error) {
+	if host == "" {
+		host = BackendURL
+	}
+	fullURL := fmt.Sprintf("%s/%s", host, id)
 	response, err := http.Get(fullURL)
 	if err != nil {
 		return "", err
 	}
 	defer response.Body.Close()
 
-	infoURL := fmt.Sprintf("%s/info/%s", BackendURL, id)
+	infoURL := fmt.Sprintf("%s/info/%s", host, id)
 	infoResponse, err := http.Get(infoURL)
 	if err != nil {
 		return "", err

diff --git a/internal/api/send_file.go b/internal/api/send_file.go
@@ -14,7 +14,11 @@ import (
 	"github.com/Doer-org/ketos/internal"
 )
 
-func SendTarToServer(publishList []string, envList []string) error {
+func SendTarToServer(host string, publishList []string, envList []string) error {
+	if host == "" {
+		host = BackendURL
+	}
+
 	file, err := os.Open(filePath)
 	if err != nil {
 		return err
@@ -38,7 +42,7 @@ func SendTarToServer(publishList []string, envList []string) error {
 		portsString = "none"
 	}
 
-	fullURL := fmt.Sprintf("%s?port=%s", BackendURL, portsString)
+	fullURL := fmt.Sprintf("%s?port=%s", host, portsString)
 	request, err := http.NewRequest("POST", fullURL, body)
 	if err != nil {
 		return err
@@ -51,7 +55,7 @@ func SendTarToServer(publishList []string, envList []string) error {
 		return err
 	}
 	defer response.Body.Close()
-	
+
 	var responseBody bytes.Buffer
 	_, err = io.Copy(&responseBody, response.Body)
 	if err != nil {