Revert package renaming for git diff

seatgeek · Nov 19, 2024 · 4c47d97 · 4c47d97
1 parent b20f6ec
commit 4c47d97
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/packages/hclmerge/hclmerge.go → hcl/hcl.go b/packages/hclmerge/hclmerge.go → hcl/hcl.go
@@ -2,7 +2,7 @@
  * Copyright SeatGeek
  * Licensed under the terms of the Apache-2.0 license. See LICENSE file in project root for terms.
  */
-package hclmerge
+package hcl
 
 import (
 	"fmt"

diff --git a/packages/hclmerge/hclmerge_test.go → hcl/hcl_test.go b/packages/hclmerge/hclmerge_test.go → hcl/hcl_test.go
@@ -2,12 +2,12 @@
  * Copyright SeatGeek
  * Licensed under the terms of the Apache-2.0 license. See LICENSE file in project root for terms.
  */
-package hclmerge_test
+package hcl_test
 
 import (
 	"testing"
 
-	"github.com/seatgeek/node-hcl/packages/hclmerge"
+	"github.com/seatgeek/node-hcl/hcl"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -17,7 +17,7 @@ func TestMerge(t *testing.T) {
 	type input struct {
 		a       string
 		b       string
-		options *hclmerge.MergeOptions
+		options *hcl.MergeOptions
 	}
 
 	tests := []struct {
@@ -135,7 +135,7 @@ variable "b" {
 			}
 		}
 					`,
-				options: &hclmerge.MergeOptions{
+				options: &hcl.MergeOptions{
 					MergeMapKeys: true,
 				},
 			},
@@ -197,7 +197,7 @@ variable "b" {
 		}
 	}
 }`,
-				options: &hclmerge.MergeOptions{
+				options: &hcl.MergeOptions{
 					MergeMapKeys: true,
 				},
 			},
@@ -238,7 +238,7 @@ variable "b" {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			merger := hclmerge.NewMerger(tc.input.options)
+			merger := hcl.NewMerger(tc.input.options)
 			got, err := merger.Merge(tc.input.a, tc.input.b)
 			assert.Equal(t, tc.want, got)
 

diff --git a/main.go b/main.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"syscall/js"
 
-	"github.com/seatgeek/node-hcl/packages/hclmerge"
+	"github.com/seatgeek/node-hcl/hcl"
 )
 
 var jsGlobal js.Value
@@ -58,7 +58,7 @@ func main() {
 			return nil, fmt.Errorf("Invalid second argument type, expected string")
 		}
 
-		options := &hclmerge.MergeOptions{}
+		options := &hcl.MergeOptions{}
 
 		if argCount == 3 {
 			arg2Type := args[2].Type()
@@ -74,7 +74,7 @@ func main() {
 		aHclString := args[0].String()
 		bHclString := args[1].String()
 
-		hclmerger := hclmerge.NewMerger(options)
+		hclmerger := hcl.NewMerger(options)
 		return hclmerger.Merge(aHclString, bHclString)
 	})