From 73deda7d04e52072d55dea49e6d9cba4bbc96134 Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Mon, 20 Jun 2022 12:23:51 -0700 Subject: [PATCH] refactor goarch --- agent/agent.go | 1 - agent/install.go | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/agent/agent.go b/agent/agent.go index 567d56a..f299863 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -141,7 +141,6 @@ func New(logger *logrus.Logger, version string) *Agent { return &Agent{ Hostname: info.Hostname, - Arch: info.Architecture, BaseURL: ac.BaseURL, AgentID: ac.AgentID, ApiURL: ac.APIURL, diff --git a/agent/install.go b/agent/install.go index 8614794..db8fad3 100644 --- a/agent/install.go +++ b/agent/install.go @@ -138,14 +138,6 @@ func (a *Agent) Install(i *Installer) { rClient.SetProxy(i.Proxy) } - var arch string - switch a.Arch { - case "x86_64": - arch = "64" - case "x86": - arch = "32" - } - var installerMeshSystemEXE string if len(i.MeshDir) > 0 { installerMeshSystemEXE = filepath.Join(i.MeshDir, "MeshAgent.exe") @@ -159,7 +151,7 @@ func (a *Agent) Install(i *Installer) { mesh := filepath.Join(a.ProgramDir, a.MeshInstaller) if i.LocalMesh == "" { a.Logger.Infoln("Downloading mesh agent...") - payload := map[string]string{"arch": arch, "plat": a.Platform} + payload := map[string]string{"goarch": a.GoArch, "plat": a.Platform} r, err := rClient.R().SetBody(payload).SetOutput(mesh).Post(fmt.Sprintf("%s/api/v3/meshexe/", baseURL)) if err != nil { a.installerMsg(fmt.Sprintf("Failed to download mesh agent: %s", err.Error()), "error", i.Silent)