Add generated code to separate directories (#20)

internal/cmd/generate_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/google/go-cmp/cmp"
 )
 
-// TODO: currently doesn't compare nested directory files
 func compareDirectories(t *testing.T, wantDirPath, gotDirPath string) {
 	t.Helper()
 
@@ -42,17 +41,50 @@ func compareDirectories(t *testing.T, wantDirPath, gotDirPath string) {
 			continue
 		}
 
-		gotFile, err := os.ReadFile(path.Join(gotDirPath, gotEntry.Name()))
-		if err != nil {
-			t.Fatalf("unexpected error reading `got` file: %s", err)
-		}
-		wantFile, _ := os.ReadFile(path.Join(wantDirPath, wantEntry.Name()))
+		compareFiles(t, path.Join(gotDirPath, gotEntry.Name()), path.Join(wantDirPath, wantEntry.Name()))
+	}
+}
+
+func compareFiles(t *testing.T, got, want string) {
+	gotFile, err := os.Open(got)
+
+	if err != nil {
+		t.Fatalf("unexpected error opening %s: %s", got, err)
+	}
+
+	gotFileInfo, err := gotFile.Stat()
+
+	if err != nil {
+		t.Fatalf("unexpected error stat %s: %s", got, err)
+	}
+
+	if gotFileInfo.IsDir() {
+		dirEntries, err := os.ReadDir(got)
+
 		if err != nil {
-			t.Fatalf("unexpected error reading `want` file: %s", err)
+			t.Fatalf("unexpected error reading dir %s: %s", got, err)
 		}
 
-		if diff := cmp.Diff(string(gotFile), string(wantFile)); diff != "" {
-			t.Errorf("unexpected difference in %s: %s", wantEntry.Name(), diff)
+		for _, dirEntry := range dirEntries {
+			compareFiles(t, path.Join(got, dirEntry.Name()), path.Join(want, dirEntry.Name()))
 		}
+
+		return
+	}
+
+	gotFileBytes, err := os.ReadFile(got)
+
+	if err != nil {
+		t.Fatalf("unexpected error reading `got` file: %s", err)
+	}
+
+	wantFileBytes, err := os.ReadFile(want)
+
+	if err != nil {
+		t.Fatalf("unexpected error reading `want` file: %s", err)
+	}
+
+	if diff := cmp.Diff(string(gotFileBytes), string(wantFileBytes)); diff != "" {
+		t.Errorf("unexpected difference in %s: %s", got, diff)
 	}
 }

internal/output/write.go

@@ -13,9 +13,16 @@ import (
 
 func WriteDataSources(dataSourcesSchema, dataSourcesModels, dataSourcesModelObjectHelpers, dataSourcesToFrom map[string][]byte, outputDir string) error {
 	for k, v := range dataSourcesSchema {
+		dirName := fmt.Sprintf("datasource_%s", k)
+
+		err := os.MkdirAll(filepath.Join(outputDir, dirName), os.ModePerm)
+		if err != nil {
+			return err
+		}
+
 		filename := fmt.Sprintf("%s_data_source_gen.go", k)
 
-		f, err := os.Create(filepath.Join(outputDir, filename))
+		f, err := os.Create(filepath.Join(outputDir, dirName, filename))
 		if err != nil {
 			return err
 		}
@@ -46,9 +53,16 @@ func WriteDataSources(dataSourcesSchema, dataSourcesModels, dataSourcesModelObje
 
 func WriteResources(resourcesSchema, resourcesModels, resourcesModelObjectHelpers, resourcesToFrom map[string][]byte, outputDir string) error {
 	for k, v := range resourcesSchema {
+		dirName := fmt.Sprintf("resource_%s", k)
+
+		err := os.MkdirAll(filepath.Join(outputDir, dirName), os.ModePerm)
+		if err != nil {
+			return err
+		}
+
 		filename := fmt.Sprintf("%s_resource_gen.go", k)
 
-		f, err := os.Create(filepath.Join(outputDir, filename))
+		f, err := os.Create(filepath.Join(outputDir, dirName, filename))
 		if err != nil {
 			return err
 		}
@@ -79,9 +93,16 @@ func WriteResources(resourcesSchema, resourcesModels, resourcesModelObjectHelper
 
 func WriteProviders(providersSchema, providerModels, providerModelObjectHelpers, providerToFrom map[string][]byte, outputDir string) error {
 	for k, v := range providersSchema {
+		dirName := fmt.Sprintf("provider_%s", k)
+
+		err := os.MkdirAll(filepath.Join(outputDir, dirName), os.ModePerm)
+		if err != nil {
+			return err
+		}
+
 		filename := fmt.Sprintf("%s_provider_gen.go", k)
 
-		f, err := os.Create(filepath.Join(outputDir, filename))
+		f, err := os.Create(filepath.Join(outputDir, dirName, filename))
 		if err != nil {
 			return err
 		}

internal/schema/schemas.go

@@ -5,6 +5,8 @@ package schema
 
 import (
 	"bytes"
+	"fmt"
+	"strings"
 )
 
 // TODO: Field(s) could be added to handle end-user supplying their own templates to allow overriding.
@@ -24,7 +26,7 @@ func (g GeneratorSchemas) SchemasBytes(packageName, generatorType string) (map[s
 	for k, s := range g.schemas {
 
 		if packageName == "" {
-			packageName = k
+			packageName = fmt.Sprintf("%s_%s", strings.ToLower(generatorType), k)
 		}
 
 		b, err := s.SchemaBytes(k, packageName, generatorType)