From 752680366c5896da6587d892ba719eb35dd1a859 Mon Sep 17 00:00:00 2001
From: Christian Stewart <christian@paral.in>
Date: Wed, 23 Mar 2022 00:21:48 -0700
Subject: play: kube: use in-memory kubefile and remove tempfile

The PlayKube and PlayKubeDown commands accepted a "path" argument to a YAML file
to play. This requires the caller to write the YAML to a file path. The downside
of this is apparent in the HTTP handlers which have to use a temporary file on
disk to store the YAML file.

The file is opened & used as the body of the HTTP request. It's possible to
instead pass a io.Reader and use a fully in-memory request body.

Add backwards-compatible changes to bindings to allow passing either a filepath
or a io.Reader body.

Refactor the podman bindings to use a io.Reader instead of a filepath.

Simplify the HTTP handlers for PlayKube by removing the now unneeded tempfile.

[NO NEW TESTS NEEDED]

Signed-off-by: Christian Stewart <christian@paral.in>
---
 pkg/api/handlers/libpod/play.go | 53 ++++-------------------------------------
 1 file changed, 4 insertions(+), 49 deletions(-)

(limited to 'pkg/api/handlers/libpod/play.go')

diff --git a/pkg/api/handlers/libpod/play.go b/pkg/api/handlers/libpod/play.go
index aed889298..ca9ada761 100644
--- a/pkg/api/handlers/libpod/play.go
+++ b/pkg/api/handlers/libpod/play.go
@@ -1,11 +1,8 @@
 package libpod
 
 import (
-	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
-	"os"
 
 	"github.com/containers/image/v5/types"
 	"github.com/containers/podman/v4/libpod"
@@ -16,7 +13,6 @@ import (
 	"github.com/containers/podman/v4/pkg/domain/infra/abi"
 	"github.com/gorilla/schema"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 )
 
 func PlayKube(w http.ResponseWriter, r *http.Request) {
@@ -62,28 +58,6 @@ func PlayKube(w http.ResponseWriter, r *http.Request) {
 		staticMACs = append(staticMACs, mac)
 	}
 
-	// Fetch the K8s YAML file from the body, and copy it to a temp file.
-	tmpfile, err := ioutil.TempFile("", "libpod-play-kube.yml")
-	if err != nil {
-		utils.Error(w, http.StatusInternalServerError, errors.Wrap(err, "unable to create tempfile"))
-		return
-	}
-	defer func() {
-		if err := os.Remove(tmpfile.Name()); err != nil {
-			logrus.Warn(err)
-		}
-	}()
-	if _, err := io.Copy(tmpfile, r.Body); err != nil && err != io.EOF {
-		if err := tmpfile.Close(); err != nil {
-			logrus.Warn(err)
-		}
-		utils.Error(w, http.StatusInternalServerError, errors.Wrap(err, "unable to write archive to temporary file"))
-		return
-	}
-	if err := tmpfile.Close(); err != nil {
-		utils.Error(w, http.StatusInternalServerError, errors.Wrap(err, "error closing temporary file"))
-		return
-	}
 	authConf, authfile, err := auth.GetCredentials(r)
 	if err != nil {
 		utils.Error(w, http.StatusBadRequest, err)
@@ -116,7 +90,8 @@ func PlayKube(w http.ResponseWriter, r *http.Request) {
 	if _, found := r.URL.Query()["start"]; found {
 		options.Start = types.NewOptionalBool(query.Start)
 	}
-	report, err := containerEngine.PlayKube(r.Context(), tmpfile.Name(), options)
+	report, err := containerEngine.PlayKube(r.Context(), r.Body, options)
+	_ = r.Body.Close()
 	if err != nil {
 		utils.Error(w, http.StatusInternalServerError, errors.Wrap(err, "error playing YAML file"))
 		return
@@ -126,30 +101,10 @@ func PlayKube(w http.ResponseWriter, r *http.Request) {
 
 func PlayKubeDown(w http.ResponseWriter, r *http.Request) {
 	runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime)
-	tmpfile, err := ioutil.TempFile("", "libpod-play-kube.yml")
-	if err != nil {
-		utils.Error(w, http.StatusInternalServerError, errors.Wrap(err, "unable to create tempfile"))
-		return
-	}
-	defer func() {
-		if err := os.Remove(tmpfile.Name()); err != nil {
-			logrus.Warn(err)
-		}
-	}()
-	if _, err := io.Copy(tmpfile, r.Body); err != nil && err != io.EOF {
-		if err := tmpfile.Close(); err != nil {
-			logrus.Warn(err)
-		}
-		utils.Error(w, http.StatusInternalServerError, errors.Wrap(err, "unable to write archive to temporary file"))
-		return
-	}
-	if err := tmpfile.Close(); err != nil {
-		utils.Error(w, http.StatusInternalServerError, errors.Wrap(err, "error closing temporary file"))
-		return
-	}
 	containerEngine := abi.ContainerEngine{Libpod: runtime}
 	options := new(entities.PlayKubeDownOptions)
-	report, err := containerEngine.PlayKubeDown(r.Context(), tmpfile.Name(), *options)
+	report, err := containerEngine.PlayKubeDown(r.Context(), r.Body, *options)
+	_ = r.Body.Close()
 	if err != nil {
 		utils.Error(w, http.StatusInternalServerError, errors.Wrap(err, "error tearing down YAML file"))
 		return
-- 
cgit v1.2.3-54-g00ecf