From 601fc2ce4fa888cdd0cc33c41f6eee7ca39f585c Mon Sep 17 00:00:00 2001
From: Matthew Heon <mheon@redhat.com>
Date: Thu, 16 May 2019 14:35:49 -0400
Subject: Revert "Add VarlinkCall.RequiresUpgrade() type and method"
This reverts commit bd3154fcf6a48b37cfde5d9b1226900cd863c0d9.
Commit in question may be breaking upstream CI.
Signed-off-by: Matthew Heon <mheon@redhat.com>
---
pkg/varlinkapi/attach.go | 16 +++++++---------
pkg/varlinkapi/config.go | 4 ----
pkg/varlinkapi/transfers.go | 35 ++++++++++++++++-------------------
pkg/varlinkapi/util.go | 15 ---------------
4 files changed, 23 insertions(+), 47 deletions(-)
(limited to 'pkg')
diff --git a/pkg/varlinkapi/attach.go b/pkg/varlinkapi/attach.go
index f292bbbf8..2234899a5 100644
--- a/pkg/varlinkapi/attach.go
+++ b/pkg/varlinkapi/attach.go
@@ -45,24 +45,22 @@ func (i *LibpodAPI) Attach(call iopodman.VarlinkCall, name string, detachKeys st
var finalErr error
resize := make(chan remotecommand.TerminalSize)
errChan := make(chan error)
- varlink := VarlinkCall{&call}
- if err := varlink.RequiresUpgrade(); err != nil {
- return varlink.ReplyErrorOccurred(err.Error())
+ if !call.WantsUpgrade() {
+ return call.ReplyErrorOccurred("client must use upgraded connection to attach")
}
-
ctr, err := i.Runtime.LookupContainer(name)
if err != nil {
- return varlink.ReplyErrorOccurred(err.Error())
+ return call.ReplyErrorOccurred(err.Error())
}
state, err := ctr.State()
if err != nil {
- return varlink.ReplyErrorOccurred(err.Error())
+ return call.ReplyErrorOccurred(err.Error())
}
if !start && state != libpod.ContainerStateRunning {
- return varlink.ReplyErrorOccurred("container must be running to attach")
+ return call.ReplyErrorOccurred("container must be running to attach")
}
-
+ call.Reply(nil)
reader, writer, _, pw, streams := setupStreams(call)
go func() {
@@ -83,7 +81,7 @@ func (i *LibpodAPI) Attach(call iopodman.VarlinkCall, name string, detachKeys st
quitWriter := virtwriter.NewVirtWriteCloser(writer, virtwriter.Quit)
_, err = quitWriter.Write([]byte("HANG-UP"))
// TODO error handling is not quite right here yet
- return varlink.Writer.Flush()
+ return call.Writer.Flush()
}
func attach(ctr *libpod.Container, streams *libpod.AttachStreams, detachKeys string, resize chan remotecommand.TerminalSize, errChan chan error) error {
diff --git a/pkg/varlinkapi/config.go b/pkg/varlinkapi/config.go
index 9952c2be1..e75170547 100644
--- a/pkg/varlinkapi/config.go
+++ b/pkg/varlinkapi/config.go
@@ -21,7 +21,3 @@ func New(cli *cliconfig.PodmanCommand, runtime *libpod.Runtime) *iopodman.Varlin
lp := LibpodAPI{Cli: cli.Command, Runtime: runtime}
return iopodman.VarlinkNew(&lp)
}
-
-type VarlinkCall struct {
- *iopodman.VarlinkCall
-}
diff --git a/pkg/varlinkapi/transfers.go b/pkg/varlinkapi/transfers.go
index 7b38ec5e6..96f76bcdc 100644
--- a/pkg/varlinkapi/transfers.go
+++ b/pkg/varlinkapi/transfers.go
@@ -15,61 +15,58 @@ import (
// SendFile allows a client to send a file to the varlink server
func (i *LibpodAPI) SendFile(call iopodman.VarlinkCall, ftype string, length int64) error {
- varlink := VarlinkCall{&call}
- if err := varlink.RequiresUpgrade(); err != nil {
- return varlink.ReplyErrorOccurred(err.Error())
+ if !call.WantsUpgrade() {
+ return call.ReplyErrorOccurred("client must use upgraded connection to send files")
}
outputFile, err := ioutil.TempFile("", "varlink_send")
if err != nil {
- return varlink.ReplyErrorOccurred(err.Error())
+ return call.ReplyErrorOccurred(err.Error())
}
defer outputFile.Close()
- if err = varlink.ReplySendFile(outputFile.Name()); err != nil {
- return varlink.ReplyErrorOccurred(err.Error())
+ if err = call.ReplySendFile(outputFile.Name()); err != nil {
+ return call.ReplyErrorOccurred(err.Error())
}
writer := bufio.NewWriter(outputFile)
defer writer.Flush()
- reader := varlink.Call.Reader
+ reader := call.Call.Reader
if _, err := io.CopyN(writer, reader, length); err != nil {
return err
}
logrus.Debugf("successfully received %s", outputFile.Name())
// Send an ACK to the client
- varlink.Call.Writer.WriteString(fmt.Sprintf("%s:", outputFile.Name()))
- varlink.Call.Writer.Flush()
+ call.Call.Writer.WriteString(fmt.Sprintf("%s:", outputFile.Name()))
+ call.Call.Writer.Flush()
return nil
}
// ReceiveFile allows the varlink server to send a file to a client
func (i *LibpodAPI) ReceiveFile(call iopodman.VarlinkCall, filepath string, delete bool) error {
- varlink := VarlinkCall{&call}
- if err := varlink.RequiresUpgrade(); err != nil {
- return varlink.ReplyErrorOccurred(err.Error())
+ if !call.WantsUpgrade() {
+ return call.ReplyErrorOccurred("client must use upgraded connection to send files")
}
-
fs, err := os.Open(filepath)
if err != nil {
- return varlink.ReplyErrorOccurred(err.Error())
+ return call.ReplyErrorOccurred(err.Error())
}
fileInfo, err := fs.Stat()
if err != nil {
- return varlink.ReplyErrorOccurred(err.Error())
+ return call.ReplyErrorOccurred(err.Error())
}
// Send the file length down to client
// Varlink connection upraded
- if err = varlink.ReplyReceiveFile(fileInfo.Size()); err != nil {
- return varlink.ReplyErrorOccurred(err.Error())
+ if err = call.ReplyReceiveFile(fileInfo.Size()); err != nil {
+ return call.ReplyErrorOccurred(err.Error())
}
reader := bufio.NewReader(fs)
- _, err = reader.WriteTo(varlink.Writer)
+ _, err = reader.WriteTo(call.Writer)
if err != nil {
return err
}
@@ -78,5 +75,5 @@ func (i *LibpodAPI) ReceiveFile(call iopodman.VarlinkCall, filepath string, dele
return err
}
}
- return varlink.Writer.Flush()
+ return call.Writer.Flush()
}
diff --git a/pkg/varlinkapi/util.go b/pkg/varlinkapi/util.go
index a9f1e20a1..8716c963a 100644
--- a/pkg/varlinkapi/util.go
+++ b/pkg/varlinkapi/util.go
@@ -13,11 +13,6 @@ import (
"github.com/containers/libpod/cmd/podman/varlink"
"github.com/containers/libpod/libpod"
"github.com/containers/storage/pkg/archive"
- "github.com/pkg/errors"
-)
-
-var (
- ErrUpgradedConnectionRequired = errors.New("peer must use upgraded connection for operation")
)
// getContext returns a non-nil, empty context
@@ -200,13 +195,3 @@ func makePsOpts(inOpts iopodman.PsOpts) shared.PsOptions {
Sync: derefBool(inOpts.Sync),
}
}
-
-// RequiresUpgrade tests if varlink connection has been marked for upgrade.
-func (v *VarlinkCall) RequiresUpgrade() error {
- if v.WantsUpgrade() {
- // A nil is sent to the peer as required by the varlink protocol.
- return v.Reply(nil)
- } else {
- return ErrUpgradedConnectionRequired
- }
-}
--
cgit v1.2.3-54-g00ecf