@@ -17,6 +17,7 @@ limitations under the License.
1717package main
1818
1919import (
20+ "context"
2021 "encoding/json"
2122 "errors"
2223 "flag"
@@ -32,7 +33,6 @@ import (
3233 "github.com/tektoncd/pipeline/cmd/entrypoint/subcommands"
3334 featureFlags "github.com/tektoncd/pipeline/pkg/apis/config"
3435 "github.com/tektoncd/pipeline/pkg/apis/pipeline"
35- v1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
3636 "github.com/tektoncd/pipeline/pkg/credentials"
3737 "github.com/tektoncd/pipeline/pkg/credentials/dockercreds"
3838 "github.com/tektoncd/pipeline/pkg/credentials/gitcreds"
@@ -50,12 +50,10 @@ var (
5050 terminationPath = flag .String ("termination_path" , "/tekton/termination" , "If specified, file to write upon termination" )
5151 results = flag .String ("results" , "" , "If specified, list of file names that might contain task results" )
5252 stepResults = flag .String ("step_results" , "" , "step results if specified" )
53- whenExpressions = flag .String ("when_expressions" , "" , "when expressions if specified" )
5453 timeout = flag .Duration ("timeout" , time .Duration (0 ), "If specified, sets timeout for step" )
5554 stdoutPath = flag .String ("stdout_path" , "" , "If specified, file to copy stdout to" )
5655 stderrPath = flag .String ("stderr_path" , "" , "If specified, file to copy stderr to" )
5756 breakpointOnFailure = flag .Bool ("breakpoint_on_failure" , false , "If specified, expect steps to not skip on failure" )
58- debugBeforeStep = flag .Bool ("debug_before_step" , false , "If specified, wait for a debugger to attach before executing the step" )
5957 onError = flag .String ("on_error" , "" , "Set to \" continue\" to ignore an error and continue when a container terminates with a non-zero exit code." +
6058 " Set to \" stopAndFail\" to declare a failure with a step error and stop executing the rest of the steps." )
6159 stepMetadataDir = flag .String ("step_metadata_dir" , "" , "If specified, create directory to store the step metadata e.g. /tekton/steps/<step-name>/" )
6664
6765const (
6866 defaultWaitPollingInterval = time .Second
67+ breakpointExitSuffix = ".breakpointexit"
6968)
7069
70+ func checkForBreakpointOnFailure (e entrypoint.Entrypointer , breakpointExitPostFile string ) {
71+ if e .BreakpointOnFailure {
72+ if waitErr := e .Waiter .Wait (context .Background (), breakpointExitPostFile , false , false ); waitErr != nil {
73+ log .Println ("error occurred while waiting for " + breakpointExitPostFile + " : " + waitErr .Error ())
74+ }
75+ // get exitcode from .breakpointexit
76+ exitCode , readErr := e .BreakpointExitCode (breakpointExitPostFile )
77+ // if readErr exists, the exitcode with default to 0 as we would like
78+ // to encourage to continue running the next steps in the taskRun
79+ if readErr != nil {
80+ log .Println ("error occurred while reading breakpoint exit code : " + readErr .Error ())
81+ }
82+ os .Exit (exitCode )
83+ }
84+ }
85+
7186func main () {
7287 // Add credential flags originally introduced with our legacy credentials helper
7388 // image (creds-init).
@@ -123,12 +138,6 @@ func main() {
123138 log .Fatal (err )
124139 }
125140 }
126- var when v1.StepWhenExpressions
127- if len (* whenExpressions ) > 0 {
128- if err := json .Unmarshal ([]byte (* whenExpressions ), & when ); err != nil {
129- log .Fatal (err )
130- }
131- }
132141
133142 var spireWorkloadAPI spire.EntrypointerAPIClient
134143 if enableSpire != nil && * enableSpire && socketPath != nil && * socketPath != "" {
@@ -153,9 +162,7 @@ func main() {
153162 Results : strings .Split (* results , "," ),
154163 StepResults : strings .Split (* stepResults , "," ),
155164 Timeout : timeout ,
156- StepWhenExpressions : when ,
157165 BreakpointOnFailure : * breakpointOnFailure ,
158- DebugBeforeStep : * debugBeforeStep ,
159166 OnError : * onError ,
160167 StepMetadataDir : * stepMetadataDir ,
161168 SpireWorkloadAPI : spireWorkloadAPI ,
@@ -169,10 +176,8 @@ func main() {
169176 }
170177
171178 if err := e .Go (); err != nil {
179+ breakpointExitPostFile := e .PostFile + breakpointExitSuffix
172180 switch t := err .(type ) { //nolint:errorlint // checking for multiple types with errors.As is ugly.
173- case entrypoint.DebugBeforeStepError :
174- log .Println ("Skipping execute step script because before step breakpoint fail-continue" )
175- os .Exit (1 )
176181 case entrypoint.SkipError :
177182 log .Print ("Skipping step because a previous step failed" )
178183 os .Exit (1 )
@@ -196,7 +201,7 @@ func main() {
196201 // in both cases has an ExitStatus() method with the
197202 // same signature.
198203 if status , ok := t .Sys ().(syscall.WaitStatus ); ok {
199- e . CheckForBreakpointOnFailure ( )
204+ checkForBreakpointOnFailure ( e , breakpointExitPostFile )
200205 // ignore a step error i.e. do not exit if a container terminates with a non-zero exit code when onError is set to "continue"
201206 if e .OnError != entrypoint .ContinueOnError {
202207 os .Exit (status .ExitStatus ())
@@ -207,7 +212,7 @@ func main() {
207212 log .Fatalf ("Error executing command (ExitError): %v" , err )
208213 }
209214 default :
210- e . CheckForBreakpointOnFailure ( )
215+ checkForBreakpointOnFailure ( e , breakpointExitPostFile )
211216 log .Fatalf ("Error executing command: %v" , err )
212217 }
213218 }
0 commit comments