From d7d38f3687e7d262e9b76226d8abc114efbc0800 Mon Sep 17 00:00:00 2001
From: Alex K <8418476+fearful-symmetry@users.noreply.github.com>
Date: Wed, 4 Mar 2020 07:30:24 -0800
Subject: [PATCH] [Elastic Log Driver] magefile cleanup, fix bug on plugin
 uninstall (#16735)

* clean up magefile, quality of life issues

* remove commented out code

* cleanup
---
 x-pack/dockerlogbeat/magefile.go | 37 +++++++++++++-------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/x-pack/dockerlogbeat/magefile.go b/x-pack/dockerlogbeat/magefile.go
index 77863c1c4c6..f751440a1fd 100644
--- a/x-pack/dockerlogbeat/magefile.go
+++ b/x-pack/dockerlogbeat/magefile.go
@@ -62,11 +62,6 @@ func getPluginName() (string, error) {
 
 // createContainer builds the plugin and creates the container that will later become the rootfs used by the plugin
 func createContainer(ctx context.Context, cli *client.Client) error {
-	goVersion, err := mage.GoVersion()
-	if err != nil {
-		return errors.Wrap(err, "error determining go version")
-	}
-
 	dockerLogBeatDir, err := os.Getwd()
 	if err != nil {
 		return errors.Wrap(err, "error getting work dir")
@@ -96,7 +91,6 @@ func createContainer(ctx context.Context, cli *client.Client) error {
 	defer buildContext.Close()
 
 	buildOpts := types.ImageBuildOptions{
-		BuildArgs:  map[string]*string{"versionString": &goVersion},
 		Tags:       []string{rootImageName},
 		Dockerfile: "Dockerfile",
 	}
@@ -209,11 +203,6 @@ func cleanDockerArtifacts(ctx context.Context, containerID string, cli *client.C
 
 // Uninstall removes working objects and containers
 func Uninstall(ctx context.Context) error {
-	name, err := getPluginName()
-	if err != nil {
-		return err
-	}
-
 	cli, err := client.NewClientWithOpts(client.FromEnv)
 	if err != nil {
 		return errors.Wrap(err, "Error creating docker client")
@@ -224,21 +213,25 @@ func Uninstall(ctx context.Context) error {
 	if err != nil {
 		return errors.Wrap(err, "error getting list of plugins")
 	}
-	oursExists := false
+
+	toRemoveName := ""
 	for _, plugin := range plugins {
 		if strings.Contains(plugin.Name, logDriverName) {
-			oursExists = true
+			toRemoveName = plugin.Name
+			break
 		}
 	}
-	if oursExists {
-		err = cli.PluginDisable(ctx, name, types.PluginDisableOptions{Force: true})
-		if err != nil {
-			return errors.Wrap(err, "error disabling plugin")
-		}
-		err = cli.PluginRemove(ctx, name, types.PluginRemoveOptions{Force: true})
-		if err != nil {
-			return errors.Wrap(err, "error removing plugin")
-		}
+	if toRemoveName == "" {
+		return nil
+	}
+
+	err = cli.PluginDisable(ctx, toRemoveName, types.PluginDisableOptions{Force: true})
+	if err != nil {
+		return errors.Wrap(err, "error disabling plugin")
+	}
+	err = cli.PluginRemove(ctx, toRemoveName, types.PluginRemoveOptions{Force: true})
+	if err != nil {
+		return errors.Wrap(err, "error removing plugin")
 	}
 
 	return nil