Skip to content

Commit

Permalink
feat(sprig): updated sprig version to advance functions support (#60)
Browse files Browse the repository at this point in the history 
* feat(sprig): updated sprig version to advance functions support (#54)

* Updating go vendor (#58)

* Updating go vendor (#59)

---------

Co-authored-by: Oscar Michel Herrera <[email protected]>
  • Loading branch information
@christosarvanitis @OscarMichelH
christosarvanitis and OscarMichelH authored Feb 13, 2024
1 parent c35b48a commit 313a77d
Show file tree
Hide file tree
Showing 41 changed files with 3,261 additions and 306 deletions.
13 changes: 12 additions & 1 deletion cmd/plank_mock.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package cmd

import "github.com/armory/plank/v4"
import (
"github.com/armory/plank/v4"
)

var pipelineID string

Expand Down Expand Up @@ -46,6 +48,15 @@ func (p PlankMock) UpsertPipeline(pipe plank.Pipeline, str, arg2 string) error {
return nil
}

func (p PlankMock) UpsertPipelineUsingOrca(pipe plank.Pipeline, str, arg2 string) error {
pipelineID = pipe.Name
return nil
}

func (p PlankMock) UserRoles(arg0, arg1 string) ([]string, error) {
return p.UserRoles(arg0, arg1)
}

func (p PlankMock) ResyncFiat(string) error {
return nil
}
Expand Down
11 changes: 6 additions & 5 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ module github.com/armory-io/arm
go 1.12

require (
github.com/armory-io/dinghy v0.1.0-rc.4.0.20220125212255-403640bc88ad
github.com/armory/dinghy v0.0.0-20210622181016-cf2557851cd4
github.com/armory/plank/v4 v4.0.0
github.com/Masterminds/sprig/v3 v3.2.0 // indirect
github.com/armory-io/dinghy v0.1.0-rc.4.0.20231011141048-3380324ef645
github.com/armory-io/monitoring v0.0.7 // indirect
github.com/armory/dinghy v0.0.0-20230918080952-22ef6f78d576
github.com/armory/plank/v4 v4.1.2
github.com/aws/aws-sdk-go v1.30.15 // indirect
github.com/frankban/quicktest v1.7.2 // indirect
github.com/go-test/deep v1.0.2 // indirect
github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
github.com/hashicorp/vault/api v1.0.5-0.20200317185738-82f498082f02 // indirect
github.com/hashicorp/vault/sdk v0.1.14-0.20200406173424-43a93d4a43b1 // indirect
github.com/imdario/mergo v0.3.9 // indirect
github.com/magiconair/properties v1.8.1
github.com/mitchellh/mapstructure v1.2.3 // indirect
github.com/pelletier/go-toml v1.7.0 // indirect
Expand All @@ -30,5 +31,5 @@ require (
google.golang.org/grpc v1.29.1 // indirect
gopkg.in/ini.v1 v1.55.0 // indirect
gopkg.in/square/go-jose.v2 v2.5.0 // indirect
gopkg.in/yaml.v2 v2.2.8
gopkg.in/yaml.v2 v2.3.0
)
20 changes: 20 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,12 @@ github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RP
github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
github.com/Masterminds/semver/v3 v3.1.0 h1:Y2lUDsFKVRSYGojLJ1yLxSXdMmMYTYls0rCvoqmMUQk=
github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
github.com/Masterminds/sprig/v3 v3.1.0 h1:j7GpgZ7PdFqNsmncycTHsLmVPf5/3wJtlgW9TNDYD9Y=
github.com/Masterminds/sprig/v3 v3.1.0/go.mod h1:ONGMf7UfYGAbMXCZmQLy8x3lCDIPrEZE/rU8pmrbihA=
github.com/Masterminds/sprig/v3 v3.2.0 h1:P1ekkbuU73Ui/wS0nK1HOM37hh4xdfZo485UPf8rc+Y=
github.com/Masterminds/sprig/v3 v3.2.0/go.mod h1:tWhwTbUTndesPNeF0C900vKoq283u6zp4APT9vaF3SI=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/TV4/logrus-stackdriver-formatter v0.1.0/go.mod h1:wwS7hOiBvP6SBD0UXCa767+VhHkaXrfX0MzUojYcN0Q=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
Expand All @@ -51,21 +55,30 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26FmByPp2eC2qla6E1Tw+scpcg/to=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armory-io/dinghy v0.1.0-rc.4/go.mod h1:bWqvVQUEP1h4PFbT2omX5ugYbs1VECZMjCEbTd0SnFM=
github.com/armory-io/dinghy v0.1.0-rc.4.0.20210824174139-890f5eb120a3 h1:NS0RwCXsToqZgmMuEFnn7ptmWNye0JfhnREVaqXSUN8=
github.com/armory-io/dinghy v0.1.0-rc.4.0.20210824174139-890f5eb120a3/go.mod h1:hC/0nxOcE3rSpb9iTwo19YNmyKq35V1EuTvLZhgXiWY=
github.com/armory-io/dinghy v0.1.0-rc.4.0.20210909200842-9f3deb2352c2 h1:8lg7GdG/VGJvsIAwqunakfcFoinfSpiPXWV9qWIQreg=
github.com/armory-io/dinghy v0.1.0-rc.4.0.20210909200842-9f3deb2352c2/go.mod h1:hC/0nxOcE3rSpb9iTwo19YNmyKq35V1EuTvLZhgXiWY=
github.com/armory-io/dinghy v0.1.0-rc.4.0.20220125212255-403640bc88ad h1:lJvbWHPbHYMIiZi2SszlGG/Qa6X4eB+Ewg7zAJhZIiw=
github.com/armory-io/dinghy v0.1.0-rc.4.0.20220125212255-403640bc88ad/go.mod h1:hC/0nxOcE3rSpb9iTwo19YNmyKq35V1EuTvLZhgXiWY=
github.com/armory-io/dinghy v0.1.0-rc.4.0.20231011141048-3380324ef645 h1:tAEi9zajgIUBMMsG2FwQlMqPLh+99316oAQq9icQ+PI=
github.com/armory-io/dinghy v0.1.0-rc.4.0.20231011141048-3380324ef645/go.mod h1:8ZJzAuhqxsjDZ+o5CMxMPddWJfjNKYEQYhr4tvSXf7Q=
github.com/armory-io/monitoring v0.0.7 h1:IVVhiqhavr+yH2IXlMZMyqjhBb9Ms9L6qmKswLh+ODQ=
github.com/armory-io/monitoring v0.0.7/go.mod h1:EqWc/9ldt7teZxnS2xnAMJsthM7ldI4ArLnjBRGCYSo=
github.com/armory/dinghy v0.0.0-20210622181016-cf2557851cd4 h1:aQqzZ+/8WTJRLQTsqffCrO2DEMoIKy/qZTcsB39mti4=
github.com/armory/dinghy v0.0.0-20210622181016-cf2557851cd4/go.mod h1:3c+3anUaSrGyus99y4FkQ3T734yZyhX06/49UxlkrSM=
github.com/armory/dinghy v0.0.0-20230918080952-22ef6f78d576 h1:vI1VwEisJQkjunVw3OBbEhoC8mIkGzxX5ts6CHJ3lvg=
github.com/armory/dinghy v0.0.0-20230918080952-22ef6f78d576/go.mod h1:2ka23HyzUmHHsXcXErJfWfE4LY94LvRcKSD6oPVmemA=
github.com/armory/go-yaml-tools v0.0.0-20180620164822-5d0947924d8e/go.mod h1:rHIvkswnJs3bWHmIDC8l+JHHpChXI/jsJBjl2JNck2w=
github.com/armory/go-yaml-tools v0.0.2 h1:IYAbeGQJQKFwBAdl4u9IVrENgHjjUsOxZRSTvypgYk4=
github.com/armory/go-yaml-tools v0.0.2/go.mod h1:LasFFVo6zuV334Pmx7Diq9L3muOUUI8MF79QUFC1jq0=
github.com/armory/go-yaml-tools v1.0.1 h1:vy1XEtiEn8PYzKARMjq3BDUkYqhv5M90WGK8iX612Xs=
github.com/armory/go-yaml-tools v1.0.1/go.mod h1:LasFFVo6zuV334Pmx7Diq9L3muOUUI8MF79QUFC1jq0=
github.com/armory/plank/v4 v4.0.0 h1:1pGzeq4oq5fr5FL9Bo5NoRm3RLeQSLPNme7VwTMU5KU=
github.com/armory/plank/v4 v4.0.0/go.mod h1:xH8nrFDGCXEL+zZpLMxrdTq395DHvtrHgJmEdg9Ygo4=
github.com/armory/plank/v4 v4.1.2 h1:FwDazjvSE5S6BUZ/Pmr6wnis8/OixhDz2LTnGiOp/g0=
github.com/armory/plank/v4 v4.1.2/go.mod h1:xH8nrFDGCXEL+zZpLMxrdTq395DHvtrHgJmEdg9Ygo4=
github.com/aws/aws-lambda-go v1.23.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU=
github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.28.9/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
Expand Down Expand Up @@ -104,6 +117,7 @@ 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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
Expand Down Expand Up @@ -277,6 +291,8 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs=
Expand Down Expand Up @@ -419,6 +435,8 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/sirupsen/logrus v1.0.5 h1:8c8b5uO0zS4X6RPl/sd1ENwSkIc0/H2PaHxE3udaE8I=
github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
Expand Down Expand Up @@ -788,6 +806,8 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Expand Down
6 changes: 6 additions & 0 deletions vendor/github.com/Masterminds/semver/v3/CHANGELOG.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions vendor/github.com/Masterminds/semver/v3/constraints.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions vendor/github.com/Masterminds/sprig/v3/CHANGELOG.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 313a77d

Please sign in to comment.