Merge pull request 'update pos argument' (#25) from arg into master

Reviewed-on: #25

.gitea/workflows/dasel.yml

@@ -0,0 +1,38 @@
+name: Go Action 
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'provider/dasel/**'
+      - '.gitea/workflows/dasel.yml'
+  pull_request:
+    paths:
+      - 'provider/dasel/**'
+      - '.gitea/workflows/dasel.yml'
+
+jobs:
+  goaction:
+    runs-on: ubuntu-latest # Use a Gitea Actions runner label
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4 # Action to clone the repo
+
+      - name: Set up Go
+        uses: actions/setup-go@v5 # Action to install a specific Go version
+        with:
+          go-version: '1.25.5' # Specify your required Go version
+      
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@v8 # Use the golangci-lint action
+        with:
+          version: v2.7.2 # Specify the linter version
+          # Optional: additional arguments
+          args: --verbose
+          working-directory: ./provider/dasel 
+
+      - name: Run go test
+        run: go test ./...
+        working-directory: ./provider/dasel
+

.gitea/workflows/goaction.yml

@@ -18,6 +18,9 @@ on:
       - '.gitea/workflows/vault.yml'
       - 'provider/yaml/**'
       - '.gitea/workflows/yaml.yml'
+      - 'provider/dasel/**'
+      - '.gitea/workflows/dasel.yml'
+
 
 
 jobs:

provider/arg/param.go

@@ -16,7 +16,7 @@ const (
 var argNum uint64
 
 func Argument(v param.Params) param.Params {
-	return param.With(v, paramArgument, atomic.AddUint64(&argNum, 1))
+	return param.With(v, paramArgument, atomic.AddUint64(&argNum, 1)-1)
 }
 
 func ParamArgument(fn param.Params) (uint64, bool) {

provider/arg/provider.go

@@ -70,7 +70,7 @@ func (i *Argv) Value(ctx context.Context, key ...string) (config.Value, error) {
 
 	data, err := i.Map.Value(ctx, key...)
 	if err != nil {
-		return nil, fmt.Errorf("%w", err)
+		return nil, fmt.Errorf("map: %w", err)
 	}
 
 	return data, nil
@@ -101,12 +101,12 @@ func (i *Argv) Bind(ctx context.Context, def config.Variables) error {
 		}
 
 		if err != nil {
-			return fmt.Errorf("%w", err)
+			return fmt.Errorf("arg bind:%w", err)
 		}
 	}
 
 	if err := i.Map.Bind(ctx, def); err != nil {
-		return fmt.Errorf("%w", err)
+		return fmt.Errorf("arg map:%w", err)
 	}
 
 	return nil

provider/dasel/go.mod

@@ -0,0 +1,21 @@
+module gitoa.ru/go-4devs/config/provider/dasel
+
+go 1.25.5
+
+require (
+	github.com/tomwright/dasel/v3 v3.2.0
+	gitoa.ru/go-4devs/config v0.0.6
+)
+
+require (
+	github.com/agext/levenshtein v1.2.1 // indirect
+	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.24.0 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
+	github.com/zclconf/go-cty v1.17.0 // indirect
+	golang.org/x/mod v0.26.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
+	golang.org/x/tools v0.35.0 // indirect
+)

provider/dasel/go.sum

@@ -0,0 +1,30 @@
+github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
+github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
+github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
+github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
+github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/hashicorp/hcl/v2 v2.24.0 h1:2QJdZ454DSsYGoaE6QheQZjtKZSUs9Nh2izTWiwQxvE=
+github.com/hashicorp/hcl/v2 v2.24.0/go.mod h1:oGoO1FIQYfn/AgyOhlg9qLC6/nOJPX3qGbkZpYAcqfM=
+github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
+github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
+github.com/tomwright/dasel/v3 v3.2.0 h1:wyF2A4jVADx10E0kjbzPTiaF26D0OkK2OPuQRPJRDCo=
+github.com/tomwright/dasel/v3 v3.2.0/go.mod h1:XyAl6LidZuWOISIeUmKlCqJDz4IWEDp83epNngZgOQA=
+github.com/zclconf/go-cty v1.17.0 h1:seZvECve6XX4tmnvRzWtJNHdscMtYEx5R7bnnVyd/d0=
+github.com/zclconf/go-cty v1.17.0/go.mod h1:wqFzcImaLTI6A5HfsRwB0nj5n0MRZFwmey8YoFPPs3U=
+github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
+github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
+gitoa.ru/go-4devs/config v0.0.6 h1:BbOH2KHBRMWtSwcFyHKzMXzxYbJpSwZpA8LGnnzBwk8=
+gitoa.ru/go-4devs/config v0.0.6/go.mod h1:UINWnObZA0nLiJro+TtavUBBvN0cSt17aRHOk20pP74=
+golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
+golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
+golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=

provider/dasel/hcl/fixture/config.hcl

@@ -0,0 +1,18 @@
+app {
+  name {
+    var = [
+      "name"
+    ]
+
+    title = "config title"
+    timeout = "1m"
+    success = true
+  }
+
+}
+
+cfg {
+  duration = 1260000000000
+  enabled = true
+  type = "json"
+}

provider/dasel/hcl/provider.go

@@ -0,0 +1,13 @@
+package hcl
+
+import (
+	"github.com/tomwright/dasel/v3/parsing/hcl"
+	"gitoa.ru/go-4devs/config/provider/dasel"
+)
+
+const Name = "dasel:hcl"
+
+//nolint:wrapcheck
+func New(data []byte) (dasel.Provider, error) {
+	return dasel.New(data, hcl.HCL, dasel.WithName(Name))
+}

provider/dasel/hcl/provider_test.go

@@ -0,0 +1,35 @@
+package hcl_test
+
+import (
+	"embed"
+	"testing"
+	"time"
+
+	dhcl "gitoa.ru/go-4devs/config/provider/dasel/hcl"
+	"gitoa.ru/go-4devs/config/test"
+	"gitoa.ru/go-4devs/config/test/require"
+)
+
+//go:embed fixture/*
+var fixture embed.FS
+
+func TestProvider(t *testing.T) {
+	t.Parallel()
+
+	js, err := fixture.ReadFile("fixture/config.hcl")
+	require.NoError(t, err)
+
+	prov, derr := dhcl.New(js)
+	require.NoError(t, derr)
+
+	sl := []string{}
+	read := []test.Read{
+		test.NewRead("config title", "app", "name", "title"),
+		test.NewRead(time.Minute, "app.name.timeout"),
+		test.NewReadUnmarshal(&[]string{"name"}, &sl, "app.name.var"),
+		test.NewReadConfig("cfg"),
+		test.NewRead(true, "app", "name", "success"),
+	}
+
+	test.Run(t, prov, read)
+}

provider/dasel/json/fixture/config.json

@@ -0,0 +1,17 @@
+{
+    "app": {
+        "name": {
+            "var": [
+                "name"
+            ],
+            "title": "config title",
+            "timeout": "1m",
+            "success": true
+        }
+    },
+    "cfg": {
+        "duration": 1260000000000,
+        "enabled": true,
+        "type":"json"
+    }
+}

provider/dasel/json/provider.go

@@ -0,0 +1,13 @@
+package json //nolint:revive
+
+import (
+	"github.com/tomwright/dasel/v3/parsing/json"
+	"gitoa.ru/go-4devs/config/provider/dasel"
+)
+
+const Name = "dasel:json"
+
+//nolint:wrapcheck
+func New(data []byte) (dasel.Provider, error) {
+	return dasel.New(data, json.JSON, dasel.WithName(Name))
+}

provider/dasel/json/provider_test.go

@@ -0,0 +1,35 @@
+package json_test
+
+import (
+	"embed"
+	"testing"
+	"time"
+
+	djson "gitoa.ru/go-4devs/config/provider/dasel/json"
+	"gitoa.ru/go-4devs/config/test"
+	"gitoa.ru/go-4devs/config/test/require"
+)
+
+//go:embed fixture/*
+var fixture embed.FS
+
+func TestProvider(t *testing.T) {
+	t.Parallel()
+
+	js, err := fixture.ReadFile("fixture/config.json")
+	require.NoError(t, err)
+
+	prov, derr := djson.New(js)
+	require.NoError(t, derr)
+
+	sl := []string{}
+	read := []test.Read{
+		test.NewRead("config title", "app.name.title"),
+		test.NewRead(time.Minute, "app.name.timeout"),
+		test.NewReadUnmarshal(&[]string{"name"}, &sl, "app.name.var"),
+		test.NewReadConfig("cfg"),
+		test.NewRead(true, "app", "name", "success"),
+	}
+
+	test.Run(t, prov, read)
+}

provider/dasel/provider.go

@@ -0,0 +1,91 @@
+package dasel
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	dasel "github.com/tomwright/dasel/v3"
+	"github.com/tomwright/dasel/v3/model"
+	"github.com/tomwright/dasel/v3/parsing"
+	"gitoa.ru/go-4devs/config"
+	"gitoa.ru/go-4devs/config/value"
+)
+
+var _ config.Provider = Provider{} //nolint:exhaustruct
+
+const Name = "dasel"
+
+type Option func(*Provider)
+
+func WithName(in string) Option {
+	return func(p *Provider) {
+		p.name = in
+	}
+}
+
+func New(in []byte, format parsing.Format, opts ...Option) (Provider, error) {
+	reader, err := format.NewReader(parsing.DefaultReaderOptions())
+	if err != nil {
+		return Provider{}, fmt.Errorf("%w:%w", config.ErrInitFactory, err)
+	}
+
+	data, verr := reader.Read(in)
+	if verr != nil {
+		return Provider{}, fmt.Errorf("%w:%w", config.ErrInitFactory, verr)
+	}
+
+	prov := Provider{
+		data: data,
+		key: func(path ...string) string {
+			return strings.Join(path, ".")
+		},
+		name: Name,
+	}
+
+	for _, opt := range opts {
+		opt(&prov)
+	}
+
+	return prov, nil
+}
+
+type Provider struct {
+	data *model.Value
+	key  func(path ...string) string
+	name string
+}
+
+func (p Provider) Value(ctx context.Context, path ...string) (config.Value, error) {
+	selector := p.key(path...)
+
+	data, cnt, err := dasel.Query(ctx, p.data, selector)
+	if err != nil {
+		return nil, fmt.Errorf("query: %w:%w", config.ErrInvalidValue, err)
+	}
+
+	if cnt > 1 {
+		return nil, fmt.Errorf("count: %v:%w", cnt, config.ErrToManyArgs)
+	}
+
+	if cnt == 0 {
+		return value.EmptyValue(), nil
+	}
+
+	val, verr := data[0].GoValue()
+	if verr != nil {
+		return nil, fmt.Errorf("go value: %w:%w", config.ErrInvalidValue, verr)
+	}
+
+	res, merr := json.Marshal(val)
+	if merr != nil {
+		return nil, fmt.Errorf("marshal: %w:%w", config.ErrInvalidValue, merr)
+	}
+
+	return value.JBytes(res), nil
+}
+
+func (p Provider) Name() string {
+	return p.name
+}