revert(provisionersdk): remove support for .tf.json files (coder#7829)

coadler · web-flow · commit 14a63d7b4a15 · 2023-06-02T23:13:41.000Z
diff --git 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
@@ -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()

Original file line number	Diff line number	Diff line change
`@@ -15,17 +15,15 @@ const (`
`15`	`15`	`TemplateArchiveLimit = 1 << 20`
`16`	`16`	`)`
`17`	`17`
`18`		`-func dirHasExt(dir string, exts ...string) (bool, error) {`
	`18`	`+func dirHasExt(dir string, ext string) (bool, error) {`
`19`	`19`	`dirEnts, err := os.ReadDir(dir)`
`20`	`20`	`if err != nil {`
`21`	`21`	`return false, err`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`for _, fi := range dirEnts {`
`25`		`- for _, ext := range exts {`
`26`		`- if strings.HasSuffix(fi.Name(), ext) {`
`27`		`- return true, nil`
`28`		`- }`
	`25`	`+ if strings.HasSuffix(fi.Name(), ext) {`
	`26`	`+ return true, nil`
`29`	`27`	`}`
`30`	`28`	`}`
`31`	`29`
`@@ -37,8 +35,8 @@ func Tar(w io.Writer, directory string, limit int64) error {`
`37`	`35`	`tarWriter := tar.NewWriter(w)`
`38`	`36`	`totalSize := int64(0)`
`39`	`37`
`40`		`- tfExts := []string{".tf", ".tf.json"}`
`41`		`- hasTf, err := dirHasExt(directory, tfExts...)`
	`38`	`+ const tfExt = ".tf"`
	`39`	`+ hasTf, err := dirHasExt(directory, tfExt)`
`42`	`40`	`if err != nil {`
`43`	`41`	`return err`
`44`	`42`	`}`
`@@ -52,7 +50,7 @@ func Tar(w io.Writer, directory string, limit int64) error {`
`52`	`50`	`// useless.`
`53`	`51`	`return xerrors.Errorf(`
`54`	`52`	`"%s is not a valid template since it has no %s files",`
`55`		`- absPath, tfExts,`
	`53`	`+ absPath, tfExt,`
`56`	`54`	`)`
`57`	`55`	`}`
`58`	`56`