76038ad style(executor): error strings and unused code for the linter · ermite-runner

M internal/executor/actions_docker.go +2 -2


@@ -88,7 +88,7 @@ func (j job) buildImage(s stepRun, tag, dockerfile, workDir string, cancel <-c
88	88		return err
89	89		}
90	90		if code != 0 {
91		-	return fmt.Errorf("Docker build failed with exit code %d", code)
	91	+	return ghErrorf("Docker build failed with exit code %d", code)
92	92		}
93	93		return nil
94	94		}

@@ -127,7 +127,7 @@ func (j job) runDocker(s stepRun, def actionDef, in inputSet, env *ordered,
127	127		}
128	128		if build != "" {
129	129		if _, err := os.Stat(build); err != nil {
130		-	return fail(fmt.Errorf("File not found: '%s'", build))
	130	+	return fail(ghErrorf("File not found: '%s'", build))
131	131		}
132	132		j.out(num, "##[group]Building docker image")
133	133		j.out(num, fmt.Sprintf("Dockerfile for action: '%s'.", build))


@@ -88,7 +88,7 @@ func (j job) buildImage(s stepRun, tag, dockerfile, workDir string, cancel <-c
88		return err	88		return err
89		}	89		}
90		if code != 0 {	90		if code != 0 {
91	-	return fmt.Errorf("Docker build failed with exit code %d", code)	91	+	return ghErrorf("Docker build failed with exit code %d", code)
92		}	92		}
93		return nil	93		return nil
94		}	94		}

@@ -127,7 +127,7 @@ func (j job) runDocker(s stepRun, def actionDef, in inputSet, env *ordered,
127		}	127		}
128		if build != "" {	128		if build != "" {
129		if _, err := os.Stat(build); err != nil {	129		if _, err := os.Stat(build); err != nil {
130	-	return fail(fmt.Errorf("File not found: '%s'", build))	130	+	return fail(ghErrorf("File not found: '%s'", build))
131		}	131		}
132		j.out(num, "##[group]Building docker image")	132		j.out(num, "##[group]Building docker image")
133		j.out(num, fmt.Sprintf("Dockerfile for action: '%s'.", build))	133		j.out(num, fmt.Sprintf("Dockerfile for action: '%s'.", build))

M internal/executor/actions_docker_cmd.go +1 -2


@@ -5,7 +5,6 @@ package executor
5	5		import (
6	6		"crypto/sha256"
7	7		"encoding/hex"
8		-	"fmt"
9	8		"os"
10	9		"os/exec"
11	10		"regexp"

@@ -188,7 +187,7 @@ func (j job) runDockerCmd(s stepRun, c dockerCmd, dir string, env []string, ca
188	187		}
189	188
190	189		// errCancelled is a docker command stopped by the cancellation of the step.
191		-	var errCancelled = fmt.Errorf("The operation was canceled.")
	190	+	var errCancelled = ghErrorf("The operation was canceled.")
192	191
193	192		func dirOrCwd(d string) string {
194	193		if st, err := os.Stat(d); err == nil && st.IsDir() {

 import (
 	"crypto/sha256"
 	"encoding/hex"
-	"fmt"
 	"os"
 	"os/exec"
 	"regexp"
 }
 // errCancelled is a docker command stopped by the cancellation of the step.
-var errCancelled = fmt.Errorf("The operation was canceled.")
+var errCancelled = ghErrorf("The operation was canceled.")
 func dirOrCwd(d string) string {
 	if st, err := os.Stat(d); err == nil && st.IsDir() {

M internal/executor/actions_download.go +2 -2


@@ -118,7 +118,7 @@ func (j *job) fetch(ctx context.Context, url, token, file string) error {
118	118		return errAccessDenied{url}
119	119		case resp.StatusCode < 200 \|\| resp.StatusCode > 299:
120	120		// HttpResponseMessage.EnsureSuccessStatusCode.
121		-	return fmt.Errorf("Response status code does not indicate success: %d (%s).", resp.StatusCode, http.StatusText(resp.StatusCode))
	121	+	return ghErrorf("Response status code does not indicate success: %d (%s).", resp.StatusCode, http.StatusText(resp.StatusCode))
122	122		}
123	123		f, err := os.OpenFile(file, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, 0o600)
124	124		if err != nil {

@@ -174,7 +174,7 @@ func (j *job) downloadAction(ctx context.Context, num int, ra ResolvedAction, na
174	174		err = extractTarball(af, staging, owner)
175	175		_ = af.Close()
176	176		if err != nil {
177		-	return fmt.Errorf("Can't extract the archive of action %s@%s: %w", name, ref, err)
	177	+	return ghErrorf("Can't extract the archive of action %s@%s: %v", name, ref, err)
178	178		}
179	179		ents, err := os.ReadDir(staging)
180	180		if err != nil {


@@ -118,7 +118,7 @@ func (j *job) fetch(ctx context.Context, url, token, file string) error {
118		return errAccessDenied{url}	118		return errAccessDenied{url}
119		case resp.StatusCode < 200 \|\| resp.StatusCode > 299:	119		case resp.StatusCode < 200 \|\| resp.StatusCode > 299:
120		// HttpResponseMessage.EnsureSuccessStatusCode.	120		// HttpResponseMessage.EnsureSuccessStatusCode.
121	-	return fmt.Errorf("Response status code does not indicate success: %d (%s).", resp.StatusCode, http.StatusText(resp.StatusCode))	121	+	return ghErrorf("Response status code does not indicate success: %d (%s).", resp.StatusCode, http.StatusText(resp.StatusCode))
122		}	122		}
123		f, err := os.OpenFile(file, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, 0o600)	123		f, err := os.OpenFile(file, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, 0o600)
124		if err != nil {	124		if err != nil {

@@ -174,7 +174,7 @@ func (j *job) downloadAction(ctx context.Context, num int, ra ResolvedAction, na
174		err = extractTarball(af, staging, owner)	174		err = extractTarball(af, staging, owner)
175		_ = af.Close()	175		_ = af.Close()
176		if err != nil {	176		if err != nil {
177	-	return fmt.Errorf("Can't extract the archive of action %s@%s: %w", name, ref, err)	177	+	return ghErrorf("Can't extract the archive of action %s@%s: %v", name, ref, err)
178		}	178		}
179		ents, err := os.ReadDir(staging)	179		ents, err := os.ReadDir(staging)
180		if err != nil {	180		if err != nil {

M internal/executor/actions_load.go +1 -1


@@ -74,7 +74,7 @@ func (j job) loadDef(num int, dir string) (actionDef, error) {
74	74		case action.RunsDocker:
75	75		d.image = act.Runs.Image
76	76		case action.RunsPlugin:
77		-	return nil, fmt.Errorf("Unsupported action type: Plugin")
	77	+	return nil, ghErrorf("Unsupported action type: Plugin")
78	78		}
79	79		return d, nil
80	80		}


@@ -74,7 +74,7 @@ func (j job) loadDef(num int, dir string) (actionDef, error) {
74		case action.RunsDocker:	74		case action.RunsDocker:
75		d.image = act.Runs.Image	75		d.image = act.Runs.Image
76		case action.RunsPlugin:	76		case action.RunsPlugin:
77	-	return nil, fmt.Errorf("Unsupported action type: Plugin")	77	+	return nil, ghErrorf("Unsupported action type: Plugin")
78		}	78		}
79		return d, nil	79		return d, nil
80		}	80		}

M internal/executor/actions_node.go +2 -2


@@ -164,11 +164,11 @@ func (j job) runNode(s stepRun, def actionDef, in inputSet, env *ordered, ca
164	164		}
165	165		fail := func(err error) stepResult { j.errorf(num, "%s", err.Error()); return resFailed }
166	166		if target == "" {
167		-	return fail(fmt.Errorf("Value cannot be null or empty. (Parameter 'target')"))
	167	+	return fail(ghErrorf("Value cannot be null or empty. (Parameter 'target')"))
168	168		}
169	169		script := filepath.Join(def.dir, filepath.FromSlash(target))
170	170		if st, err := os.Stat(script); err != nil \|\| st.IsDir() {
171		-	return fail(fmt.Errorf("File not found: '%s'", script))
	171	+	return fail(ghErrorf("File not found: '%s'", script))
172	172		}
173	173		j.mu.Lock()
174	174		wd := j.state.GitHub("workspace")


@@ -164,11 +164,11 @@ func (j job) runNode(s stepRun, def actionDef, in inputSet, env *ordered, ca
164		}	164		}
165		fail := func(err error) stepResult { j.errorf(num, "%s", err.Error()); return resFailed }	165		fail := func(err error) stepResult { j.errorf(num, "%s", err.Error()); return resFailed }
166		if target == "" {	166		if target == "" {
167	-	return fail(fmt.Errorf("Value cannot be null or empty. (Parameter 'target')"))	167	+	return fail(ghErrorf("Value cannot be null or empty. (Parameter 'target')"))
168		}	168		}
169		script := filepath.Join(def.dir, filepath.FromSlash(target))	169		script := filepath.Join(def.dir, filepath.FromSlash(target))
170		if st, err := os.Stat(script); err != nil \|\| st.IsDir() {	170		if st, err := os.Stat(script); err != nil \|\| st.IsDir() {
171	-	return fail(fmt.Errorf("File not found: '%s'", script))	171	+	return fail(ghErrorf("File not found: '%s'", script))
172		}	172		}
173		j.mu.Lock()	173		j.mu.Lock()
174		wd := j.state.GitHub("workspace")	174		wd := j.state.GitHub("workspace")

M internal/executor/actions_prepare.go +4 -5


@@ -4,7 +4,6 @@ package executor
4	4
5	5		import (
6	6		"context"
7		-	"fmt"
8	7		"strings"
9	8
10	9		"bnema.dev/ermite-actions/action"

@@ -59,7 +58,7 @@ func lookupKey(n *node) (string, error) {
59	58		// it runs.
60	59		func (j job) prepare(ctx context.Context, num int, nodes []node, depth int, parent *node) error {
61	60		if depth > compositeMaxDepth {
62		-	return fmt.Errorf("Composite action depth exceeded max depth %d", compositeMaxDepth)
	61	+	return ghErrorf("Composite action depth exceeded max depth %d", compositeMaxDepth)
63	62		}
64	63		st := j.actions
65	64		var repoNodes []*node

@@ -67,7 +66,7 @@ func (j job) prepare(ctx context.Context, num int, nodes []node, depth int, pa
67	66		switch n.uses.Kind {
68	67		case action.UsesDocker:
69	68		if n.uses.Image == "" {
70		-	return fmt.Errorf("Value cannot be null or empty. (Parameter 'Image')")
	69	+	return ghErrorf("Value cannot be null or empty. (Parameter 'Image')")
71	70		}
72	71		if _, ok := st.pullUsers[n.uses.Image]; !ok {
73	72		st.pullOrder = append(st.pullOrder, n.uses.Image)

@@ -94,7 +93,7 @@ func (j job) prepare(ctx context.Context, num int, nodes []node, depth int, pa
94	93		}
95	94		ra, ok := infos[key]
96	95		if !ok {
97		-	return fmt.Errorf("Missing download info for %s", key)
	96	+	return ghErrorf("Missing download info for %s", key)
98	97		}
99	98		dir := j.actionDirOfRepo(n)
100	99		// The directory of the archive is the one of the repository itself: the

@@ -180,7 +179,7 @@ func (j job) prepareRepositoryAction(ctx context.Context, num int, n node, dep
180	179		dir := j.actionDir(n)
181	180		def, err := j.loadDef(num, dir)
182	181		if err == errNoAction {
183		-	return fmt.Errorf("Can't find 'action.yml', 'action.yaml' or 'Dockerfile' for action '%s'.", refString(n.uses))
	182	+	return ghErrorf("Can't find 'action.yml', 'action.yaml' or 'Dockerfile' for action '%s'.", refString(n.uses))
184	183		}
185	184		if err != nil {
186	185		return err

 import (
 	"context"
-	"fmt"
 	"strings"
 	"bnema.dev/ermite-actions/action"
 // it runs.
 func (j *job) prepare(ctx context.Context, num int, nodes []*node, depth int, parent *node) error {
 	if depth > compositeMaxDepth {
-		return fmt.Errorf("Composite action depth exceeded max depth %d", compositeMaxDepth)
+		return ghErrorf("Composite action depth exceeded max depth %d", compositeMaxDepth)
 	}
 	st := j.actions
 	var repoNodes []*node
 		switch n.uses.Kind {
 		case action.UsesDocker:
 			if n.uses.Image == "" {
-				return fmt.Errorf("Value cannot be null or empty. (Parameter 'Image')")
+				return ghErrorf("Value cannot be null or empty. (Parameter 'Image')")
 			}
 			if _, ok := st.pullUsers[n.uses.Image]; !ok {
 				st.pullOrder = append(st.pullOrder, n.uses.Image)
 		}
 		ra, ok := infos[key]
 		if !ok {
-			return fmt.Errorf("Missing download info for %s", key)
+			return ghErrorf("Missing download info for %s", key)
 		}
 		dir := j.actionDirOfRepo(n)
 		// The directory of the archive is the one of the repository itself: the
 	dir := j.actionDir(n)
 	def, err := j.loadDef(num, dir)
 	if err == errNoAction {
-		return fmt.Errorf("Can't find 'action.yml', 'action.yaml' or 'Dockerfile' for action '%s'.", refString(n.uses))
+		return ghErrorf("Can't find 'action.yml', 'action.yaml' or 'Dockerfile' for action '%s'.", refString(n.uses))
 	}
 	if err != nil {
 		return err

M internal/executor/actions_run.go +3 -3


@@ -33,7 +33,7 @@ func (j job) definition(s stepRun) (*actionDef, error) {
33	33		dir := j.actionDir(n)
34	34		def, err := j.loadDef(s.num, dir)
35	35		if err == errNoAction {
36		-	return nil, fmt.Errorf("Can't find 'action.yml', 'action.yaml' or 'Dockerfile' under '%s'. Did you forget to run actions/checkout before running your local action?", filepath.Clean(dir))
	36	+	return nil, ghErrorf("Can't find 'action.yml', 'action.yaml' or 'Dockerfile' under '%s'. Did you forget to run actions/checkout before running your local action?", filepath.Clean(dir))
37	37		}
38	38		if err != nil {
39	39		return nil, err

@@ -42,7 +42,7 @@ func (j job) definition(s stepRun) (*actionDef, error) {
42	42		return def, nil
43	43		}
44	44		if n.def == nil {
45		-	return nil, fmt.Errorf("The action '%s' was not prepared", refString(n.uses))
	45	+	return nil, ghErrorf("The action '%s' was not prepared", refString(n.uses))
46	46		}
47	47		return n.def, nil
48	48		}

@@ -198,7 +198,7 @@ func (j job) runAction(s stepRun, cancel <-chan struct{}) stepResult {
198	198		case kindComposite:
199	199		return j.runComposite(s, def, in, env)
200	200		}
201		-	return fail(fmt.Errorf("Unsupported action type: %v", def.kind))
	201	+	return fail(ghErrorf("Unsupported action type: %v", def.kind))
202	202		}
203	203
204	204		// hasPostOf is HasPost of the loaded definition of the node.


@@ -33,7 +33,7 @@ func (j job) definition(s stepRun) (*actionDef, error) {
33		dir := j.actionDir(n)	33		dir := j.actionDir(n)
34		def, err := j.loadDef(s.num, dir)	34		def, err := j.loadDef(s.num, dir)
35		if err == errNoAction {	35		if err == errNoAction {
36	-	return nil, fmt.Errorf("Can't find 'action.yml', 'action.yaml' or 'Dockerfile' under '%s'. Did you forget to run actions/checkout before running your local action?", filepath.Clean(dir))	36	+	return nil, ghErrorf("Can't find 'action.yml', 'action.yaml' or 'Dockerfile' under '%s'. Did you forget to run actions/checkout before running your local action?", filepath.Clean(dir))
37		}	37		}
38		if err != nil {	38		if err != nil {
39		return nil, err	39		return nil, err

@@ -42,7 +42,7 @@ func (j job) definition(s stepRun) (*actionDef, error) {
42		return def, nil	42		return def, nil
43		}	43		}
44		if n.def == nil {	44		if n.def == nil {
45	-	return nil, fmt.Errorf("The action '%s' was not prepared", refString(n.uses))	45	+	return nil, ghErrorf("The action '%s' was not prepared", refString(n.uses))
46		}	46		}
47		return n.def, nil	47		return n.def, nil
48		}	48		}

@@ -198,7 +198,7 @@ func (j job) runAction(s stepRun, cancel <-chan struct{}) stepResult {
198		case kindComposite:	198		case kindComposite:
199		return j.runComposite(s, def, in, env)	199		return j.runComposite(s, def, in, env)
200		}	200		}
201	-	return fail(fmt.Errorf("Unsupported action type: %v", def.kind))	201	+	return fail(ghErrorf("Unsupported action type: %v", def.kind))
202		}	202		}
203			203
204		// hasPostOf is HasPost of the loaded definition of the node.	204		// hasPostOf is HasPost of the loaded definition of the node.

M internal/executor/actions_test.go +1 -1


@@ -374,7 +374,7 @@ runs:
374	374
375	375		func TestCompositePostOfInnerStepsRunsInOuterPost(t *testing.T) {
376	376		tree := files{
377		-	"c/action.yml": "name: c\nruns:\n using: composite\n steps:\n - uses: ./n1\n - uses: ./n2\n",
	377	+	"c/action.yml": "name: c\nruns:\n using: composite\n steps:\n - uses: ./n1\n - uses: ./n2\n",
378	378		"n1/action.yml": "name: n1\nruns:\n using: node20\n main: m.sh\n post: p.sh\n", "n1/m.sh": "echo main1\n", "n1/p.sh": "echo post1\n",
379	379		"n2/action.yml": "name: n2\nruns:\n using: node20\n main: m.sh\n post: p.sh\n", "n2/m.sh": "echo main2\n", "n2/p.sh": "echo post2\n",
380	380		}


@@ -374,7 +374,7 @@ runs:
374			374
375		func TestCompositePostOfInnerStepsRunsInOuterPost(t *testing.T) {	375		func TestCompositePostOfInnerStepsRunsInOuterPost(t *testing.T) {
376		tree := files{	376		tree := files{
377	-	"c/action.yml": "name: c\nruns:\n using: composite\n steps:\n - uses: ./n1\n - uses: ./n2\n",	377	+	"c/action.yml": "name: c\nruns:\n using: composite\n steps:\n - uses: ./n1\n - uses: ./n2\n",
378		"n1/action.yml": "name: n1\nruns:\n using: node20\n main: m.sh\n post: p.sh\n", "n1/m.sh": "echo main1\n", "n1/p.sh": "echo post1\n",	378		"n1/action.yml": "name: n1\nruns:\n using: node20\n main: m.sh\n post: p.sh\n", "n1/m.sh": "echo main1\n", "n1/p.sh": "echo post1\n",
379		"n2/action.yml": "name: n2\nruns:\n using: node20\n main: m.sh\n post: p.sh\n", "n2/m.sh": "echo main2\n", "n2/p.sh": "echo post2\n",	379		"n2/action.yml": "name: n2\nruns:\n using: node20\n main: m.sh\n post: p.sh\n", "n2/m.sh": "echo main2\n", "n2/p.sh": "echo post2\n",
380		}	380		}

M internal/executor/actions_types.go +0 -4


@@ -133,12 +133,8 @@ type node struct {
133	133		// postRegistered is Root.StepsWithPostRegistered / EmbeddedStepsWithPostRegistered.
134	134		postRegistered bool
135	135		postCond string
136		-	// preScope is the random steps context of the pre stage of a composite.
137		-	preScope string
138	136		}
139	137
140		-	func (n *node) isRun() bool { return n.st.Run != nil }
141		-
142	138		// setState keeps a value of the intra-action state: keys compare without case
143	139		// (the runner's dictionary is OrdinalIgnoreCase) and keep the first spelling.
144	140		func (n *node) setState(k, v string) {


@@ -133,12 +133,8 @@ type node struct {
133		// postRegistered is Root.StepsWithPostRegistered / EmbeddedStepsWithPostRegistered.	133	// postRegistered is Root.StepsWithPostRegistered / EmbeddedStepsWithPostRegistered.
134		postRegistered bool	134	postRegistered bool
135		postCond string	135	postCond string
136	-	// preScope is the random steps context of the pre stage of a composite.
137	-	preScope string
138		}	136	}
139			137
140	-	func (n *node) isRun() bool { return n.st.Run != nil }
141	-
142		// setState keeps a value of the intra-action state: keys compare without case	138	// setState keeps a value of the intra-action state: keys compare without case
143		// (the runner's dictionary is OrdinalIgnoreCase) and keep the first spelling.	139	// (the runner's dictionary is OrdinalIgnoreCase) and keep the first spelling.
144		func (n *node) setState(k, v string) {	140	func (n *node) setState(k, v string) {

M internal/executor/step.go +4 -14


@@ -37,26 +37,16 @@ type stepRun struct {
37	37		// fork for an embedded one.
38	38		fc *FileCommands
39	39		// actEnv, when set, is the environment of the process of an action step
40		-	// (env context, STATE_ and INPUT_); rawEnv replaces the whole environment
41		-	// of the process (docker, whose -e options read it).
42		-	actEnv, rawEnv *ordered
43		-	rawEnvList []string
44		-	quietExit bool
	40	+	// (env context, STATE_ and INPUT_); rawEnvList replaces the whole
	41	+	// environment of the process (docker, whose -e options read it).
	42	+	actEnv *ordered
	43	+	rawEnvList []string
45	44		// displayName is the name of the step in the log; def the action it runs.
46	45		displayName string
47	46		def *actionDef
48	47		nodeVersion string
49	48		}
50	49
51		-	// depth is the number of composite actions around the step.
52		-	func (s *stepRun) depth() int {
53		-	d := 0
54		-	for p := s.parent; p != nil; p = p.parent {
55		-	d++
56		-	}
57		-	return d
58		-	}
59		-
60	50		// procEnv is the environment of the process the step starts.
61	51		func (s *stepRun) procEnv() []string {
62	52		if s.rawEnvList != nil {

 	// fork for an embedded one.
 	fc *FileCommands
 	// actEnv, when set, is the environment of the process of an action step
-	// (env context, STATE_ and INPUT_); rawEnv replaces the whole environment
+	// (env context, STATE_ and INPUT_); rawEnvList replaces the whole
-	// of the process (docker, whose -e options read it).
+	// environment of the process (docker, whose -e options read it).
-	actEnv, rawEnv *ordered
+	actEnv     *ordered
-	rawEnvList     []string
+	rawEnvList []string
-	quietExit      bool
 	// displayName is the name of the step in the log; def the action it runs.
 	displayName string
 	def         *actionDef
 	nodeVersion string
 }
-// depth is the number of composite actions around the step.
-func (s *stepRun) depth() int {
-	d := 0
-	for p := s.parent; p != nil; p = p.parent {
-		d++
-	}
-	return d
-}
 // procEnv is the environment of the process the step starts.
 func (s *stepRun) procEnv() []string {
 	if s.rawEnvList != nil {