From f62a356515e387b0bbcf1f08b4831d139c2039b7 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Wed, 18 Nov 2020 16:12:33 -0500
Subject: Remove varlink support from Podman

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

(limited to 'pkg/domain/infra/abi')

diff --git a/pkg/domain/infra/abi/system_novalink.go b/pkg/domain/infra/abi/system_novalink.go
deleted file mode 100644
index 3518e9db6..000000000
--- a/pkg/domain/infra/abi/system_novalink.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !varlink
-
-package abi
-
-import (
-	"context"
-
-	"github.com/containers/podman/v2/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
deleted file mode 100644
index ead84fc84..000000000
--- a/pkg/domain/infra/abi/system_varlink.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// +build varlink
-
-package abi
-
-import (
-	"context"
-
-	"github.com/containers/podman/v2/pkg/domain/entities"
-	iopodman "github.com/containers/podman/v2/pkg/varlink"
-	iopodmanAPI "github.com/containers/podman/v2/pkg/varlinkapi"
-	"github.com/containers/podman/v2/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.String(),
-		"https://github.com/containers/podman",
-	)
-	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 --time 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