From 2114cd1621228c38b5056c0079d4ff01d5880968 Mon Sep 17 00:00:00 2001
From: Colin Adler <colin1adler@gmail.com>
Date: Fri, 2 Jun 2023 22:47:26 +0000
Subject: [PATCH] Revert "feat(provisionersdk): add support for `.tf.json`
 templates (#7744)"

This reverts commit 9b8e5c2d8a99be4df5e0e3ab67cb9b03903d4d5e.
---
 provisionersdk/archive.go      | 14 ++++++--------
 provisionersdk/archive_test.go |  9 ---------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/provisionersdk/archive.go b/provisionersdk/archive.go
index a0aa4d52b19dc..ec496b6f31592 100644
--- a/provisionersdk/archive.go
+++ b/provisionersdk/archive.go
@@ -15,17 +15,15 @@ const (
 	TemplateArchiveLimit = 1 << 20
 )
 
-func dirHasExt(dir string, exts ...string) (bool, error) {
+func dirHasExt(dir string, ext string) (bool, error) {
 	dirEnts, err := os.ReadDir(dir)
 	if err != nil {
 		return false, err
 	}
 
 	for _, fi := range dirEnts {
-		for _, ext := range exts {
-			if strings.HasSuffix(fi.Name(), ext) {
-				return true, nil
-			}
+		if strings.HasSuffix(fi.Name(), ext) {
+			return true, nil
 		}
 	}
 
@@ -37,8 +35,8 @@ func Tar(w io.Writer, directory string, limit int64) error {
 	tarWriter := tar.NewWriter(w)
 	totalSize := int64(0)
 
-	tfExts := []string{".tf", ".tf.json"}
-	hasTf, err := dirHasExt(directory, tfExts...)
+	const tfExt = ".tf"
+	hasTf, err := dirHasExt(directory, tfExt)
 	if err != nil {
 		return err
 	}
@@ -52,7 +50,7 @@ func Tar(w io.Writer, directory string, limit int64) error {
 		// useless.
 		return xerrors.Errorf(
 			"%s is not a valid template since it has no %s files",
-			absPath, tfExts,
+			absPath, tfExt,
 		)
 	}
 
diff --git a/provisionersdk/archive_test.go b/provisionersdk/archive_test.go
index 1bb5ea793fa9a..66fae25dd9832 100644
--- a/provisionersdk/archive_test.go
+++ b/provisionersdk/archive_test.go
@@ -33,15 +33,6 @@ func TestTar(t *testing.T) {
 		err = provisionersdk.Tar(io.Discard, dir, 1024)
 		require.NoError(t, err)
 	})
-	t.Run("ValidJSON", func(t *testing.T) {
-		t.Parallel()
-		dir := t.TempDir()
-		file, err := os.CreateTemp(dir, "*.tf.json")
-		require.NoError(t, err)
-		_ = file.Close()
-		err = provisionersdk.Tar(io.Discard, dir, 1024)
-		require.NoError(t, err)
-	})
 	t.Run("HiddenFiles", func(t *testing.T) {
 		t.Parallel()
 		dir := t.TempDir()