Merge pull request #211 from TomWright/expose-storage-package

Expose the storage package
TomWright · Mar 28, 2022 · 46fe0a8 · 46fe0a8
2 parents eabe44d + 425a646
commit 46fe0a8
Show file tree

Hide file tree

Showing 27 changed files with 30 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing yet.
 
+## [v1.24.1] - 2022-03-28
+
+### Changed
+
+- `storage` package has been moved outside the `internal` package.
+
+### Fixed
+
+- New funcs added in `v1.24.0` can now be used as expected since you can now access the `storage.ReadWriteOption`.
+
 ## [v1.24.0] - 2022-03-18
 
 ### Added
@@ -428,7 +438,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Everything!
 
-[unreleased]: https://github.com/TomWright/dasel/compare/v1.24.0...HEAD
+[unreleased]: https://github.com/TomWright/dasel/compare/v1.24.1...HEAD
+[v1.24.1]: https://github.com/TomWright/dasel/compare/v1.24.0...v1.24.1
 [v1.24.0]: https://github.com/TomWright/dasel/compare/v1.23.0...v1.24.0
 [v1.23.0]: https://github.com/TomWright/dasel/compare/v1.22.1...v1.23.0
 [v1.22.1]: https://github.com/TomWright/dasel/compare/v1.22.0...v1.22.1

diff --git a/internal/command/delete.go b/internal/command/delete.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/spf13/cobra"
 	"github.com/tomwright/dasel"
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"io"
 )
 

diff --git a/internal/command/put.go b/internal/command/put.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"github.com/spf13/cobra"
 	"github.com/tomwright/dasel"
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"io"
 	"os"
 	"strconv"

diff --git a/internal/command/put_document_internal.go b/internal/command/put_document_internal.go
@@ -3,7 +3,7 @@ package command
 import (
 	"fmt"
 	"github.com/spf13/cobra"
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"io"
 )
 

diff --git a/internal/command/put_document_internal_test.go b/internal/command/put_document_internal_test.go
@@ -2,7 +2,7 @@ package command
 
 import (
 	"errors"
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"strings"
 	"testing"
 )

diff --git a/internal/command/put_internal_test.go b/internal/command/put_internal_test.go
@@ -3,7 +3,7 @@ package command
 import (
 	"bytes"
 	"fmt"
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"io"
 	"reflect"
 	"strings"

diff --git a/internal/command/put_object_internal.go b/internal/command/put_object_internal.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/spf13/cobra"
 	"github.com/tomwright/dasel/internal/oflag"
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"io"
 	"strings"
 )

diff --git a/internal/command/select.go b/internal/command/select.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/spf13/cobra"
 	"github.com/tomwright/dasel"
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"io"
 	"reflect"
 )

diff --git a/node.go b/node.go
@@ -2,12 +2,11 @@ package dasel
 
 import (
 	"fmt"
+	"github.com/tomwright/dasel/storage"
 	"io"
 	"os"
 	"reflect"
 	"regexp"
-
-	"github.com/tomwright/dasel/internal/storage"
 )
 
 // Selector represents the selector for a node.

diff --git a/node_put.go b/node_put.go
@@ -2,7 +2,7 @@ package dasel
 
 import (
 	"fmt"
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"reflect"
 )
 

diff --git a/node_test.go b/node_test.go
@@ -5,12 +5,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/tomwright/dasel/storage"
 	"reflect"
 	"strings"
 	"testing"
 
 	"github.com/tomwright/dasel"
-	"github.com/tomwright/dasel/internal/storage"
 )
 
 // ExampleNode_ReadmeExample tests the code from the readme explanation.

diff --git a/internal/storage/colourise.go → storage/colourise.go b/internal/storage/colourise.go → storage/colourise.go
diff --git a/internal/storage/csv.go → storage/csv.go b/internal/storage/csv.go → storage/csv.go
diff --git a/internal/storage/csv_test.go → storage/csv_test.go b/internal/storage/csv_test.go → storage/csv_test.go
@@ -1,7 +1,7 @@
 package storage_test
 
 import (
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"reflect"
 	"testing"
 )

diff --git a/internal/storage/json.go → storage/json.go b/internal/storage/json.go → storage/json.go
diff --git a/internal/storage/json_test.go → storage/json_test.go b/internal/storage/json_test.go → storage/json_test.go
@@ -1,7 +1,7 @@
 package storage_test
 
 import (
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"reflect"
 	"testing"
 )

diff --git a/internal/storage/option.go → storage/option.go b/internal/storage/option.go → storage/option.go
diff --git a/internal/storage/parser.go → storage/parser.go b/internal/storage/parser.go → storage/parser.go
diff --git a/internal/storage/parser_test.go → storage/parser_test.go b/internal/storage/parser_test.go → storage/parser_test.go
@@ -3,7 +3,7 @@ package storage_test
 import (
 	"bytes"
 	"errors"
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"reflect"
 	"strings"
 	"testing"
@@ -194,7 +194,7 @@ var jsonData = map[string]interface{}{
 
 func TestLoadFromFile(t *testing.T) {
 	t.Run("ValidJSON", func(t *testing.T) {
-		data, err := storage.LoadFromFile("../../tests/assets/example.json", &storage.JSONParser{})
+		data, err := storage.LoadFromFile("../tests/assets/example.json", &storage.JSONParser{})
 		if err != nil {
 			t.Errorf("unexpected error: %s", err)
 			return

diff --git a/internal/storage/plain.go → storage/plain.go b/internal/storage/plain.go → storage/plain.go
diff --git a/internal/storage/plain_test.go → storage/plain_test.go b/internal/storage/plain_test.go → storage/plain_test.go
@@ -2,7 +2,7 @@ package storage_test
 
 import (
 	"errors"
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"testing"
 )
 

diff --git a/internal/storage/toml.go → storage/toml.go b/internal/storage/toml.go → storage/toml.go
diff --git a/internal/storage/toml_test.go → storage/toml_test.go b/internal/storage/toml_test.go → storage/toml_test.go
@@ -1,7 +1,7 @@
 package storage_test
 
 import (
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"reflect"
 	"strings"
 	"testing"

diff --git a/internal/storage/xml.go → storage/xml.go b/internal/storage/xml.go → storage/xml.go
diff --git a/internal/storage/xml_test.go → storage/xml_test.go b/internal/storage/xml_test.go → storage/xml_test.go
@@ -3,11 +3,11 @@ package storage_test
 import (
 	"bytes"
 	"fmt"
+	"github.com/tomwright/dasel/storage"
 	"io"
 	"reflect"
 	"testing"
 
-	"github.com/tomwright/dasel/internal/storage"
 	"golang.org/x/text/encoding/charmap"
 	"golang.org/x/text/encoding/unicode"
 )

diff --git a/internal/storage/yaml.go → storage/yaml.go b/internal/storage/yaml.go → storage/yaml.go
diff --git a/internal/storage/yaml_test.go → storage/yaml_test.go b/internal/storage/yaml_test.go → storage/yaml_test.go
@@ -1,7 +1,7 @@
 package storage_test
 
 import (
-	"github.com/tomwright/dasel/internal/storage"
+	"github.com/tomwright/dasel/storage"
 	"reflect"
 	"strings"
 	"testing"