fix: add own test container context

fix: update test eirctl tasks
feat: add a fallback to the chromium browser but prefer own chrome
fix: remove process killer func
+semver: feature
+semver: FEATURE

Author: dnitsch

cmd/clear.go

@@ -20,6 +20,9 @@ func newClearCmd(r *Root) {
 	cmd := &cobra.Command{
 		Use:   "clear-cache <flags>",
 		Short: "Clears any stored credentials in the OS secret store",
+		Long: `Clears any stored credentials in the OS secret store
+
+NB: Occassionally you may encounter a hanging chromium processes if not using own browser binary, you should kill all the instances of the chromium PIDs`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			user, err := user.Current()
 			if err != nil {

eirctl.yaml

@@ -4,10 +4,9 @@ import:
 contexts:
   unit:test:
     container:
-      name: docker.io/golang:1-trixie
-      container_args:
-        - $PWD/.cache:/root/.cache
-      shell: bash
+      name: docker.io/dnitsch/aws-cli-auth-ci:0.2.0
+      entrypoint: /usr/bin/env
+      shell: sh
       shell_args:
         - -c
     envfile:
@@ -24,59 +23,21 @@ pipelines:
 tasks:
   unit:test:
     context: unit:test
-    description: Unit test runner needs a bit of extra care in this case to ensure we have all the dependencies
+    description: |
+      Unit test runner needs a bit of extra care in this case to ensure we have all the dependencies
     command: |
-      apt-get update -y
-      apt-get install -y ca-certificates \
-        fonts-liberation \
-        libasound2 \
-        libatk-bridge2.0-0 \
-        libatk1.0-0 \
-        libc6 \
-        libcairo2 \
-        libcups2 \
-        libdbus-1-3 \
-        libexpat1 \
-        libfontconfig1 \
-        libgbm1 \
-        libgcc1 \
-        libglib2.0-0 \
-        libgtk-3-0 \
-        libnspr4 \
-        libnss3 \
-        libpango-1.0-0 \
-        libpangocairo-1.0-0 \
-        libstdc++6 \
-        libx11-6 \
-        libx11-xcb1 \
-        libxcb1 \
-        libxcomposite1 \
-        libxcursor1 \
-        libxdamage1 \
-        libxext6 \
-        libxfixes3 \
-        libxi6 \
-        libxrandr2 \
-        libxrender1 \
-        libxss1 \
-        libxtst6 \
-        lsb-release \
-        wget \
-        xdg-utils
-      mkdir -p .coverage
-      export GOPATH=$PWD/.deps
-      go test $(go list ./... | grep -v /local/) -v -coverpkg=./... -race -mod=readonly -timeout=1m -shuffle=on -buildvcs=false -coverprofile=.coverage/out -count=1 -run=$GO_TEST_RUN_ARGS | tee .coverage/test.out
-      cat .coverage/test.out | go-junit-report > .coverage/report-junit.xml
-      gocov convert .coverage/out | gocov-xml > .coverage/report-cobertura.xml
+      export GOPATH=$PWD/.deps GOBIN=$PWD/.deps/bin
+      CGO_ENABLED=1 go test $(go list ./... | grep -v /local/) -v -coverpkg=./... -race -mod=readonly -timeout=1m -shuffle=on -buildvcs=false -coverprofile=.coverage/out -count=1 -run=$GO_TEST_RUN_ARGS | tee .coverage/test.out
+      cat .coverage/test.out | .deps/bin/go-junit-report > .coverage/report-junit.xml
+      .deps/bin/gocov convert .coverage/out | .deps/bin/gocov-xml > .coverage/report-cobertura.xml
 
   unit:test:prereqs:
     description: Installs coverage and junit tools
     context: unit:test
     command: 
       - |
         mkdir -p .coverage
-        export GOPATH=$PWD/.deps
-        go install github.com/jstemmer/[email protected] && \
-        go install github.com/axw/gocov/[email protected] && \
+        export GOPATH=$PWD/.deps GOBIN=$PWD/.deps/bin
+        go install github.com/jstemmer/[email protected]
+        go install github.com/axw/gocov/[email protected]
         go install github.com/AlekSi/[email protected]
-    # -run ^Test_Saml_timeout$ github.com/DevLabFoundry/aws-cli-auth/cmd

go.mod

@@ -1,6 +1,6 @@
 module github.com/DevLabFoundry/aws-cli-auth
 
-go 1.24.6
+go 1.25.1
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.38.1

hack/Dockerfile

@@ -0,0 +1,9 @@
+FROM docker.io/zenika/alpine-chrome:124 as chrome
+
+USER root
+
+RUN wget https://dl.google.com/go/go1.25.1.linux-arm64.tar.gz && \
+    tar -C /usr/local -xzf go1.25.1.linux-arm64.tar.gz
+ENV PATH=$PATH:/usr/local/go/bin
+
+RUN apk add build-base

internal/cmdutils/cmdutils.go

@@ -53,7 +53,7 @@ func GetCredsWebUI(ctx context.Context, svc credentialexchange.AuthSamlApi, secr
 // upon successful auth from the IDP.
 // Once credentials are captured they are used in the role assumption process.
 func refreshAwsSsoCreds(ctx context.Context, conf credentialexchange.CredentialConfig, secretStore SecretStorageImpl, svc credentialexchange.AuthSamlApi, webConfig *web.WebConfig) error {
-	webBrowser := web.New(webConfig)
+	webBrowser := web.New(ctx, webConfig)
 	capturedCreds, err := webBrowser.GetSSOCredentials(conf)
 	if err != nil {
 		return err
@@ -65,7 +65,7 @@ func refreshAwsSsoCreds(ctx context.Context, conf credentialexchange.CredentialC
 
 func refreshSamlCreds(ctx context.Context, conf credentialexchange.CredentialConfig, secretStore SecretStorageImpl, svc credentialexchange.AuthSamlApi, webConfig *web.WebConfig) error {
 
-	webBrowser := web.New(webConfig)
+	webBrowser := web.New(ctx, webConfig)
 
 	duration := conf.Duration
 

internal/web/web.go

@@ -1,6 +1,7 @@
 package web
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net/http"
@@ -12,7 +13,6 @@ import (
 	"github.com/DevLabFoundry/aws-cli-auth/internal/credentialexchange"
 	"github.com/go-rod/rod"
 	"github.com/go-rod/rod/lib/launcher"
-	ps "github.com/mitchellh/go-ps"
 )
 
 var (
@@ -23,10 +23,11 @@ var (
 type WebConfig struct {
 	datadir string
 	// timeout value in seconds
-	timeout   int32
-	headless  bool
-	leakless  bool
-	noSandbox bool
+	timeout        int32
+	headless       bool
+	leakless       bool
+	noSandbox      bool
+	preferChromium bool
 }
 
 func NewWebConf(datadir string) *WebConfig {
@@ -59,20 +60,32 @@ type Web struct {
 }
 
 // New returns an initialised instance of Web struct
-func New(conf *WebConfig) *Web {
+func New(ctx context.Context, conf *WebConfig) *Web {
+	var l *launcher.Launcher
 
-	l := launcher.New().
-		Devtools(false).
+	if path, found := launcher.LookPath(); (found && path != "") && !conf.preferChromium {
+		l = launcher.New().Bin(path)
+	} else {
+		l = launcher.New()
+	}
+
+	// common set up
+	l.Devtools(false).
 		Headless(conf.headless).
 		UserDataDir(conf.datadir).
 		NoSandbox(conf.noSandbox).
 		Leakless(conf.leakless)
 
 	url := l.MustLaunch()
 
-	browser := rod.New().
+	browser, cancel := rod.New().
 		ControlURL(url).
-		MustConnect().NoDefaultDevice()
+		MustConnect().NoDefaultDevice().WithCancel()
+	go func() {
+		<-ctx.Done()
+		fmt.Println("cancelled")
+		cancel()
+	}()
 
 	return &Web{
 		conf:     conf,
@@ -199,10 +212,6 @@ func (web *Web) MustClose() {
 
 func (web *Web) ForceKill(datadir string) error {
 	errs := []error{}
-
-	if err := checkRodProcess(); err != nil {
-		errs = append(errs, err)
-	}
 	// once processes have been killed
 	// we can remove the datadir
 	if err := os.RemoveAll(datadir); err != nil {
@@ -214,28 +223,3 @@ func (web *Web) ForceKill(datadir string) error {
 	}
 	return nil
 }
-
-// checkRodProcess gets a list running process
-// kills any hanging rod browser process from any previous improprely closed sessions
-func checkRodProcess() error {
-	pids := make([]int, 0)
-	ps, err := ps.Processes()
-	if err != nil {
-		return err
-	}
-	for _, v := range ps {
-		// grab all chromium processes
-		// on windows the name will be reported as `chrome.exe`
-		if strings.Contains(strings.ToLower(v.Executable()), "chrom") {
-			fmt.Fprintf(os.Stderr, "Found process: (%d) and its parent (%d)\n", v.Pid(), v.PPid())
-			pids = append(pids, v.Pid())
-		}
-	}
-	for _, pid := range pids {
-		if proc, _ := os.FindProcess(pid); proc != nil {
-			fmt.Fprintf(os.Stderr, "Process to be killed as part of clean up: %d\n", pid)
-			proc.Kill()
-		}
-	}
-	return nil
-}

internal/web/web_test.go

@@ -1,6 +1,7 @@
 package web_test
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net/http"
@@ -82,7 +83,6 @@ SAMLResponse=dsicisud99u2ubf92e9euhre&RelayState=
 }
 
 func Test_WebUI_with_succesful_saml(t *testing.T) {
-	t.Parallel()
 
 	ts := httptest.NewServer(mockIdpHandler(t))
 	defer ts.Close()
@@ -96,7 +96,7 @@ func Test_WebUI_with_succesful_saml(t *testing.T) {
 		os.RemoveAll(tempDir)
 	}()
 
-	webUi := web.New(web.NewWebConf(tempDir).WithHeadless().WithTimeout(10).WithNoSandbox())
+	webUi := web.New(context.TODO(), web.NewWebConf(tempDir).WithHeadless().WithTimeout(10).WithNoSandbox())
 	saml, err := webUi.GetSamlLogin(conf)
 	if err != nil {
 		t.Errorf("expected err to be <nil> got: %s", err)
@@ -107,7 +107,6 @@ func Test_WebUI_with_succesful_saml(t *testing.T) {
 }
 
 func Test_WebUI_timeout_and_return_error(t *testing.T) {
-	t.Parallel()
 
 	ts := httptest.NewServer(mockIdpHandler(t))
 	defer ts.Close()
@@ -121,7 +120,7 @@ func Test_WebUI_timeout_and_return_error(t *testing.T) {
 		os.RemoveAll(tempDir)
 	}()
 
-	webUi := web.New(web.NewWebConf(tempDir).WithHeadless().WithTimeout(0).WithNoSandbox())
+	webUi := web.New(context.TODO(), web.NewWebConf(tempDir).WithHeadless().WithTimeout(0).WithNoSandbox())
 	_, err := webUi.GetSamlLogin(conf)
 
 	if !errors.Is(err, web.ErrTimedOut) {
@@ -130,8 +129,6 @@ func Test_WebUI_timeout_and_return_error(t *testing.T) {
 }
 
 func Test_ClearCache(t *testing.T) {
-	// t.Parallel()
-
 	ts := httptest.NewServer(mockIdpHandler(t))
 	defer ts.Close()
 	tempDir, _ := os.MkdirTemp(os.TempDir(), "web-clear-saml-tester")
@@ -140,7 +137,7 @@ func Test_ClearCache(t *testing.T) {
 		os.RemoveAll(tempDir)
 	}()
 
-	webUi := web.New(web.NewWebConf(tempDir).WithHeadless().WithTimeout(20).WithNoSandbox())
+	webUi := web.New(context.TODO(), web.NewWebConf(tempDir).WithHeadless().WithTimeout(20).WithNoSandbox())
 
 	if err := webUi.ForceKill(tempDir); err != nil {
 		t.Errorf("expected <nil>, got: %s", err)
@@ -178,7 +175,6 @@ func mockSsoHandler(t *testing.T) http.Handler {
 }
 
 func Test_WebUI_with_succesful_ssoLogin(t *testing.T) {
-	t.Parallel()
 
 	ts := httptest.NewServer(mockSsoHandler(t))
 	defer ts.Close()
@@ -197,7 +193,7 @@ func Test_WebUI_with_succesful_ssoLogin(t *testing.T) {
 		os.RemoveAll(tempDir)
 	}()
 
-	webUi := web.New(web.NewWebConf(tempDir).WithHeadless().WithTimeout(10).WithNoSandbox())
+	webUi := web.New(context.TODO(), web.NewWebConf(tempDir).WithHeadless().WithTimeout(10).WithNoSandbox())
 	creds, err := webUi.GetSSOCredentials(conf)
 	if err != nil {
 		t.Errorf("expected err to be <nil> got: %s", err)
@@ -208,7 +204,6 @@ func Test_WebUI_with_succesful_ssoLogin(t *testing.T) {
 }
 
 func Test_WebUI_with_timeout_ssoLogin(t *testing.T) {
-	t.Parallel()
 
 	ts := httptest.NewServer(mockSsoHandler(t))
 	defer ts.Close()
@@ -227,7 +222,7 @@ func Test_WebUI_with_timeout_ssoLogin(t *testing.T) {
 		os.RemoveAll(tempDir)
 	}()
 
-	webUi := web.New(web.NewWebConf(tempDir).WithHeadless().WithTimeout(0).WithNoSandbox())
+	webUi := web.New(context.TODO(), web.NewWebConf(tempDir).WithHeadless().WithTimeout(0).WithNoSandbox())
 	_, err := webUi.GetSSOCredentials(conf)
 
 	if !errors.Is(err, web.ErrTimedOut) {