make sure we use latest released amw-relayer (#2194)

* make sure we use latest released amw-relayer * go mod tidy --------- Signed-off-by: arturrez <[email protected]>
ava-labs · Oct 22, 2024 · 1053bda · 1053bda
1 parent d2170e9
commit 1053bda
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/cmd/nodecmd/wiz.go b/cmd/nodecmd/wiz.go
@@ -328,7 +328,12 @@ func wiz(cmd *cobra.Command, args []string) error {
 			if err != nil {
 				return err
 			}
-			if err := setAWMRelayerHost(awmRelayerHost); err != nil {
+			// get awm-relayer latest version
+			relayerVersion, err := teleporter.GetLatestRelayerReleaseVersion()
+			if err != nil {
+				return err
+			}
+			if err := setAWMRelayerHost(awmRelayerHost, relayerVersion); err != nil {
 				return err
 			}
 			if err := setAWMRelayerSecurityGroupRule(clusterName, awmRelayerHost); err != nil {
@@ -500,15 +505,15 @@ func updateProposerVMs(
 	return teleporter.SetProposerVM(app, network, "C", "")
 }
 
-func setAWMRelayerHost(host *models.Host) error {
+func setAWMRelayerHost(host *models.Host, relayerVersion string) error {
 	cloudID := host.GetCloudID()
 	ux.Logger.PrintToUser("")
 	ux.Logger.PrintToUser("configuring AWM Relayer on host %s", cloudID)
 	nodeConfig, err := app.LoadClusterNodeConfig(cloudID)
 	if err != nil {
 		return err
 	}
-	if err := ssh.ComposeSSHSetupAWMRelayer(host); err != nil {
+	if err := ssh.ComposeSSHSetupAWMRelayer(host, relayerVersion); err != nil {
 		return err
 	}
 	nodeConfig.IsAWMRelayer = true

diff --git a/pkg/docker/compose.go b/pkg/docker/compose.go
@@ -23,6 +23,7 @@ type dockerComposeInputs struct {
 	WithMonitoring     bool
 	WithAvalanchego    bool
 	AvalanchegoVersion string
+	AWMRelayerVersion  string
 	E2E                bool
 	E2EIP              string
 	E2ESuffix          string

diff --git a/pkg/docker/ssh.go b/pkg/docker/ssh.go
@@ -136,10 +136,12 @@ func ComposeSSHSetupMonitoring(host *models.Host) error {
 		dockerComposeInputs{})
 }
 
-func ComposeSSHSetupAWMRelayer(host *models.Host) error {
+func ComposeSSHSetupAWMRelayer(host *models.Host, relayerVersion string) error {
 	return ComposeOverSSH("Setup AWM Relayer",
 		host,
 		constants.SSHScriptTimeout,
 		"templates/awmrelayer.docker-compose.yml",
-		dockerComposeInputs{})
+		dockerComposeInputs{
+			AWMRelayerVersion: relayerVersion,
+		})
 }
diff --git a/pkg/docker/templates/awmrelayer.docker-compose.yml b/pkg/docker/templates/awmrelayer.docker-compose.yml
@@ -1,7 +1,7 @@
 name: avalanche-cli
 services:
   awm-relayer:
-    image: avaplatform/awm-relayer
+    image: avaplatform/awm-relayer:{{ .AWMRelayerVersion }}
     container_name: awm-relayer
     restart: unless-stopped
     user: "1000:1000"  # ubuntu user

diff --git a/pkg/ssh/ssh.go b/pkg/ssh/ssh.go
@@ -159,8 +159,8 @@ func RunSSHRestartNode(host *models.Host) error {
 }
 
 // ComposeSSHSetupAWMRelayer used docker compose to setup AWM Relayer
-func ComposeSSHSetupAWMRelayer(host *models.Host) error {
-	if err := docker.ComposeSSHSetupAWMRelayer(host); err != nil {
+func ComposeSSHSetupAWMRelayer(host *models.Host, relayerVersion string) error {
+	if err := docker.ComposeSSHSetupAWMRelayer(host, relayerVersion); err != nil {
 		return err
 	}
 	return docker.StartDockerComposeService(host, utils.GetRemoteComposeFile(), "awm-relayer", constants.SSHLongRunningScriptTimeout)

diff --git a/pkg/teleporter/relayer.go b/pkg/teleporter/relayer.go
@@ -210,11 +210,15 @@ func saveRelayerRunFile(runFilePath string, pid int) error {
 	return nil
 }
 
+func GetLatestRelayerReleaseVersion() (string, error) {
+	downloader := application.NewDownloader()
+	return downloader.GetLatestReleaseVersion(binutils.GetGithubLatestReleaseURL(constants.AvaLabsOrg, constants.AWMRelayerRepoName))
+}
+
 func InstallRelayer(binDir, version string) (string, error) {
 	if version == "" || version == "latest" {
-		downloader := application.NewDownloader()
 		var err error
-		version, err = downloader.GetLatestReleaseVersion(binutils.GetGithubLatestReleaseURL(constants.AvaLabsOrg, constants.AWMRelayerRepoName))
+		version, err = GetLatestRelayerReleaseVersion()
 		if err != nil {
 			return "", err
 		}