From 35b5f4b34adae2df3d1e1dbfc7a21fac329c66b9 Mon Sep 17 00:00:00 2001
From: Christian Jantz <chris@safewrd.com>
Date: Sat, 28 Apr 2018 17:43:34 +0200
Subject: [PATCH] Revert "Added shell command and test"

This reverts commit ae47a03023fc263a56367009f800712b77f7fe94.
---
 pkg/commands/shell.go      | 54 -------------------------------------
 pkg/commands/shell_test.go | 55 --------------------------------------
 2 files changed, 109 deletions(-)
 delete mode 100644 pkg/commands/shell.go
 delete mode 100644 pkg/commands/shell_test.go

diff --git a/pkg/commands/shell.go b/pkg/commands/shell.go
deleted file mode 100644
index 89a453914..000000000
--- a/pkg/commands/shell.go
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright 2018 Google LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package commands
-
-import (
-	"strings"
-
-	"github.com/docker/docker/builder/dockerfile/instructions"
-	"github.com/google/go-containerregistry/v1"
-	"github.com/sirupsen/logrus"
-)
-
-type ShellCommand struct {
-	cmd *instructions.ShellCommand
-}
-
-// ExecuteCommand handles command processing similar to CMD and RUN,
-func (s *ShellCommand) ExecuteCommand(config *v1.Config) error {
-	logrus.Info("cmd: SHELL")
-	var newShell []string
-
-	newShell = s.cmd.Shell
-
-	logrus.Infof("Replacing Shell in config with %v", newShell)
-	config.Shell = newShell
-	return nil
-}
-
-// FilesToSnapshot returns an empty array since this is a metadata command
-func (s *ShellCommand) FilesToSnapshot() []string {
-	return []string{}
-}
-
-// CreatedBy returns some information about the command for the image config history
-func (s *ShellCommand) CreatedBy() string {
-	entrypoint := []string{"SHELL"}
-	cmdLine := strings.Join(s.cmd.Shell, " ")
-
-	return strings.Join(append(entrypoint, cmdLine), " ")
-}
diff --git a/pkg/commands/shell_test.go b/pkg/commands/shell_test.go
deleted file mode 100644
index 524138aab..000000000
--- a/pkg/commands/shell_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-Copyright 2018 Google LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package commands
-
-import (
-	"testing"
-
-	"github.com/GoogleContainerTools/kaniko/testutil"
-	"github.com/docker/docker/builder/dockerfile/instructions"
-	"github.com/google/go-containerregistry/v1"
-)
-
-var shellTests = []struct {
-	cmdLine       []string
-	expectedShell []string
-}{
-	{
-		cmdLine:       []string{"/bin/bash", "-c"},
-		expectedShell: []string{"/bin/bash", "-c"},
-	},
-	{
-		cmdLine:       []string{"/bin/bash"},
-		expectedShell: []string{"/bin/bash"},
-	},
-}
-
-func TestShellExecuteCmd(t *testing.T) {
-
-	cfg := &v1.Config{
-		Shell: nil,
-	}
-
-	for _, test := range shellTests {
-		cmd := ShellCommand{
-			&instructions.ShellCommand{
-				Shell: test.cmdLine,
-			},
-		}
-		err := cmd.ExecuteCommand(cfg)
-		testutil.CheckErrorAndDeepEqual(t, false, err, test.expectedShell, cfg.Shell)
-	}
-}