Add optional.Int, optional.Bool, and optional.Restore*

Author: mdbooth

pkg/utils/optional/conversion.go

@@ -20,6 +20,24 @@ import (
 	"k8s.io/apimachinery/pkg/conversion"
 )
 
+func RestoreString(previous, dst *String) {
+	if *dst == nil || **dst == "" {
+		*dst = *previous
+	}
+}
+
+func RestoreInt(previous, dst *Int) {
+	if *dst == nil || **dst == 0 {
+		*dst = *previous
+	}
+}
+
+func RestoreBool(previous, dst *Bool) {
+	if *dst == nil || !**dst {
+		*dst = *previous
+	}
+}
+
 func Convert_string_To_optional_String(in *string, out *String, _ conversion.Scope) error {
 	// NOTE: This function has the opposite defaulting behaviour to
 	// Convert_string_to_Pointer_string defined in apimachinery: it converts
@@ -41,3 +59,39 @@ func Convert_optional_String_To_string(in *String, out *string, _ conversion.Sco
 	}
 	return nil
 }
+
+func Convert_int_To_optional_Int(in *int, out *Int, _ conversion.Scope) error {
+	if *in == 0 {
+		*out = nil
+	} else {
+		*out = in
+	}
+	return nil
+}
+
+func Convert_optional_Int_To_int(in *Int, out *int, _ conversion.Scope) error {
+	if *in == nil {
+		*out = 0
+	} else {
+		*out = **in
+	}
+	return nil
+}
+
+func Convert_bool_To_optional_Bool(in *bool, out *Bool, _ conversion.Scope) error {
+	if !*in {
+		*out = nil
+	} else {
+		*out = in
+	}
+	return nil
+}
+
+func Convert_optional_Bool_To_bool(in *Bool, out *bool, _ conversion.Scope) error {
+	if *in == nil {
+		*out = false
+	} else {
+		*out = **in
+	}
+	return nil
+}

pkg/utils/optional/types.go

@@ -19,4 +19,16 @@ package optional
 // String is a string that can be unspecified. strings which are converted to
 // optional.String during API conversion will be converted to nil if the value
 // was previously the empty string.
+// +optional.
 type String *string
+
+// Int is an int that can be unspecified. ints which are converted to
+// optional.Int during API conversion will be converted to nil if the value
+// was previously 0.
+// +optional.
+type Int *int
+
+// Bool is a bool that can be unspecified. bools which are converted to
+// optional.Bool during API conversion will be converted to nil if the value
+// was previously false.
+type Bool *bool