Skip to content

Commit 15b251e

Browse files
authored
bump polly to v0.3.2 (#486)
1 parent f275a95 commit 15b251e

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ require (
4040
github.com/pluralsh/console/go/client v1.46.1
4141
github.com/pluralsh/controller-reconcile-helper v0.1.0
4242
github.com/pluralsh/gophoenix v0.1.3-0.20231201014135-dff1b4309e34
43-
github.com/pluralsh/polly v0.3.1
43+
github.com/pluralsh/polly v0.3.2
4444
github.com/prometheus/client_golang v1.21.1
4545
github.com/sahilm/fuzzy v0.1.1
4646
github.com/samber/lo v1.50.0
@@ -86,7 +86,7 @@ require (
8686
cloud.google.com/go/iam v1.2.2 // indirect
8787
cloud.google.com/go/monitoring v1.21.2 // indirect
8888
cloud.google.com/go/storage v1.49.0 // indirect
89-
dario.cat/mergo v1.0.1 // indirect
89+
dario.cat/mergo v1.0.2 // indirect
9090
github.com/4meepo/tagalign v1.4.1 // indirect
9191
github.com/99designs/gqlgen v0.17.64 // indirect
9292
github.com/Abirdcfly/dupword v0.1.3 // indirect

go.sum

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -618,8 +618,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS
618618
cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M=
619619
cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA=
620620
cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
621-
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
622-
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
621+
dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
622+
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
623623
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
624624
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
625625
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
@@ -1808,10 +1808,8 @@ github.com/pluralsh/controller-reconcile-helper v0.1.0 h1:BV3dYZFH5rn8ZvZjtpkACS
18081808
github.com/pluralsh/controller-reconcile-helper v0.1.0/go.mod h1:RxAbvSB4/jkvx616krCdNQXPbpGJXW3J1L3rASxeFOA=
18091809
github.com/pluralsh/gophoenix v0.1.3-0.20231201014135-dff1b4309e34 h1:ab2PN+6if/Aq3/sJM0AVdy1SYuMAnq4g20VaKhTm/Bw=
18101810
github.com/pluralsh/gophoenix v0.1.3-0.20231201014135-dff1b4309e34/go.mod h1:IagWXKFYu6NTHzcJx2dJyrIlZ1Sv2PH3fhOtplA9qOs=
1811-
github.com/pluralsh/polly v0.3.0 h1:bAy+QCqHGNseCWaxwBRWM6sj7tNJNUpREoQ7vzxszOY=
1812-
github.com/pluralsh/polly v0.3.0/go.mod h1:uPZ7V76dzahVot6m+MOA3Y9iY0oBBoHuzUYFkJ4DnsQ=
1813-
github.com/pluralsh/polly v0.3.1 h1:uE4+xI3opn4a/doCyY3V8Wa1h1zN+7nOb3gnsKG0CvQ=
1814-
github.com/pluralsh/polly v0.3.1/go.mod h1:uPZ7V76dzahVot6m+MOA3Y9iY0oBBoHuzUYFkJ4DnsQ=
1811+
github.com/pluralsh/polly v0.3.2 h1:IxlRazgvSn4pQsHrcYnkghWbBQZ9PVW+yBJTBByIT8Q=
1812+
github.com/pluralsh/polly v0.3.2/go.mod h1:gk48el0JCoEV2FZXW5DV5FvlDf4G/01Wb+Py7attQjU=
18151813
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
18161814
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
18171815
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

pkg/manifests/template/helm.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,18 +201,18 @@ func (h *helm) luaValues(svc *console.ServiceDeploymentForAgent) (map[string]int
201201
return newValues, valuesFiles, nil
202202
}
203203

204-
p := luautils.NewProcessor(h.dir)
205-
defer p.L.Close()
204+
L := luautils.NewLuaState(h.dir)
205+
defer L.Close()
206206

207207
// Register global values and valuesFiles in Lua
208-
valuesTable := p.L.NewTable()
209-
p.L.SetGlobal("values", valuesTable)
208+
valuesTable := L.NewTable()
209+
L.SetGlobal("values", valuesTable)
210210

211-
valuesFilesTable := p.L.NewTable()
212-
p.L.SetGlobal("valuesFiles", valuesFilesTable)
211+
valuesFilesTable := L.NewTable()
212+
L.SetGlobal("valuesFiles", valuesFilesTable)
213213

214214
for name, binding := range bindings(svc) {
215-
p.L.SetGlobal(name, luautils.GoValueToLuaValue(p.L, binding))
215+
L.SetGlobal(name, luautils.GoValueToLuaValue(L, binding))
216216
}
217217

218218
var luaString string
@@ -230,16 +230,16 @@ func (h *helm) luaValues(svc *console.ServiceDeploymentForAgent) (map[string]int
230230
}
231231

232232
// Execute the Lua script
233-
err := p.L.DoString(luaString)
233+
err := L.DoString(luaString)
234234
if err != nil {
235235
return nil, valuesFiles, err
236236
}
237237

238-
if err := luautils.MapLua(p.L.GetGlobal("values").(*lua.LTable), &newValues); err != nil {
238+
if err := luautils.MapLua(L.GetGlobal("values").(*lua.LTable), &newValues); err != nil {
239239
return nil, valuesFiles, err
240240
}
241241

242-
if err := luautils.MapLua(p.L.GetGlobal("valuesFiles").(*lua.LTable), &valuesFiles); err != nil {
242+
if err := luautils.MapLua(L.GetGlobal("valuesFiles").(*lua.LTable), &valuesFiles); err != nil {
243243
return nil, valuesFiles, err
244244
}
245245

0 commit comments

Comments
 (0)