From 48a762b0866564a3972b2ca2d6c33c99f4f13d7b Mon Sep 17 00:00:00 2001
From: Benjamin Yolken <benjamin.yolken@segment.com>
Date: Fri, 5 Feb 2021 10:54:31 -0800
Subject: [PATCH] Update diff test

---
 cmd/kubeapply/subcmd/diff_test.go | 30 +++++++++++++++++++++++++++---
 data/data.go                      |  2 +-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/cmd/kubeapply/subcmd/diff_test.go b/cmd/kubeapply/subcmd/diff_test.go
index a482762..891b869 100644
--- a/cmd/kubeapply/subcmd/diff_test.go
+++ b/cmd/kubeapply/subcmd/diff_test.go
@@ -2,8 +2,12 @@ package subcmd
 
 import (
 	"context"
+	"fmt"
+	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
+	"time"
 
 	"github.com/segmentio/kubeapply/pkg/util"
 	"github.com/stretchr/testify/require"
@@ -16,13 +20,33 @@ func TestDiff(t *testing.T) {
 
 	ctx := context.Background()
 
-	testClusterDir := "testdata/clusters/basic"
+	namespace := fmt.Sprintf("test-diff-%d", time.Now().UnixNano()/1000)
+	util.CreateNamespace(ctx, t, namespace, kubeConfigTestPath)
 
+	tempDir, err := ioutil.TempDir("", "diff")
+	require.Nil(t, err)
+	defer os.RemoveAll(tempDir)
+
+	clusterDir := filepath.Join(tempDir, "cluster")
+	require.Nil(t, err)
+
+	err = util.RecursiveCopy("testdata/clusters/apply-test", clusterDir)
+	require.Nil(t, err)
+	replaceNamespace(t, filepath.Join(clusterDir, "expanded"), namespace)
+
+	// Full outputs
 	diffFlagValues.kubeConfig = kubeConfigTestPath
+	err = diffClusterPath(
+		ctx,
+		filepath.Join(clusterDir, "cluster.yaml"),
+	)
+	require.Nil(t, err)
 
-	err := diffClusterPath(
+	// Simple outputs
+	diffFlagValues.simpleOutput = true
+	err = diffClusterPath(
 		ctx,
-		filepath.Join(testClusterDir, "cluster.yaml"),
+		filepath.Join(clusterDir, "cluster.yaml"),
 	)
 	require.Nil(t, err)
 }
diff --git a/data/data.go b/data/data.go
index eff9b0b..b304ef7 100644
--- a/data/data.go
+++ b/data/data.go
@@ -345,7 +345,7 @@ func scriptsRawDiffSh() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "scripts/raw-diff.sh", size: 143, mode: os.FileMode(420), modTime: time.Unix(1612469663, 0)}
+	info := bindataFileInfo{name: "scripts/raw-diff.sh", size: 143, mode: os.FileMode(420), modTime: time.Unix(1612477884, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }