with pointer field/omitempty instead of instance

Signed-off-by: grokspawn <[email protected]>

Author: grokspawn

alpha/declcfg/declcfg_to_model.go

@@ -147,7 +147,9 @@ func ConvertToModel(cfg DeclarativeConfig) (model.Model, error) {
 				mb.Objects = b.Objects
 				mb.PropertiesP = props
 				mb.Version = ver
-				mb.Release = props.Packages[0].Release
+				if props.Packages[0].Release != nil {
+					mb.Release = *(props.Packages[0].Release)
+				}
 			}
 		}
 		if !found {

alpha/property/property.go

@@ -45,7 +45,7 @@ type Release struct {
 type Package struct {
 	PackageName string  `json:"packageName"`
 	Version     string  `json:"version"`
-	Release     Release `json:"release,omitzero"`
+	Release     *Release `json:"release,omitempty"`
 }
 
 // NOTICE: The Channel properties are for internal use only.
@@ -256,7 +256,7 @@ func MustBuildPackage(name, version string) Property {
 	return MustBuild(&Package{PackageName: name, Version: version})
 }
 func MustBuildPackageRelease(name, version, relLabel, relVersion string) Property {
-	return MustBuild(&Package{PackageName: name, Version: version, Release: Release{Label: relLabel, Version: semver.MustParse(relVersion)}})
+	return MustBuild(&Package{PackageName: name, Version: version, Release: &Release{Label: relLabel, Version: semver.MustParse(relVersion)}})
 }
 func MustBuildPackageRequired(name, versionRange string) Property {
 	return MustBuild(&PackageRequired{name, versionRange})

alpha/property/property_test.go

@@ -213,7 +213,7 @@ func TestBuild(t *testing.T) {
 		},
 		{
 			name:             "Success/Package-ReleaseVersion",
-			input:            &Package{PackageName: "name", Version: "0.1.0", Release: Release{Label: "alpha-whatsit", Version: semver.MustParse("1.1.0-bluefoot")}},
+			input:            &Package{PackageName: "name", Version: "0.1.0", Release: &Release{Label: "alpha-whatsit", Version: semver.MustParse("1.1.0-bluefoot")}},
 			assertion:        require.NoError,
 			expectedProperty: propPtr(MustBuildPackageRelease("name", "0.1.0", "alpha-whatsit", "1.1.0-bluefoot")),
 		},