misc: sort type properties before generating.

[jmcarp]

In order to support deterministic generated code, sort the keys in the type properties map before generating.

[jmcarp]

Testing locally. First, generate the sdk multiple types, and print diffs if found:

❯ for ix in {1..10}; do echo $ix; make generate >/dev/null; git diff --exit-code; done

1
2
3
4
5
6
7
8
9
10

Doing the same thing on main:

❯ for ix in {1..10}; do echo $ix; make generate >/dev/null; git diff --exit-code; done

1
2
diff --git a/oxide/types.go b/oxide/types.go
index 5911f85..528188d 100644
--- a/oxide/types.go
+++ b/oxide/types.go
@@ -201,9 +201,6 @@ type AffinityGroupCreate struct {
 	Policy AffinityPolicy `json:"policy,omitempty" yaml:"policy,omitempty"`
 }
 
-// AffinityGroupMemberType is the type definition for a AffinityGroupMemberType.
-type AffinityGroupMemberType string
-
 // AffinityGroupMemberValue is the type definition for a AffinityGroupMemberValue.
 //
 // Required fields:
@@ -223,6 +220,9 @@ type AffinityGroupMemberValue struct {
 	RunState InstanceState `json:"run_state,omitempty" yaml:"run_state,omitempty"`
 }
 
+// AffinityGroupMemberType is the type definition for a AffinityGroupMemberType.
+type AffinityGroupMemberType string
+
 // AffinityGroupMemberInstance is an instance belonging to this group
 //
 // Instances can belong to up to 16 affinity groups.
3
4
5
6
7
8
diff --git a/oxide/types.go b/oxide/types.go
index 5911f85..528188d 100644
--- a/oxide/types.go
+++ b/oxide/types.go
@@ -201,9 +201,6 @@ type AffinityGroupCreate struct {
 	Policy AffinityPolicy `json:"policy,omitempty" yaml:"policy,omitempty"`
 }
 
-// AffinityGroupMemberType is the type definition for a AffinityGroupMemberType.
-type AffinityGroupMemberType string
-
 // AffinityGroupMemberValue is the type definition for a AffinityGroupMemberValue.
 //
 // Required fields:
@@ -223,6 +220,9 @@ type AffinityGroupMemberValue struct {
 	RunState InstanceState `json:"run_state,omitempty" yaml:"run_state,omitempty"`
 }
 
+// AffinityGroupMemberType is the type definition for a AffinityGroupMemberType.
+type AffinityGroupMemberType string
+
 // AffinityGroupMemberInstance is an instance belonging to this group
 //
 // Instances can belong to up to 16 affinity groups.
9
10
diff --git a/oxide/types.go b/oxide/types.go
index 5911f85..528188d 100644
--- a/oxide/types.go
+++ b/oxide/types.go
@@ -201,9 +201,6 @@ type AffinityGroupCreate struct {
 	Policy AffinityPolicy `json:"policy,omitempty" yaml:"policy,omitempty"`
 }
 
-// AffinityGroupMemberType is the type definition for a AffinityGroupMemberType.
-type AffinityGroupMemberType string
-
 // AffinityGroupMemberValue is the type definition for a AffinityGroupMemberValue.
 //
 // Required fields:
@@ -223,6 +220,9 @@ type AffinityGroupMemberValue struct {
 	RunState InstanceState `json:"run_state,omitempty" yaml:"run_state,omitempty"`
 }
 
+// AffinityGroupMemberType is the type definition for a AffinityGroupMemberType.
+type AffinityGroupMemberType string
+
 // AffinityGroupMemberInstance is an instance belonging to this group
 //
 // Instances can belong to up to 16 affinity groups.

[sudomateo]

You can update this body to be the following. Alternatively, you can eliminate this function and use this at each call site. Either way works for me so I'll approve this and defer to you!

Suggested change

	keys := slices.Collect(maps.Keys(m))
	sort.Strings(keys)
	return keys
	keys := slices.Sorted(maps.Keys(m))
	return keys