Merge pull request #1379 from itsdax/master

cloudflare · Aug 28, 2023 · 87e330f · 87e330f
2 parents e295c7f + 22d143a
commit 87e330f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.changelog/1379.txt b/.changelog/1379.txt
@@ -0,0 +1,7 @@
+```release-note:bug
+images: Fix issue parsing Image Details from API due to incorrect struct json field
+```
+
+```release-note:breaking-change
+images: Renamed Image struct "Metadata" field to "Meta"
+```
diff --git a/images.go b/images.go
@@ -29,7 +29,7 @@ const (
 type Image struct {
 	ID                string                 `json:"id"`
 	Filename          string                 `json:"filename"`
-	Metadata          map[string]interface{} `json:"metadata,omitempty"`
+	Meta              map[string]interface{} `json:"meta,omitempty"`
 	RequireSignedURLs bool                   `json:"requireSignedURLs"`
 	Variants          []string               `json:"variants"`
 	Uploaded          time.Time              `json:"uploaded"`

diff --git a/images_test.go b/images_test.go
@@ -27,7 +27,7 @@ func timeMustParse(layout, value string) time.Time {
 var expectedImageStruct = Image{
 	ID:       "ZxR0pLaXRldlBtaFhhO2FiZGVnaA",
 	Filename: "avatar.png",
-	Metadata: map[string]interface{}{
+	Meta: map[string]interface{}{
 		"meta": "metaID",
 	},
 	RequireSignedURLs: true,
@@ -63,7 +63,7 @@ func TestUploadImage(t *testing.T) {
 			"result": {
 				"id": "ZxR0pLaXRldlBtaFhhO2FiZGVnaA",
 				"filename": "avatar.png",
-				"metadata": {
+				"meta": {
 					"meta": "metaID"
 				},
 				"requireSignedURLs": true,
@@ -121,7 +121,7 @@ func TestUploadImageByUrl(t *testing.T) {
 			"result": {
 				"id": "ZxR0pLaXRldlBtaFhhO2FiZGVnaA",
 				"filename": "avatar.png",
-				"metadata": {
+				"meta": {
 					"meta": "metaID"
 				},
 				"requireSignedURLs": true,
@@ -179,7 +179,7 @@ func TestUpdateImage(t *testing.T) {
 			"result": {
 				"id": "ZxR0pLaXRldlBtaFhhO2FiZGVnaA",
 				"filename": "avatar.png",
-				"metadata": {
+				"meta": {
 					"meta": "metaID"
 				},
 				"requireSignedURLs": true,
@@ -337,7 +337,7 @@ func TestListImages(t *testing.T) {
 					{
 						"id": "ZxR0pLaXRldlBtaFhhO2FiZGVnaA",
 						"filename": "avatar.png",
-						"metadata": {
+						"meta": {
 							"meta": "metaID"
 						},
 						"requireSignedURLs": true,
@@ -378,7 +378,7 @@ func TestImageDetails(t *testing.T) {
 			"result": {
 				"id": "ZxR0pLaXRldlBtaFhhO2FiZGVnaA",
 				"filename": "avatar.png",
-				"metadata": {
+				"meta": {
 					"meta": "metaID"
 				},
 				"requireSignedURLs": true,