Use static list of keys in model

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
Co-authored-by: Nont <9658731+nwnt@users.noreply.github.com>

Author: serathius

tests/robustness/model/describe.go

@@ -88,38 +88,61 @@ func describeEtcdState(state EtcdState) string {
 
 	descHTML = append(descHTML, fmt.Sprintf("<p style=\"margin: 0.25em 0;\">state, rev: %d, compactRev: %d</p>", state.Revision, state.CompactRevision))
 
-	if len(state.KeyValues) > 0 {
+	keys := []string{}
+	for i, v := range state.KeyValues {
+		if v == nil {
+			continue
+		}
+		keys = append(keys, state.Keys[i])
+	}
+
+	if len(keys) > 0 {
 		descHTML = append(descHTML, "keys: <ul style=\"margin: 0.25em 0;\">")
 
-		keys := slices.Collect(maps.Keys(state.KeyValues))
 		sort.Strings(keys)
 		for _, key := range keys {
 			descHTML = append(descHTML, fmt.Sprintf("<li style=\"margin: 0.25em 0;\"><strong>%s</strong> - ", key))
 
-			value := state.KeyValues[key]
+			value, _ := state.GetValue(key)
 			if value.Value.Value != "" {
 				descHTML = append(descHTML, fmt.Sprintf("val: %q, ", value.Value.Value))
 			}
 			if value.Value.Hash != 0 {
 				descHTML = append(descHTML, fmt.Sprintf("hash: %d, ", value.Value.Hash))
 			}
-			lease := state.KeyLeases[key]
-			if lease != 0 {
-				descHTML = append(descHTML, fmt.Sprintf("lease: %d, ", lease))
-			}
+			descHTML = append(descHTML, fmt.Sprintf("mod: %d, ver: %d", value.ModRevision, value.Version))
 
-			descHTML = append(descHTML, fmt.Sprintf("mod: %d, ver: %d</li>", value.ModRevision, value.Version))
+			for i, k := range state.Keys {
+				if k == key {
+					if state.KeyLeases[i] != nil {
+						descHTML = append(descHTML, fmt.Sprintf(", lease: %d", state.KeyLeases[i].LeaseID))
+					}
+					break
+				}
+			}
+			descHTML = append(descHTML, "</li>")
 		}
 
 		descHTML = append(descHTML, "</ul>")
 	}
 
-	if len(state.Leases) > 0 {
+	leasesMap := make(map[int64]struct{})
+	for _, l := range state.KeyLeases {
+		if l != nil {
+			leasesMap[l.LeaseID] = struct{}{}
+		}
+	}
+	for _, l := range state.Leases {
+		if l != nil {
+			leasesMap[l.LeaseID] = struct{}{}
+		}
+	}
+	if len(leasesMap) > 0 {
 		descHTML = append(descHTML, "leases: <ul style=\"margin: 0.25em 0;\">")
-		leases := slices.Collect(maps.Keys(state.Leases))
-		slices.Sort(leases)
-		for _, lease := range leases {
-			descHTML = append(descHTML, fmt.Sprintf("<li style=\"margin: 0.25em 0;\"><strong>%d</strong></li>", lease))
+		leaseIDs := slices.Collect(maps.Keys(leasesMap))
+		sort.Slice(leaseIDs, func(i, j int) bool { return leaseIDs[i] < leaseIDs[j] })
+		for _, id := range leaseIDs {
+			descHTML = append(descHTML, fmt.Sprintf("<li style=\"margin: 0.25em 0;\"><strong>%d</strong></li>", id))
 		}
 		descHTML = append(descHTML, "</ul>")
 	}

tests/robustness/model/describe_test.go

@@ -18,6 +18,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/anishathalye/porcupine"
 	"github.com/stretchr/testify/assert"
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
@@ -170,8 +171,13 @@ func TestModelDescribe(t *testing.T) {
 			expectDescribe: `range("key16".."key16b", limit=2) -> [], count: 0, rev: 16`,
 		},
 	}
+	ops := []porcupine.Operation{}
 	for _, tc := range tcs {
-		assert.Equal(t, tc.expectDescribe, NonDeterministicModel.DescribeOperation(tc.req, tc.resp))
+		ops = append(ops, porcupine.Operation{Input: tc.req, Output: tc.resp})
+	}
+	model := NonDeterministicModel(ModelKeys(ops))
+	for _, tc := range tcs {
+		assert.Equal(t, tc.expectDescribe, model.DescribeOperation(tc.req, tc.resp))
 	}
 }