Merge pull request #18 from frantjc/use-github-api

Use GitHub api

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set path
         run: echo $RUNNER_TEMP >> $GITHUB_PATH
       - name: Run forge use remote
-        run: forge use frantjc/forge/testdata/actions/docker@main
+        run: forge use frantjc/forge/testdata/actions/docker@${{ github.sha }}
       - name: Run forge use local
         run: forge use ./testdata/actions/node
       - name: Run forge use dockerfile

command/prune.go

@@ -16,7 +16,7 @@ func NewPrune() *cobra.Command {
 		SilenceErrors: true,
 		SilenceUsage:  true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return os.RemoveAll(hostfs.ActionsCache)
+			return os.RemoveAll(hostfs.CacheHome)
 		},
 	}
 

command/use.go

@@ -42,6 +42,7 @@ func NewUse() *cobra.Command {
 				if err != nil {
 					globalContext = githubactions.NewGlobalContextFromEnv()
 				}
+				globalContext.StepsContext[id] = &githubactions.StepContext{}
 
 				if verbosity, _ := strconv.Atoi(cmd.Flag("verbose").Value.String()); verbosity > 0 {
 					globalContext.SecretsContext[githubactions.SecretActionsStepDebug] = githubactions.SecretDebugValue
@@ -64,7 +65,9 @@ func NewUse() *cobra.Command {
 
 				if outputs {
 					defer func() {
-						_ = json.NewEncoder(cmd.OutOrStdout()).Encode(globalContext.StepsContext[id].Outputs)
+						if outputs := globalContext.StepsContext[id].Outputs; len(outputs) > 0 {
+							_ = json.NewEncoder(cmd.OutOrStdout()).Encode(outputs)
+						}
 					}()
 				}
 

forgeactions/env_files.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	"github.com/frantjc/forge"
-	"github.com/frantjc/forge/envconv"
 	"github.com/frantjc/forge/githubactions"
 	"golang.org/x/exp/maps"
 )
@@ -18,7 +17,10 @@ func SetGlobalContextFromEnvFiles(ctx context.Context, globalContext *githubacti
 }
 
 func (m *Mapping) SetGlobalContextFromEnvFiles(ctx context.Context, globalContext *githubactions.GlobalContext, step string, container forge.Container) error {
-	_ = forge.LoggerFrom(ctx)
+	var (
+		_    = forge.LoggerFrom(ctx)
+		errs []error
+	)
 	globalContext = m.ConfigureGlobalContext(globalContext)
 
 	rc, err := container.CopyFrom(ctx, m.GitHubPath)
@@ -39,25 +41,26 @@ func (m *Mapping) SetGlobalContextFromEnvFiles(ctx context.Context, globalContex
 		//nolint:gocritic
 		switch header.Typeflag {
 		case tar.TypeReg:
-
 			switch {
 			case strings.HasSuffix(m.GitHubOutputPath, header.Name):
-				outputs, err := envconv.MapFromReader(io.LimitReader(r, header.Size))
+				outputs, err := githubactions.ParseEnvFile(r)
 				if err != nil {
-					return err
+					errs = append(errs, err)
+					continue
 				}
 
-				if _, ok := globalContext.StepsContext[step]; !ok {
+				if stepContext, ok := globalContext.StepsContext[step]; !ok || stepContext.Outputs == nil {
 					globalContext.StepsContext[step] = &githubactions.StepContext{
 						Outputs: outputs,
 					}
 				} else {
 					maps.Copy(globalContext.StepsContext[step].Outputs, outputs)
 				}
 			case strings.HasSuffix(m.GitHubStatePath, header.Name):
-				outputs, err := envconv.MapFromReader(io.LimitReader(r, header.Size))
+				outputs, err := githubactions.ParseEnvFile(r)
 				if err != nil {
-					return err
+					errs = append(errs, err)
+					continue
 				}
 
 				for k, v := range outputs {
@@ -67,5 +70,5 @@ func (m *Mapping) SetGlobalContextFromEnvFiles(ctx context.Context, globalContex
 		}
 	}
 
-	return rc.Close()
+	return errors.Join(append(errs, rc.Close())...)
 }

forgeactions/mapping.go

@@ -1,13 +1,13 @@
 package forgeactions
 
 type Mapping struct {
-	ActionPath       string `json:"action_path,omitempty"`
-	Workspace        string `json:"workspace,omitempty"`
-	RunnerToolCache  string `json:"runner_tool_cache,omitempty"`
-	RunnerTemp       string `json:"runner_temp,omitempty"`
-	GitHubPath       string `json:"git_hub_path,omitempty"`
-	GitHubPathPath   string `json:"git_hub_path_path,omitempty"`
-	GitHubEnvPath    string `json:"git_hub_env_path,omitempty"`
-	GitHubOutputPath string `json:"git_hub_output_path,omitempty"`
-	GitHubStatePath  string `json:"git_hub_state_path,omitempty"`
+	ActionPath       string
+	Workspace        string
+	RunnerToolCache  string
+	RunnerTemp       string
+	GitHubPath       string
+	GitHubPathPath   string
+	GitHubEnvPath    string
+	GitHubOutputPath string
+	GitHubStatePath  string
 }

forgeactions/workflow_command_streams.go

@@ -32,6 +32,8 @@ func (w *WorkflowCommandWriter) Callback(wc *githubactions.WorkflowCommand) []by
 			w.GlobalContext.StepsContext[w.ID] = &githubactions.StepContext{
 				Outputs: map[string]string{},
 			}
+		} else if w.GlobalContext.StepsContext[w.ID].Outputs == nil {
+			w.GlobalContext.StepsContext[w.ID].Outputs = make(map[string]string)
 		}
 
 		w.GlobalContext.StepsContext[w.ID].Outputs[wc.GetName()] = wc.Value

forgeconcourse/mapping.go

@@ -1,5 +1,5 @@
 package forgeconcourse
 
 type Mapping struct {
-	RootPath string `json:"root_path,omitempty"`
+	RootPath string
 }