go.mod: github.com/Microsoft/hcsshim v0.8.16
full diff: https://github.com/microsoft/hcsshim/compare/v0.8.15...v0.8.16 also updating github.com/Microsoft/hcsshim/test to current master Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
		
							
								
								
									
										26
									
								
								vendor/github.com/Microsoft/hcsshim/errors.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										26
									
								
								vendor/github.com/Microsoft/hcsshim/errors.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -83,7 +83,6 @@ type NetworkNotFoundError = hns.NetworkNotFoundError
 | 
			
		||||
type ProcessError struct {
 | 
			
		||||
	Process   *process
 | 
			
		||||
	Operation string
 | 
			
		||||
	ExtraInfo string
 | 
			
		||||
	Err       error
 | 
			
		||||
	Events    []hcs.ErrorEvent
 | 
			
		||||
}
 | 
			
		||||
@@ -92,7 +91,6 @@ type ProcessError struct {
 | 
			
		||||
type ContainerError struct {
 | 
			
		||||
	Container *container
 | 
			
		||||
	Operation string
 | 
			
		||||
	ExtraInfo string
 | 
			
		||||
	Err       error
 | 
			
		||||
	Events    []hcs.ErrorEvent
 | 
			
		||||
}
 | 
			
		||||
@@ -125,22 +123,9 @@ func (e *ContainerError) Error() string {
 | 
			
		||||
		s += "\n" + ev.String()
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if e.ExtraInfo != "" {
 | 
			
		||||
		s += " extra info: " + e.ExtraInfo
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return s
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func makeContainerError(container *container, operation string, extraInfo string, err error) error {
 | 
			
		||||
	// Don't double wrap errors
 | 
			
		||||
	if _, ok := err.(*ContainerError); ok {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
	containerError := &ContainerError{Container: container, Operation: operation, ExtraInfo: extraInfo, Err: err}
 | 
			
		||||
	return containerError
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (e *ProcessError) Error() string {
 | 
			
		||||
	if e == nil {
 | 
			
		||||
		return "<nil>"
 | 
			
		||||
@@ -171,15 +156,6 @@ func (e *ProcessError) Error() string {
 | 
			
		||||
	return s
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func makeProcessError(process *process, operation string, extraInfo string, err error) error {
 | 
			
		||||
	// Don't double wrap errors
 | 
			
		||||
	if _, ok := err.(*ProcessError); ok {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
	processError := &ProcessError{Process: process, Operation: operation, ExtraInfo: extraInfo, Err: err}
 | 
			
		||||
	return processError
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// IsNotExist checks if an error is caused by the Container or Process not existing.
 | 
			
		||||
// Note: Currently, ErrElementNotFound can mean that a Process has either
 | 
			
		||||
// already exited, or does not exist. Both IsAlreadyStopped and IsNotExist
 | 
			
		||||
@@ -256,7 +232,7 @@ func getInnerError(err error) error {
 | 
			
		||||
 | 
			
		||||
func convertSystemError(err error, c *container) error {
 | 
			
		||||
	if serr, ok := err.(*hcs.SystemError); ok {
 | 
			
		||||
		return &ContainerError{Container: c, Operation: serr.Op, ExtraInfo: serr.Extra, Err: serr.Err, Events: serr.Events}
 | 
			
		||||
		return &ContainerError{Container: c, Operation: serr.Op, Err: serr.Err, Events: serr.Events}
 | 
			
		||||
	}
 | 
			
		||||
	return err
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user