From 35567e706b5009ead40c0eaef7c5c1199cd8d448 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Fri, 22 May 2020 06:16:03 -0400
Subject: Attempt to turn on additional build tests

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 pkg/domain/infra/abi/system.go          | 38 -------------------------
 pkg/domain/infra/abi/system_novalink.go | 14 ++++++++++
 pkg/domain/infra/abi/system_varlink.go  | 49 +++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 38 deletions(-)
 create mode 100644 pkg/domain/infra/abi/system_novalink.go
 create mode 100644 pkg/domain/infra/abi/system_varlink.go

(limited to 'pkg/domain')

diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go
index af2ec5f7b..52dfaba7d 100644
--- a/pkg/domain/infra/abi/system.go
+++ b/pkg/domain/infra/abi/system.go
@@ -16,56 +16,18 @@ import (
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/rootless"
 	"github.com/containers/libpod/pkg/util"
-	iopodman "github.com/containers/libpod/pkg/varlink"
-	iopodmanAPI "github.com/containers/libpod/pkg/varlinkapi"
 	"github.com/containers/libpod/utils"
-	"github.com/containers/libpod/version"
 	"github.com/docker/distribution/reference"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/varlink/go/varlink"
 )
 
 func (ic *ContainerEngine) Info(ctx context.Context) (*define.Info, error) {
 	return ic.Libpod.Info()
 }
 
-func (ic *ContainerEngine) VarlinkService(_ context.Context, opts entities.ServiceOptions) error {
-	var varlinkInterfaces = []*iopodman.VarlinkInterface{
-		iopodmanAPI.New(opts.Command, ic.Libpod),
-	}
-
-	service, err := varlink.NewService(
-		"Atomic",
-		"podman",
-		version.Version,
-		"https://github.com/containers/libpod",
-	)
-	if err != nil {
-		return errors.Wrapf(err, "unable to create new varlink service")
-	}
-
-	for _, i := range varlinkInterfaces {
-		if err := service.RegisterInterface(i); err != nil {
-			return errors.Errorf("unable to register varlink interface %v", i)
-		}
-	}
-
-	// Run the varlink server at the given address
-	if err = service.Listen(opts.URI, opts.Timeout); err != nil {
-		switch err.(type) {
-		case varlink.ServiceTimeoutError:
-			logrus.Infof("varlink service expired (use --timeout to increase session time beyond %s ms, 0 means never timeout)", opts.Timeout.String())
-			return nil
-		default:
-			return errors.Wrapf(err, "unable to start varlink service")
-		}
-	}
-	return nil
-}
-
 func (ic *ContainerEngine) SetupRootless(_ context.Context, cmd *cobra.Command) error {
 	// do it only after podman has already re-execed and running with uid==0.
 	if os.Geteuid() == 0 {
diff --git a/pkg/domain/infra/abi/system_novalink.go b/pkg/domain/infra/abi/system_novalink.go
new file mode 100644
index 000000000..a71b0170a
--- /dev/null
+++ b/pkg/domain/infra/abi/system_novalink.go
@@ -0,0 +1,14 @@
+// +build !varlink
+
+package abi
+
+import (
+	"context"
+
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/pkg/errors"
+)
+
+func (ic *ContainerEngine) VarlinkService(_ context.Context, opts entities.ServiceOptions) error {
+	return errors.Errorf("varlink is not supported")
+}
diff --git a/pkg/domain/infra/abi/system_varlink.go b/pkg/domain/infra/abi/system_varlink.go
new file mode 100644
index 000000000..c0144babe
--- /dev/null
+++ b/pkg/domain/infra/abi/system_varlink.go
@@ -0,0 +1,49 @@
+// +build varlink
+
+package abi
+
+import (
+	"context"
+
+	"github.com/containers/libpod/pkg/domain/entities"
+	iopodman "github.com/containers/libpod/pkg/varlink"
+	iopodmanAPI "github.com/containers/libpod/pkg/varlinkapi"
+	"github.com/containers/libpod/version"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"github.com/varlink/go/varlink"
+)
+
+func (ic *ContainerEngine) VarlinkService(_ context.Context, opts entities.ServiceOptions) error {
+	var varlinkInterfaces = []*iopodman.VarlinkInterface{
+		iopodmanAPI.New(opts.Command, ic.Libpod),
+	}
+
+	service, err := varlink.NewService(
+		"Atomic",
+		"podman",
+		version.Version,
+		"https://github.com/containers/libpod",
+	)
+	if err != nil {
+		return errors.Wrapf(err, "unable to create new varlink service")
+	}
+
+	for _, i := range varlinkInterfaces {
+		if err := service.RegisterInterface(i); err != nil {
+			return errors.Errorf("unable to register varlink interface %v", i)
+		}
+	}
+
+	// Run the varlink server at the given address
+	if err = service.Listen(opts.URI, opts.Timeout); err != nil {
+		switch err.(type) {
+		case varlink.ServiceTimeoutError:
+			logrus.Infof("varlink service expired (use --timeout to increase session time beyond %s ms, 0 means never timeout)", opts.Timeout.String())
+			return nil
+		default:
+			return errors.Wrapf(err, "unable to start varlink service")
+		}
+	}
+	return nil
+}
-- 
cgit v1.2.3-54-g00ecf