Fix tests.

Author: jmcarp

internal/generate/test_utils/types_output

@@ -11,16 +11,12 @@ type DiskCreate struct {
 	DiskSource DiskSource `json:"disk_source,omitempty" yaml:"disk_source,omitempty"`
 }
 
-func (DiskCreate) isDiskCreate() {}
-
 // DiskIdentifier is parameters for the [`Disk`](omicron_common::api::external::Disk) to be attached or
 // detached to an instance
 type DiskIdentifier struct {
 	Name Name `json:"name,omitempty" yaml:"name,omitempty"`
 }
 
-func (DiskIdentifier) isDiskIdentifier() {}
-
 // DiskSourceType is the type definition for a DiskSourceType.
 type DiskSourceType string
 // DiskSourceSnapshot is create a disk from a disk snapshot
@@ -29,16 +25,12 @@ type DiskSourceSnapshot struct {
 	Type DiskSourceType `json:"type,omitempty" yaml:"type,omitempty"`
 }
 
-func (DiskSourceSnapshot) isDiskSourceSnapshot() {}
-
 // DiskSourceImage is create a disk from a project image
 type DiskSourceImage struct {
 	ImageId string `json:"image_id,omitempty" yaml:"image_id,omitempty"`
 	Type DiskSourceType `json:"type,omitempty" yaml:"type,omitempty"`
 }
 
-func (DiskSourceImage) isDiskSourceImage() {}
-
 // DiskSource is the type definition for a DiskSource.
 type DiskSource struct {
 	// SnapshotId is the type definition for a SnapshotId.

internal/generate/types_test.go

@@ -273,7 +273,10 @@ func Test_createOneOf(t *testing.T) {
 					},
 				},
 				{
-					Description: "// ImageSource is the source of the underlying image.", Name: "ImageSource", Type: "struct", Fields: []TypeFields{
+					Description:       "// ImageSource is the source of the underlying image.",
+					Name:              "ImageSource",
+					Type:              "struct",
+					Fields: []TypeFields{
 						{
 							Description: "// Type is the type definition for a Type.", Name: "Type", Type: "ImageSourceType", SerializationInfo: "`json:\"type,omitempty\" yaml:\"type,omitempty\"`",
 						},
@@ -284,6 +287,12 @@ func Test_createOneOf(t *testing.T) {
 							Description: "// Id is the type definition for a Id.", Name: "Id", Type: "string", SerializationInfo: "`json:\"id,omitempty\" yaml:\"id,omitempty\"`",
 						},
 					},
+					DiscriminatorKey:  "type",
+					DiscriminatorType: "ImageSourceType",
+					DiscriminatorMappings: []DiscriminatorMapping{
+						{EnumConstant: "ImageSourceTypeUrl", ConcreteType: "ImageSourceUrl"},
+						{EnumConstant: "ImageSourceTypeSnapshot", ConcreteType: "ImageSourceSnapshot"},
+					},
 				},
 			},
 			want1: []EnumTemplate{