imageservice: Avoid using pointers for the Image fields

Signed-off-by: Samuel Ortiz <[email protected]>

Author: Samuel Ortiz

openstack/imageservice/v2/images/requests_test.go

@@ -33,7 +33,7 @@ func TestListImage(t *testing.T) {
 		}
 
 		for _, i := range images {
-			t.Logf("%s\t%s\t%s\t%s\t%v\t\n", i.ID, i.Name, *(i.Owner), *(i.Checksum), i.SizeBytes)
+			t.Logf("%s\t%s\t%s\t%s\t%v\t\n", i.ID, i.Name, i.Owner, i.Checksum, i.SizeBytes)
 			count++
 		}
 
@@ -76,13 +76,13 @@ func TestCreateImage(t *testing.T) {
 
 		Status: ImageStatusQueued,
 
-		ContainerFormat: &containerFormat,
-		DiskFormat:      &diskFormat,
+		ContainerFormat: containerFormat,
+		DiskFormat:      diskFormat,
 
-		MinDiskGigabytes: &minDiskGigabytes,
-		MinRAMMegabytes:  &minRAMMegabytes,
+		MinDiskGigabytes: minDiskGigabytes,
+		MinRAMMegabytes:  minRAMMegabytes,
 
-		Owner: &owner,
+		Owner: owner,
 
 		Visibility: ImageVisibilityPrivate,
 
@@ -123,13 +123,13 @@ func TestCreateImageNulls(t *testing.T) {
 
 		Status: ImageStatusQueued,
 
-		ContainerFormat: &containerFormat,
-		DiskFormat:      &diskFormat,
+		ContainerFormat: containerFormat,
+		DiskFormat:      diskFormat,
 
-		MinDiskGigabytes: &minDiskGigabytes,
-		MinRAMMegabytes:  &minRAMMegabytes,
+		MinDiskGigabytes: minDiskGigabytes,
+		MinRAMMegabytes:  minRAMMegabytes,
 
-		Owner: &owner,
+		Owner: owner,
 
 		Visibility: ImageVisibilityPrivate,
 
@@ -165,19 +165,19 @@ func TestGetImage(t *testing.T) {
 
 		Status: ImageStatusActive,
 
-		ContainerFormat: &containerFormat,
-		DiskFormat:      &diskFormat,
+		ContainerFormat: containerFormat,
+		DiskFormat:      diskFormat,
 
-		MinDiskGigabytes: &minDiskGigabytes,
-		MinRAMMegabytes:  &minRAMMegabytes,
+		MinDiskGigabytes: minDiskGigabytes,
+		MinRAMMegabytes:  minRAMMegabytes,
 
-		Owner: &owner,
+		Owner: owner,
 
 		Protected:  false,
 		Visibility: ImageVisibilityPublic,
 
-		Checksum:  &checksum,
-		SizeBytes: &sizeBytes,
+		Checksum:  checksum,
+		SizeBytes: sizeBytes,
 
 		Metadata:   make(map[string]string),
 		Properties: make(map[string]string),
@@ -218,20 +218,20 @@ func TestUpdateImage(t *testing.T) {
 		Status:     ImageStatusActive,
 		Visibility: ImageVisibilityPublic,
 
-		SizeBytes: &sizebytes,
-		Checksum:  &checksum,
+		SizeBytes: sizebytes,
+		Checksum:  checksum,
 
 		Tags: []string{
 			"fedora",
 			"beefy",
 		},
 
-		Owner:            nil,
-		MinRAMMegabytes:  nil,
-		MinDiskGigabytes: nil,
+		Owner:            "",
+		MinRAMMegabytes:  0,
+		MinDiskGigabytes: 0,
 
-		DiskFormat:      nil,
-		ContainerFormat: nil,
+		DiskFormat:      "",
+		ContainerFormat: "",
 
 		Metadata:   make(map[string]string),
 		Properties: make(map[string]string),

openstack/imageservice/v2/images/results.go

@@ -22,19 +22,19 @@ type Image struct {
 
 	Tags []string
 
-	ContainerFormat *string
-	DiskFormat      *string
+	ContainerFormat string
+	DiskFormat      string
 
-	MinDiskGigabytes *int
-	MinRAMMegabytes  *int
+	MinDiskGigabytes int
+	MinRAMMegabytes  int
 
-	Owner *string
+	Owner string
 
 	Protected  bool
 	Visibility ImageVisibility
 
-	Checksum  *string
-	SizeBytes *int
+	Checksum  string
+	SizeBytes int
 
 	Metadata   map[string]string
 	Properties map[string]string
@@ -68,37 +68,37 @@ func asString(any interface{}, key string) (string, error) {
 	return "", fmt.Errorf("expected string value for key '%s', but found: %#v", key, any)
 }
 
-func asNoneableString(any interface{}, key string) (*string, error) {
+func asNoneableString(any interface{}, key string) (string, error) {
 	// JSON null values could be also returned according to behaviour https://bugs.launchpad.net/glance/+bug/1481512
 	if any == nil {
-		return nil, nil
+		return "", nil
 	}
 	if str, ok := any.(string); ok {
 		if str == "None" || &str == nil {
-			return nil, nil
+			return "", nil
 		}
-		return &str, nil
+		return str, nil
 	}
-	return nil, fmt.Errorf("expected string value for key '%s', but found: %#v", key, any)
+	return "", fmt.Errorf("expected string value for key '%s', but found: %#v", key, any)
 }
 
-func asNoneableInteger(any interface{}, key string) (*int, error) {
+func asNoneableInteger(any interface{}, key string) (int, error) {
 	// FIXME problem here is that provider_client.go uses: json.NewDecoder(resp.Body).Decode(options.JSONResponse)
 	// which apparently converts integers in JSON to float64 values
 	// JSON null values could be also returned according to behaviour https://bugs.launchpad.net/glance/+bug/1481512
 	if any == nil {
-		return nil, nil
+		return 0, nil
 	}
 	if f, ok := any.(float64); ok {
 		i := int(f)
-		return &i, nil
+		return i, nil
 	} else if s, ok := any.(string); ok {
 		if s == "None" {
-			return nil, nil
+			return 0, nil
 		}
-		return nil, fmt.Errorf("expected \"None\" or integer value for key '%s', but found unexpected string: \"%s\"", key, s)
+		return 0, fmt.Errorf("expected \"None\" or integer value for key '%s', but found unexpected string: \"%s\"", key, s)
 	}
-	return nil, fmt.Errorf("expected \"None\" or integer value for key '%s', but found: %T(%#v)", key, any, any)
+	return 0, fmt.Errorf("expected \"None\" or integer value for key '%s', but found: %T(%#v)", key, any, any)
 }
 
 func asMapStringString(any interface{}) (map[string]string, error) {
@@ -129,18 +129,18 @@ func extractStringAtKey(m map[string]interface{}, k string) (string, error) {
 	return "", fmt.Errorf("expected key \"%s\" in map, but this key is not present", k)
 }
 
-func extractNoneableStringAtKey(m map[string]interface{}, k string) (*string, error) {
+func extractNoneableStringAtKey(m map[string]interface{}, k string) (string, error) {
 	if any, ok := m[k]; ok {
 		return asNoneableString(any, k)
 	}
-	return nil, fmt.Errorf("expected key \"%s\" in map, but this key is not present", k)
+	return "", fmt.Errorf("expected key \"%s\" in map, but this key is not present", k)
 }
 
-func extractNoneableIntegerAtKey(m map[string]interface{}, k string) (*int, error) {
+func extractNoneableIntegerAtKey(m map[string]interface{}, k string) (int, error) {
 	if any, ok := m[k]; ok {
 		return asNoneableInteger(any, k)
 	}
-	return nil, fmt.Errorf("expected key \"%s\" in map, but this key is not present", k)
+	return 0, fmt.Errorf("expected key \"%s\" in map, but this key is not present", k)
 }
 
 func extractStringSliceAtKey(m map[string]interface{}, key string) ([]string, error) {