From 738432f0dfaa8ab52e8deb9fea987ec7bf0cd33d Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 25 Apr 2023 14:55:57 +0200 Subject: [PATCH] Change execute interface to use IP/Port pair --- cmd/examples/create/create.go | 2 +- cmd/examples/delete/delete.go | 7 ++++--- cmd/examples/modify/modify.go | 2 +- pcsdk/commands.go | 16 ++++++++-------- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/cmd/examples/create/create.go b/cmd/examples/create/create.go index 2085941..60ff6fb 100644 --- a/cmd/examples/create/create.go +++ b/cmd/examples/create/create.go @@ -14,7 +14,7 @@ func main() { uuid := uuid.MustParse("87e79cbc-6df6-4462-8412-85d6c473e3b1") m := pcsdk.NewCommandCreate(5555, 8080, ip, state.CustomUUID(uuid)) - err := m.Execute("http://localhost:3000") + err := m.Execute(netip.MustParseAddrPort("127.0.0.1:3000")) if err != nil { fmt.Printf("error executing create command: %s\n", err) } else { diff --git a/cmd/examples/delete/delete.go b/cmd/examples/delete/delete.go index 86bd1cf..91fda1c 100644 --- a/cmd/examples/delete/delete.go +++ b/cmd/examples/delete/delete.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "net/netip" "github.com/google/uuid" "github.com/thefeli73/polemos/pcsdk" @@ -12,10 +13,10 @@ func main() { uuid := uuid.MustParse("87e79cbc-6df6-4462-8412-85d6c473e3b1") m := pcsdk.NewCommandDelete(state.CustomUUID(uuid)) - err := m.Execute("http://localhost:3000") + err := m.Execute(netip.MustParseAddrPort("127.0.0.1:3000")) if err != nil { - fmt.Printf("error executing modify command: %s\n", err) + fmt.Printf("error executing delete command: %s\n", err) } else { - fmt.Println("executing modify command completed") + fmt.Println("executing delete command completed") } } diff --git a/cmd/examples/modify/modify.go b/cmd/examples/modify/modify.go index ac31b63..bb3ff3b 100644 --- a/cmd/examples/modify/modify.go +++ b/cmd/examples/modify/modify.go @@ -14,7 +14,7 @@ func main() { uuid := uuid.MustParse("87e79cbc-6df6-4462-8412-85d6c473e3b1") m := pcsdk.NewCommandModify(9111, ip, state.CustomUUID(uuid)) - err := m.Execute("http://localhost:3000") + err := m.Execute(netip.MustParseAddrPort("127.0.0.1:3000")) if err != nil { fmt.Printf("error executing modify command: %s\n", err) } else { diff --git a/pcsdk/commands.go b/pcsdk/commands.go index fe47030..5073da8 100644 --- a/pcsdk/commands.go +++ b/pcsdk/commands.go @@ -14,7 +14,7 @@ import ( ) type ExecuteCommand interface { - Execute(string) error + Execute(netip.AddrPort) error } type response struct { @@ -33,14 +33,14 @@ type CommandCreate struct { Id string `json:"id"` } -func (c ProxyCommandCreate) Execute(url string) error { +func (c ProxyCommandCreate) Execute(url netip.AddrPort) error { data, err := json.Marshal(c) if err != nil { return errors.New(fmt.Sprintf("could not serialize: %s\n", err)) } - requestURL := fmt.Sprintf("%s/command", url) - + requestURL := fmt.Sprintf("http://%s:%d/command", url.Addr().String(), url.Port()) + fmt.Println(requestURL) bodyReader := bytes.NewReader(data) res, err := http.DefaultClient.Post(requestURL, "application/json", bodyReader) @@ -78,13 +78,13 @@ type CommandModify struct { Id string `json:"id"` } -func (c ProxyCommandModify) Execute(url string) error { +func (c ProxyCommandModify) Execute(url netip.AddrPort) error { data, err := json.Marshal(c) if err != nil { return errors.New(fmt.Sprintf("could not serialize: %s\n", err)) } - requestURL := fmt.Sprintf("%s/command", url) + requestURL := fmt.Sprintf("http://%s:%d/command", url.Addr().String(), url.Port()) bodyReader := bytes.NewReader(data) @@ -121,13 +121,13 @@ type CommandDelete struct { Id string `json:"id"` } -func (c ProxyCommandDelete) Execute(url string) error { +func (c ProxyCommandDelete) Execute(url netip.AddrPort) error { data, err := json.Marshal(c) if err != nil { return errors.New(fmt.Sprintf("could not serialize: %s\n", err)) } - requestURL := fmt.Sprintf("%s/command", url) + requestURL := fmt.Sprintf("http://%s:%d/command", url.Addr().String(), url.Port()) bodyReader := bytes.NewReader(data)