Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions cmd/cmd_debug.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package cmd

import (
"os"

"github.com/actionforge/actrun-cli/sessions"
"github.com/actionforge/actrun-cli/utils"
"github.com/spf13/cobra"
)

var (
flagDebugSessionToken string
flagDebugConfigFile string
)

var cmdDebug = &cobra.Command{
Use: "debug",
Short: "Connect to the web app with a session token",
Run: cmdDebugRun,
}

func init() {
cmdRoot.AddCommand(cmdDebug)

cmdDebug.Flags().StringVar(&flagDebugSessionToken, "session-token", envOr("ACT_SESSION_TOKEN", ""), "Session token from your browser (env: ACT_SESSION_TOKEN)")
cmdDebug.Flags().StringVar(&flagDebugConfigFile, "config-file", "", "The config file to use")
}

func cmdDebugRun(cmd *cobra.Command, args []string) {
err := sessions.RunSessionMode(flagDebugConfigFile, "", flagDebugSessionToken, "flag")
if err != nil {
utils.LogErr.Print(err.Error())
os.Exit(1)
}
}
54 changes: 47 additions & 7 deletions cmd/cmd_root.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func cmdRootRun(cmd *cobra.Command, args []string) {
return
}

// if we still have no graph file, go to Session Mode
// if we still have no graph file, show the interactive menu or go to Session Mode
if finalGraphFile == "" || finalCreateDebugSession {
trapfn := func() {
if mousetrap.StartedByExplorer() {
Expand All @@ -189,14 +189,54 @@ func cmdRootRun(cmd *cobra.Command, args []string) {
}
}

err := sessions.RunSessionMode(finalConfigFile, finalGraphFile, finalSessionToken, finalConfigValueSource)
if err != nil {
utils.LogErr.Print(err.Error())
// If a session token was explicitly provided or debug session requested,
// go straight to session mode. Otherwise, show the interactive menu.
if finalSessionToken != "" || finalCreateDebugSession {
err := sessions.RunSessionMode(finalConfigFile, finalGraphFile, finalSessionToken, finalConfigValueSource)
if err != nil {
utils.LogErr.Print(err.Error())
trapfn()
os.Exit(1)
}
trapfn()
os.Exit(1)
return
}

sessions.PrintWelcomeMessage()

if !sessions.IsInteractive() {
sessions.PrintUsageHints()
return
}

choice := sessions.PromptMainMenu()

switch choice {
case 1: // Run a graph
graphFile := sessions.PromptGraphFile()
if graphFile == "" {
return
}
finalGraphFile = graphFile
// Fall through to graph execution below.

case 2: // Connect to web debug session (session token)
err := sessions.RunSessionMode(finalConfigFile, "", "", "")
if err != nil {
utils.LogErr.Print(err.Error())
trapfn()
os.Exit(1)
}
trapfn()
return

case 3: // Connect as agent
fmt.Println("Agent mode is not yet implemented.")
return

default:
return
}
trapfn()
return
}

var err error
Expand Down
10 changes: 8 additions & 2 deletions github/server/cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,10 @@ func TestCachePrefixMatch(t *testing.T) {
}

// Download and verify it's one of the two entries (the newest)
getResp, _ := http.Get(dlResp.SignedDownloadURL)
getResp, err := http.Get(dlResp.SignedDownloadURL)
if err != nil {
t.Fatal(err)
}
defer getResp.Body.Close()
data, _ := io.ReadAll(getResp.Body)
if string(data) != "node-modules-bbb" {
Expand Down Expand Up @@ -204,7 +207,10 @@ func TestCacheOverwrite(t *testing.T) {
"metadata": map[string]string{"scope": scope},
})
dlResp := decodeResponse[GetCacheEntryDownloadURLResponse](t, resp)
getResp, _ := http.Get(dlResp.SignedDownloadURL)
getResp, err := http.Get(dlResp.SignedDownloadURL)
if err != nil {
t.Fatal(err)
}
defer getResp.Body.Close()
data, _ := io.ReadAll(getResp.Body)
if string(data) != "new-data" {
Expand Down
10 changes: 8 additions & 2 deletions github/server/legacy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,10 @@ func TestLegacyChunkedUpload(t *testing.T) {

dlReq, _ := http.NewRequest("GET", contentLocation, nil)
dlReq.Header.Set("Authorization", "Bearer test-token")
dlResp, _ := http.DefaultClient.Do(dlReq)
dlResp, err := http.DefaultClient.Do(dlReq)
if err != nil {
t.Fatal(err)
}
defer dlResp.Body.Close()
data, _ := io.ReadAll(dlResp.Body)
expected := append(chunk1, chunk2...)
Expand Down Expand Up @@ -249,7 +252,10 @@ func TestLegacyGzipRoundtrip(t *testing.T) {
client := &http.Client{Transport: transport}
dlReq, _ := http.NewRequest("GET", filesResult.Value[0]["contentLocation"].(string), nil)
dlReq.Header.Set("Authorization", "Bearer test-token")
dlResp, _ := client.Do(dlReq)
dlResp, err := client.Do(dlReq)
if err != nil {
t.Fatal(err)
}
defer dlResp.Body.Close()

if dlResp.Header.Get("Content-Encoding") != "gzip" {
Expand Down
10 changes: 8 additions & 2 deletions github/server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,10 @@ func TestChunkedUpload(t *testing.T) {
"name": "chunked-artifact",
})
urlResp := decodeResponse[GetSignedArtifactURLResponse](t, resp)
dlResp, _ := http.Get(urlResp.SignedURL)
dlResp, err := http.Get(urlResp.SignedURL)
if err != nil {
t.Fatal(err)
}
defer dlResp.Body.Close()
data, _ := io.ReadAll(dlResp.Body)
expected := append(append(chunk1, chunk2...), chunk3...)
Expand Down Expand Up @@ -639,7 +642,10 @@ func TestMigrateArtifact(t *testing.T) {
"name": "migrated-artifact",
})
urlResp := decodeResponse[GetSignedArtifactURLResponse](t, resp)
dlResp, _ := http.Get(urlResp.SignedURL)
dlResp, err := http.Get(urlResp.SignedURL)
if err != nil {
t.Fatal(err)
}
defer dlResp.Body.Close()
data, _ := io.ReadAll(dlResp.Body)
if !bytes.Equal(data, blobContent) {
Expand Down
26 changes: 24 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ require (
github.com/aws/aws-sdk-go-v2/credentials v1.19.6
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.18
github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3
github.com/charmbracelet/huh v1.0.0
github.com/charmbracelet/lipgloss v1.1.0
github.com/containerd/errdefs v1.0.0
github.com/docker/docker v28.5.2+incompatible
github.com/fatih/color v1.18.0
Expand All @@ -21,6 +23,7 @@ require (
github.com/inconshreveable/mousetrap v1.1.0
github.com/joho/godotenv v1.5.1
github.com/mark3labs/mcp-go v0.44.0
github.com/mattn/go-isatty v0.0.20
github.com/perforce/p4go v1.20252.2872356
github.com/pkg/errors v0.9.1
github.com/rhysd/actionlint v1.7.10
Expand Down Expand Up @@ -54,6 +57,7 @@ require (
dario.cat/mergo v1.0.2 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.3.0 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect
Expand All @@ -69,11 +73,20 @@ require (
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 // indirect
github.com/aws/smithy-go v1.24.2 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/bahlo/generic-list-go v0.2.0 // indirect
github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/buger/jsonparser v1.1.2 // indirect
github.com/catppuccin/go v0.3.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7 // indirect
github.com/charmbracelet/bubbletea v1.3.6 // indirect
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
github.com/charmbracelet/x/ansi v0.9.3 // indirect
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
github.com/charmbracelet/x/term v0.2.1 // indirect
github.com/clipperhouse/stringish v0.1.1 // indirect
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
github.com/cloudflare/circl v1.6.3 // indirect
Expand All @@ -84,7 +97,9 @@ require (
github.com/dlclark/regexp2 v1.11.5 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/gage-technologies/mistral-go v1.1.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
Expand Down Expand Up @@ -112,21 +127,27 @@ require (
github.com/kevinburke/ssh_config v1.4.0 // indirect
github.com/klauspost/compress v1.18.2 // indirect
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.19 // indirect
github.com/mattn/go-shellwords v1.0.12 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/sys/atomicwriter v0.1.0 // indirect
github.com/montanaflynn/stats v0.7.1 // indirect
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/termenv v0.16.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/pjbgf/sha1cd v0.5.0 // indirect
github.com/pkoukk/tiktoken-go v0.1.8 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sergi/go-diff v1.4.0 // indirect
Expand All @@ -137,6 +158,7 @@ require (
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.2.0 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
Expand Down
Loading
Loading