Skip to content

Commit 36ebf9e

Browse files
23doors23doors
committed
alpha: plugins-go update and skip row column
1 parent a939c22 commit 36ebf9e

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/mholt/archiver/v3 v3.5.1
1919
github.com/mitchellh/go-homedir v1.1.0
2020
github.com/otiai10/copy v1.7.0
21-
github.com/outblocks/outblocks-plugin-go v0.0.0-20220310153738-b0792b33a0f5
21+
github.com/outblocks/outblocks-plugin-go v0.0.0-20220315150417-e5aa563019b3
2222
github.com/pkg/errors v0.9.1
2323
github.com/pterm/pterm v0.12.37
2424
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0
@@ -28,7 +28,7 @@ require (
2828
github.com/txn2/txeh v1.3.0
2929
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
3030
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
31-
google.golang.org/grpc v1.44.0
31+
google.golang.org/grpc v1.45.0
3232
google.golang.org/protobuf v1.27.1
3333
)
3434

@@ -88,11 +88,11 @@ require (
8888
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
8989
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
9090
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
91-
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
91+
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
9292
golang.org/x/text v0.3.7 // indirect
9393
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
9494
google.golang.org/appengine v1.6.7 // indirect
95-
google.golang.org/genproto v0.0.0-20220302033224-9aa15565e42a // indirect
95+
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106 // indirect
9696
gopkg.in/ini.v1 v1.66.4 // indirect
9797
gopkg.in/yaml.v2 v2.4.0 // indirect
9898
)

‎go.sum‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -880,8 +880,8 @@ github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6
880880
github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
881881
github.com/otiai10/mint v1.3.3 h1:7JgpsBaN0uMkyju4tbYHu0mnM55hNKVYLsXmwr15NQI=
882882
github.com/otiai10/mint v1.3.3/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
883-
github.com/outblocks/outblocks-plugin-go v0.0.0-20220310153738-b0792b33a0f5 h1:ZG1VViVVrkAg28Fh4bqLcHBRt/LIz1PI8EcBmF78FOk=
884-
github.com/outblocks/outblocks-plugin-go v0.0.0-20220310153738-b0792b33a0f5/go.mod h1:OmO1Mpv/cWFQygT6A++Ek0MCTcxAkfRYJsgxyZh5n6A=
883+
github.com/outblocks/outblocks-plugin-go v0.0.0-20220315150417-e5aa563019b3 h1:mT4aHAQlOP3FallQYeL7qS7skxstzQVlerDkeMyQvh8=
884+
github.com/outblocks/outblocks-plugin-go v0.0.0-20220315150417-e5aa563019b3/go.mod h1:ZrN4QZvTboz66Ti2VBmam+dlHNt0I9fUc5lxan33VNk=
885885
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
886886
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
887887
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@@ -1409,8 +1409,8 @@ golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBc
14091409
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14101410
golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14111411
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1412-
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs=
1413-
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1412+
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
1413+
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14141414
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
14151415
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
14161416
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -1626,8 +1626,8 @@ google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ6
16261626
google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
16271627
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
16281628
google.golang.org/genproto v0.0.0-20220208230804-65c12eb4c068/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
1629-
google.golang.org/genproto v0.0.0-20220302033224-9aa15565e42a h1:uqouglH745GoGeZ1YFZbPBiu961tgi/9Qm5jaorajjQ=
1630-
google.golang.org/genproto v0.0.0-20220302033224-9aa15565e42a/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
1629+
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106 h1:ErU+UA6wxadoU8nWrsy5MZUVBs75K17zUCsUCIfrXCE=
1630+
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
16311631
google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
16321632
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
16331633
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -1660,8 +1660,9 @@ google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K
16601660
google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
16611661
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
16621662
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
1663-
google.golang.org/grpc v1.44.0 h1:weqSxi/TMs1SqFRMHCtBgXRs8k3X39QIDEZ0pRcttUg=
16641663
google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
1664+
google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M=
1665+
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
16651666
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
16661667
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
16671668
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=

‎internal/util/vars.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ func NewVarEvaluator(vars map[string]interface{}) *VarEvaluator {
2020
BaseVarEvaluator: plugin_util.NewBaseVarEvaluator(vars).
2121
WithEncoder(varEncoder).
2222
WithVarChar('%').
23-
WithIgnoreInvalid(true),
23+
WithIgnoreInvalid(true).
24+
WithSkipRowColumnInfo(true),
2425
}
2526
}
2627

‎pkg/config/vars.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ func NewYAMLEvaluator(vars map[string]interface{}) *YAMLEvaluator {
2020
BaseVarEvaluator: plugin_util.NewBaseVarEvaluator(vars).
2121
WithEncoder(yamlVarEncoder).
2222
WithIgnoreComments(true).
23-
WithVarChar('$'),
23+
WithVarChar('$').
24+
WithSkipRowColumnInfo(false),
2425
}
2526
}
2627

0 commit comments

Comments
 (0)