bump polly and fix lua context binding (#487)

Author: zreigz

go.mod

@@ -37,10 +37,10 @@ require (
 	github.com/opencost/opencost/core v0.0.0-20241216191657-30e5d9a27f41
 	github.com/orcaman/concurrent-map/v2 v2.0.1
 	github.com/pkg/errors v0.9.1
-	github.com/pluralsh/console/go/client v1.46.1
+	github.com/pluralsh/console/go/client v1.46.4
 	github.com/pluralsh/controller-reconcile-helper v0.1.0
 	github.com/pluralsh/gophoenix v0.1.3-0.20231201014135-dff1b4309e34
-	github.com/pluralsh/polly v0.3.2
+	github.com/pluralsh/polly v0.3.3
 	github.com/prometheus/client_golang v1.21.1
 	github.com/sahilm/fuzzy v0.1.1
 	github.com/samber/lo v1.50.0

go.sum

@@ -1802,14 +1802,14 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
-github.com/pluralsh/console/go/client v1.46.1 h1:ozpSUpa8G3dNJVnN/YsFL/o/daliTz62lBqhVtT/Ljg=
-github.com/pluralsh/console/go/client v1.46.1/go.mod h1:8XlMMN3LLAN9JZo69f8X/XN7Qt1+aaKpgTvvQGfSiEU=
+github.com/pluralsh/console/go/client v1.46.4 h1:p9RXX5p0WQw4Zi545HVHyadXFy0trih1Y34otJvAblg=
+github.com/pluralsh/console/go/client v1.46.4/go.mod h1:8XlMMN3LLAN9JZo69f8X/XN7Qt1+aaKpgTvvQGfSiEU=
 github.com/pluralsh/controller-reconcile-helper v0.1.0 h1:BV3dYZFH5rn8ZvZjtpkACSv/GmLEtRftNQj/Y4ddHEo=
 github.com/pluralsh/controller-reconcile-helper v0.1.0/go.mod h1:RxAbvSB4/jkvx616krCdNQXPbpGJXW3J1L3rASxeFOA=
 github.com/pluralsh/gophoenix v0.1.3-0.20231201014135-dff1b4309e34 h1:ab2PN+6if/Aq3/sJM0AVdy1SYuMAnq4g20VaKhTm/Bw=
 github.com/pluralsh/gophoenix v0.1.3-0.20231201014135-dff1b4309e34/go.mod h1:IagWXKFYu6NTHzcJx2dJyrIlZ1Sv2PH3fhOtplA9qOs=
-github.com/pluralsh/polly v0.3.2 h1:IxlRazgvSn4pQsHrcYnkghWbBQZ9PVW+yBJTBByIT8Q=
-github.com/pluralsh/polly v0.3.2/go.mod h1:gk48el0JCoEV2FZXW5DV5FvlDf4G/01Wb+Py7attQjU=
+github.com/pluralsh/polly v0.3.3 h1:Vh8oc6Fvx/ZulVxZHUh160+G8dMSeoye6EpuENeC6b8=
+github.com/pluralsh/polly v0.3.3/go.mod h1:gk48el0JCoEV2FZXW5DV5FvlDf4G/01Wb+Py7attQjU=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

pkg/manifests/template/helm_test.go

@@ -20,8 +20,10 @@ var _ = Describe("Helm template", func() {
 		Namespace: "default",
 		Name:      "test",
 		Cluster: &console.ServiceDeploymentForAgent_Cluster{
-			ID:   "123",
-			Name: "test",
+			ID:             "123",
+			Name:           "test",
+			Version:        lo.ToPtr("1.2.3"),
+			CurrentVersion: lo.ToPtr("4.5.6"),
 		},
 	}
 
@@ -90,6 +92,8 @@ var _ = Describe("Helm template", func() {
 			values = {}
 			values["name"] = "new-name"
 			values["namespace"] = "new-namespace"
+			values["version"] = cluster.version
+			values["currentVersion"] = cluster.currentVersion
 `)
 
 			resp, err = NewHelm(dir).Render(svc, utilFactory)
@@ -98,6 +102,9 @@ var _ = Describe("Helm template", func() {
 
 			Expect(resp[0].GetName()).To(Equal("new-name"))
 			Expect(resp[0].GetNamespace()).To(Equal("new-namespace"))
+
+			Expect(resp[0].GetLabels()["version"]).To(Equal("1.2.3"))
+			Expect(resp[0].GetLabels()["currentVersion"]).To(Equal("4.5.6"))
 		})
 
 		It("should successfully render handle lua errors", func() {

test/helm/lua/templates/deployment.yaml

@@ -3,6 +3,9 @@ kind: Deployment
 metadata:
   name: {{ .Values.name }}
   namespace: {{ .Values.namespace }}
+  labels:
+    version: {{ .Values.version }}
+    currentVersion: {{ .Values.currentVersion }}
 spec:
   replicas: 1
   selector:

test/helm/lua/values.yaml

@@ -1,2 +1,4 @@
 name: myapp
-namespace: default
+namespace: default
+version: 0.0.0
+currentVersion: 0.0.0