APIGOV-26035 - Fix to guard owner.type check when not set in the resource (#670)

Author: vivekschauhan

pkg/apic/apiserver/models/api/v1/owner.go

@@ -46,7 +46,7 @@ func (o *Owner) MarshalJSON() ([]byte, error) {
 	var t string
 	var ok bool
 	if t, ok = ownerTypeToString[o.Type]; !ok {
-		return nil, fmt.Errorf("unknown owner type %d", o.Type)
+		t = ownerTypeToString[TeamOwner]
 	}
 
 	aux := struct {
@@ -74,11 +74,15 @@ func (o *Owner) UnmarshalJSON(bytes []byte) error {
 		return err
 	}
 
-	ownerString, ok := ownerTypeFromString[aux.Type]
-	if !ok {
-		return fmt.Errorf("unknown owner type %s", aux.Type)
+	ownerType := TeamOwner
+	if aux.Type != "" {
+		var ok bool
+		ownerType, ok = ownerTypeFromString[aux.Type]
+		if !ok {
+			return fmt.Errorf("unknown owner type %s", aux.Type)
+		}
 	}
-	o.Type = ownerString
+	o.Type = ownerType
 	o.ID = aux.ID
 	o.Organization = aux.Organization
 

pkg/apic/apiserver/models/api/v1/owner_test.go

@@ -9,7 +9,6 @@ import (
 
 func TestOwner_MarshalJSON(t *testing.T) {
 	o := &Owner{}
-	o.SetType(TeamOwner)
 	o.SetID("123")
 
 	b, err := o.MarshalJSON()
@@ -21,7 +20,26 @@ func TestOwner_MarshalJSON(t *testing.T) {
 	assert.Equal(t, o.Type, o2.Type)
 	assert.Equal(t, o.ID, o2.ID)
 
+	o = &Owner{}
+	o.SetType(TeamOwner)
+	o.SetID("123")
+
+	b, err = o.MarshalJSON()
+	assert.Nil(t, err)
+
+	o2 = &Owner{}
+	err = json.Unmarshal(b, o2)
+	assert.Nil(t, err)
+	assert.Equal(t, o.Type, o2.Type)
+	assert.Equal(t, o.ID, o2.ID)
+
 	invalid := []byte(`{"type":"fake","id":"123"}`)
 	err = json.Unmarshal(invalid, o2)
 	assert.NotNilf(t, err, "should fail when given an invalid type")
+
+	validNoOwnerType := []byte(`{"id":"123"}`)
+	err = json.Unmarshal(validNoOwnerType, o2)
+	assert.Nil(t, err)
+	assert.Equal(t, o.Type, TeamOwner)
+	assert.Equal(t, o.ID, o2.ID)
 }