Merge pull request #39 from jaypipes/panic-int-conversion

address int/uint conversion panic

Author: jaypipes

compare.go

@@ -325,11 +325,21 @@ func collectFieldDifferences(
 		return
 	case string:
 		switch subject.(type) {
-		case int, int8, int16, int32, int64,
-			uint, uint8, uint16, uint32, uint64:
+		case int, int8, int16, int32, int64:
+			mv := match.(string)
+			si := toInt64(subject)
+			sv := strconv.FormatInt(si, 10)
+			if mv != sv {
+				diff := fmt.Sprintf(
+					"%s had different values. expected %v but found %v",
+					fp, match, subject,
+				)
+				delta.Add(diff)
+			}
+		case uint, uint8, uint16, uint32, uint64:
 			mv := match.(string)
-			si := subject.(int)
-			sv := strconv.Itoa(si)
+			si := toUint64(subject)
+			sv := strconv.FormatUint(si, 10)
 			if mv != sv {
 				diff := fmt.Sprintf(
 					"%s had different values. expected %v but found %v",

eval_test.go

@@ -164,6 +164,28 @@ func TestKindPodCreateGetDelete(t *testing.T) {
 	require.Nil(err)
 }
 
+func TestKindStatefulSetCreateGetDelete(t *testing.T) {
+	testutil.SkipIfNoKind(t)
+	require := require.New(t)
+
+	fp := filepath.Join("testdata", "kind", "create-get-delete-statefulset.yaml")
+	f, err := os.Open(fp)
+	require.Nil(err)
+	defer f.Close() // nolint:errcheck
+
+	s, err := scenario.FromReader(f, scenario.WithPath(fp))
+	require.Nil(err)
+	require.NotNil(s)
+
+	var b bytes.Buffer
+	w := bufio.NewWriter(&b)
+	ctx := gdtcontext.New(gdtcontext.WithDebug(w))
+	ctx = gdtcontext.RegisterFixture(ctx, "kind", stdKindFix)
+
+	err = s.Run(ctx, t)
+	require.Nil(err)
+}
+
 func TestKindMatches(t *testing.T) {
 	testutil.SkipIfNoKind(t)
 	require := require.New(t)
@@ -308,6 +330,28 @@ func TestKindVarSaveRestore(t *testing.T) {
 	require.Nil(err)
 }
 
+func TestKindVarPanicIntConversion(t *testing.T) {
+	testutil.SkipIfNoKind(t)
+	require := require.New(t)
+
+	fp := filepath.Join("testdata", "kind", "var-panic-int-conversion.yaml")
+	f, err := os.Open(fp)
+	require.Nil(err)
+	defer f.Close() // nolint:errcheck
+
+	s, err := scenario.FromReader(f, scenario.WithPath(fp))
+	require.Nil(err)
+	require.NotNil(s)
+
+	var b bytes.Buffer
+	w := bufio.NewWriter(&b)
+	ctx := gdtcontext.New(gdtcontext.WithDebug(w))
+	ctx = gdtcontext.RegisterFixture(ctx, "kind", stdKindFix)
+
+	err = s.Run(ctx, t)
+	require.Nil(err)
+}
+
 func TestKindCurlPodIP(t *testing.T) {
 	testutil.SkipIfNoKind(t)
 	require := require.New(t)

go.mod

@@ -4,7 +4,7 @@ go 1.24.3
 
 require (
 	github.com/cenkalti/backoff v2.2.1+incompatible
-	github.com/gdt-dev/core v1.12.1
+	github.com/gdt-dev/core v1.12.2
 	github.com/samber/lo v1.52.0
 	github.com/stretchr/testify v1.11.1
 	github.com/theory/jsonpath v0.10.1

go.sum

@@ -21,8 +21,8 @@ github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjT
 github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
 github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
 github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
-github.com/gdt-dev/core v1.12.1 h1:nW6/+aY42ZpQZaWbKwDQyYt10XXwZj0scV5ca3NMAnY=
-github.com/gdt-dev/core v1.12.1/go.mod h1:hGXsI+PXavvLkm0BQIYKZ1O3yRw86m/VD2xFiNwFR/Y=
+github.com/gdt-dev/core v1.12.2 h1:qzbLiEbcon83Z+WU/meK2H7QNtTrQpT5Xv0ZIcfrFhQ=
+github.com/gdt-dev/core v1.12.2/go.mod h1:hGXsI+PXavvLkm0BQIYKZ1O3yRw86m/VD2xFiNwFR/Y=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=

testdata/kind/create-get-delete-statefulset.yaml

@@ -0,0 +1,18 @@
+name: create-get-delete-statefulset
+description: test create, get, delete for statefulset
+
+tests:
+  - name: create-statefulset
+    kube:
+      create: ../manifests/nginx-statefulset.yaml
+  - name: statefulset-exists
+    kube:
+      get: statefulsets/nginx-ss
+  - name: delete-statefulset
+    kube:
+      delete: statefulsets/nginx-ss
+  - name: statefulset-no-longer-exists
+    kube:
+      get: statefulsets/nginx-ss
+    assert:
+      notfound: true

testdata/kind/var-panic-int-conversion.yaml

@@ -0,0 +1,29 @@
+name: variable-panic-int-conversion
+description: "test for issue gdt-dev/core#72 - panic in ReplaceVariables on int conversion"
+
+tests:
+  - name: create nginx statefulset
+    kube:
+      create: ../manifests/nginx-statefulset.yaml
+
+  # Prior to the fix for gdt-dev/core#72, this test case caused a panic in
+  # gdt-dev/core/context.ReplaceVariables()
+  - name: get nginx statefulset
+    kube.get:
+      type: statefulsets
+      labels:
+        app: nginx
+    require:
+      len: 1
+    var:
+      SS_NAME:
+        from: $[0].metadata.name
+      DESIRED_REPLICAS:
+        from: $[0].spec.replicas
+
+  - name: verify nginx statefulset ready
+    kube.get: statefulsets/$$SS_NAME
+    require:
+      matches:
+        status:
+          readyReplicas: $$DESIRED_REPLICAS

testdata/manifests/nginx-statefulset.yaml

@@ -0,0 +1,21 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: nginx-ss
+  labels:
+    app: nginx
+spec:
+  selector:
+    matchLabels:
+      app: nginx
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+      - name: nginx
+        image: nginx
+        ports:
+        - containerPort: 80