Merge pull request #5592 from jwhonce/wip/globalflags

Combine GlobalFlags and EngineFlags into EngineOptions

1 files changed, 10 insertions, 10 deletions

diff --git a/pkg/domain/infra/runtime_abi.go b/pkg/domain/infra/runtime_abi.go
index 31f832423..f11026571 100644
--- a/pkg/domain/infra/runtime_abi.go
+++ b/pkg/domain/infra/runtime_abi.go
@@ -12,27 +12,27 @@ import (
 )
 
 // NewContainerEngine factory provides a libpod runtime for container-related operations
-func NewContainerEngine(opts entities.EngineOptions) (entities.ContainerEngine, error) {
-	switch opts.EngineMode {
+func NewContainerEngine(facts entities.EngineOptions) (entities.ContainerEngine, error) {
+	switch facts.EngineMode {
 	case entities.ABIMode:
-		r, err := NewLibpodRuntime(opts.FlagSet, opts.Flags)
+		r, err := NewLibpodRuntime(facts.FlagSet, facts)
 		return r, err
 	case entities.TunnelMode:
-		ctx, err := bindings.NewConnection(context.Background(), opts.Uri, opts.Identities...)
+		ctx, err := bindings.NewConnection(context.Background(), facts.Uri, facts.Identities...)
 		return &tunnel.ContainerEngine{ClientCxt: ctx}, err
 	}
-	return nil, fmt.Errorf("runtime mode '%v' is not supported", opts.EngineMode)
+	return nil, fmt.Errorf("runtime mode '%v' is not supported", facts.EngineMode)
 }
 
 // NewContainerEngine factory provides a libpod runtime for image-related operations
-func NewImageEngine(opts entities.EngineOptions) (entities.ImageEngine, error) {
-	switch opts.EngineMode {
+func NewImageEngine(facts entities.EngineOptions) (entities.ImageEngine, error) {
+	switch facts.EngineMode {
 	case entities.ABIMode:
-		r, err := NewLibpodImageRuntime(opts.FlagSet, opts.Flags)
+		r, err := NewLibpodImageRuntime(facts.FlagSet, facts)
 		return r, err
 	case entities.TunnelMode:
-		ctx, err := bindings.NewConnection(context.Background(), opts.Uri, opts.Identities...)
+		ctx, err := bindings.NewConnection(context.Background(), facts.Uri, facts.Identities...)
 		return &tunnel.ImageEngine{ClientCxt: ctx}, err
 	}
-	return nil, fmt.Errorf("runtime mode '%v' is not supported", opts.EngineMode)
+	return nil, fmt.Errorf("runtime mode '%v' is not supported", facts.EngineMode)
 }