ci: install aptos cli for cre aptos suite

Author: cawthorne

.github/workflows/cre-system-tests.yaml

@@ -213,6 +213,35 @@ jobs:
           chmod +x bin/ctf
           echo "::endgroup::"
 
+      - name: Install Aptos CLI
+        if: ${{ matrix.tests.test_name == 'Test_CRE_V2_Aptos_Suite' }}
+        shell: bash
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          APTOS_CLI_TAG: "aptos-cli-v7.8.0"
+        run: |
+          echo "::startgroup::Install Aptos CLI"
+          bin_dir="$HOME/.local/bin"
+          mkdir -p "$bin_dir"
+
+          gh release download "${APTOS_CLI_TAG}" \
+            --pattern "aptos-cli-*-Ubuntu-24.04-x86_64.zip" \
+            --clobber \
+            --repo aptos-labs/aptos-core \
+            -O aptos-cli.zip
+
+          unzip -o aptos-cli.zip -d aptos-cli-extract >/dev/null
+          aptos_path="$(find aptos-cli-extract -type f -name aptos | head -n1)"
+          if [[ -z "$aptos_path" ]]; then
+            echo "failed to locate aptos binary in release archive"
+            exit 1
+          fi
+
+          install -m 0755 "$aptos_path" "$bin_dir/aptos"
+          echo "$bin_dir" >> "$GITHUB_PATH"
+          "$bin_dir/aptos" --version
+          echo "::endgroup::"
+
       - name: Start local CRE${{ matrix.tests.cre_version }}
         shell: bash
         id: start-local-cre

system-tests/lib/cre/features/aptos/aptos.go

@@ -7,9 +7,6 @@ import (
 	stderrors "errors"
 	"fmt"
 	"net/url"
-	"os"
-	osexec "os/exec"
-	"path/filepath"
 	"strconv"
 	"strings"
 	"text/template"
@@ -72,9 +69,6 @@ const (
 
 var forwarderContractVersion = semver.MustParse("1.0.0")
 
-var aptosLookPath = osexec.LookPath
-var aptosContainerImage = aptosContainerImageFromDocker
-
 type Aptos struct{}
 
 type methodConfigSettings struct {
@@ -551,12 +545,6 @@ func ensureForwarder(
 			Msg("Aptos deployer account not confirmed visible yet; proceeding with deploy retries")
 	}
 
-	restoreAptosCLI, err := prepareAptosCLI(ctx, containerName)
-	if err != nil {
-		return "", fmt.Errorf("failed to prepare Aptos CLI for forwarder deploy on chain selector %d: %w", chain.ChainSelector(), err)
-	}
-	defer restoreAptosCLI()
-
 	var deployedAddress string
 	var pendingTxHash string
 	var lastDeployErr error
@@ -605,89 +593,6 @@ func ensureForwarder(
 	return addr, nil
 }
 
-// prepareAptosCLI makes the host aptos CLI available for Move package
-// compilation. Local CRE runners do not always have aptos installed, so fall
-// back to a thin wrapper that runs the CLI from the existing Aptos container
-// image with the current working directory bind-mounted.
-func prepareAptosCLI(ctx context.Context, containerName string) (func(), error) {
-	if _, err := aptosLookPath("aptos"); err == nil {
-		return func() {}, nil
-	}
-
-	containerName = strings.TrimSpace(containerName)
-	if containerName == "" {
-		return nil, pkgerrors.New("aptos CLI not found on PATH and no Aptos container is available for fallback")
-	}
-
-	image, err := aptosContainerImage(ctx, containerName)
-	if err != nil {
-		return nil, err
-	}
-
-	wrapperDir, err := os.MkdirTemp("", "aptos-cli-wrapper-*")
-	if err != nil {
-		return nil, fmt.Errorf("create Aptos CLI wrapper directory: %w", err)
-	}
-
-	wrapperPath := filepath.Join(wrapperDir, "aptos")
-	script := fmt.Sprintf(`#!/bin/sh
-set -eu
-pwd_path="$(pwd -P)"
-exec docker run --rm \
-  --user "$(id -u):$(id -g)" \
-  -v "$pwd_path:$pwd_path" \
-  -w "$pwd_path" \
-  --entrypoint aptos \
-  %q "$@"
-`, image)
-	if err := os.WriteFile(wrapperPath, []byte(script), 0o600); err != nil {
-		_ = os.RemoveAll(wrapperDir)
-		return nil, fmt.Errorf("write Aptos CLI wrapper script: %w", err)
-	}
-	if err := os.Chmod(wrapperPath, 0o700); err != nil {
-		_ = os.RemoveAll(wrapperDir)
-		return nil, fmt.Errorf("mark Aptos CLI wrapper script executable: %w", err)
-	}
-
-	oldPath := os.Getenv("PATH")
-	if oldPath == "" {
-		if err := os.Setenv("PATH", wrapperDir); err != nil {
-			_ = os.RemoveAll(wrapperDir)
-			return nil, fmt.Errorf("prepend Aptos CLI wrapper to PATH: %w", err)
-		}
-	} else {
-		if err := os.Setenv("PATH", wrapperDir+string(os.PathListSeparator)+oldPath); err != nil {
-			_ = os.RemoveAll(wrapperDir)
-			return nil, fmt.Errorf("prepend Aptos CLI wrapper to PATH: %w", err)
-		}
-	}
-
-	return func() {
-		_ = os.Setenv("PATH", oldPath)
-		_ = os.RemoveAll(wrapperDir)
-	}, nil
-}
-
-// PrepareAptosCLI ensures the aptos CLI is available for local smoke tests and
-// setup phases that compile Move packages on the host.
-func PrepareAptosCLI(ctx context.Context, containerName string) (func(), error) {
-	return prepareAptosCLI(ctx, containerName)
-}
-
-func aptosContainerImageFromDocker(ctx context.Context, containerName string) (string, error) {
-	out, err := osexec.CommandContext(ctx, "docker", "inspect", "--format", "{{.Config.Image}}", containerName).CombinedOutput()
-	if err != nil {
-		return "", fmt.Errorf("inspect Aptos container image for %q: %w (%s)", containerName, err, strings.TrimSpace(string(out)))
-	}
-
-	image := strings.TrimSpace(string(out))
-	if image == "" {
-		return "", fmt.Errorf("inspect Aptos container image for %q: empty image reference", containerName)
-	}
-
-	return image, nil
-}
-
 // addForwarderToDataStore seals a new datastore snapshot with the Aptos
 // forwarder address so later setup phases can reuse it without redeploying.
 func addForwarderToDataStore(creEnv *cre.Environment, chainSelector uint64, address string) error {

system-tests/lib/cre/features/aptos/aptos_test.go

@@ -1,12 +1,8 @@
 package aptos
 
 import (
-	"context"
 	"encoding/hex"
 	"math/big"
-	"os"
-	"path/filepath"
-	"strings"
 	"testing"
 	"time"
 
@@ -245,87 +241,3 @@ func TestResolveMethodConfigSettings_InvalidTransmissionSchedule(t *testing.T) {
 	})
 	require.Error(t, err)
 }
-
-func TestPrepareAptosCLI_UsesHostBinaryWhenAvailable(t *testing.T) {
-	t.Setenv("PATH", "/usr/bin")
-
-	originalLookPath := aptosLookPath
-	originalContainerImage := aptosContainerImage
-	aptosLookPath = func(file string) (string, error) {
-		require.Equal(t, "aptos", file)
-		return "/usr/bin/aptos", nil
-	}
-	aptosContainerImage = func(context.Context, string) (string, error) {
-		t.Fatal("container fallback should not be used when host aptos exists")
-		return "", nil
-	}
-	t.Cleanup(func() {
-		aptosLookPath = originalLookPath
-		aptosContainerImage = originalContainerImage
-	})
-
-	restore, err := prepareAptosCLI(context.Background(), "aptos-node")
-	require.NoError(t, err)
-	require.Equal(t, "/usr/bin", os.Getenv("PATH"))
-
-	restore()
-	require.Equal(t, "/usr/bin", os.Getenv("PATH"))
-}
-
-func TestPrepareAptosCLI_BuildsContainerWrapperWhenHostBinaryMissing(t *testing.T) {
-	t.Setenv("PATH", "/usr/bin")
-
-	originalLookPath := aptosLookPath
-	originalContainerImage := aptosContainerImage
-	aptosLookPath = func(file string) (string, error) {
-		require.Equal(t, "aptos", file)
-		return "", os.ErrNotExist
-	}
-	aptosContainerImage = func(ctx context.Context, containerName string) (string, error) {
-		require.Equal(t, "aptos-node", containerName)
-		return "ghcr.io/example/aptos:latest", nil
-	}
-	t.Cleanup(func() {
-		aptosLookPath = originalLookPath
-		aptosContainerImage = originalContainerImage
-	})
-
-	restore, err := prepareAptosCLI(context.Background(), "aptos-node")
-	require.NoError(t, err)
-	t.Cleanup(restore)
-
-	pathParts := strings.Split(os.Getenv("PATH"), string(os.PathListSeparator))
-	require.Len(t, pathParts, 2)
-	require.Equal(t, "/usr/bin", pathParts[1])
-
-	wrapperPath := filepath.Join(pathParts[0], "aptos")
-	content, err := os.ReadFile(wrapperPath)
-	require.NoError(t, err)
-	require.Contains(t, string(content), `--entrypoint aptos \`)
-	require.Contains(t, string(content), `"ghcr.io/example/aptos:latest" "$@"`)
-
-	restore()
-	require.Equal(t, "/usr/bin", os.Getenv("PATH"))
-	_, err = os.Stat(wrapperPath)
-	require.ErrorIs(t, err, os.ErrNotExist)
-}
-
-func TestPrepareAptosCLI_RequiresContainerWhenHostBinaryMissing(t *testing.T) {
-	originalLookPath := aptosLookPath
-	originalContainerImage := aptosContainerImage
-	aptosLookPath = func(string) (string, error) {
-		return "", os.ErrNotExist
-	}
-	aptosContainerImage = func(context.Context, string) (string, error) {
-		t.Fatal("container image lookup should not be used without a container name")
-		return "", nil
-	}
-	t.Cleanup(func() {
-		aptosLookPath = originalLookPath
-		aptosContainerImage = originalContainerImage
-	})
-
-	restore, err := prepareAptosCLI(context.Background(), "")
-	require.Nil(t, restore)
-	require.ErrorContains(t, err, "aptos CLI not found on PATH")
-}

system-tests/tests/smoke/cre/v2_aptos_capability_test.go

@@ -578,10 +578,6 @@ func deployAptosDataFeedsReceiverForWrite(
 	require.NoError(t, err, "failed to parse primary forwarder address")
 
 	owner := deployer.AccountAddress()
-	restoreAptosCLI, err := aptosfeature.PrepareAptosCLI(t.Context(), containerName)
-	require.NoError(t, err, "failed to prepare Aptos CLI for local package deploys")
-	t.Cleanup(restoreAptosCLI)
-
 	secondaryAddress, secondaryTx, _, err := aptosplatformsecondary.DeployToObject(deployer, client, owner)
 	require.NoError(t, err, "failed to deploy Aptos secondary platform package")
 	require.NoError(t, aptosfeature.WaitForTransactionSuccess(client, secondaryTx.Hash, "platform_secondary deployment"))