From a3045814085f4fca44757f3a0707f1ce362b4b56 Mon Sep 17 00:00:00 2001
From: "Fly.io CI" <joshua@fly.io>
Date: Mon, 7 Oct 2024 18:06:21 +0200
Subject: [PATCH] Fix that metadata submission would fail for nil entries

---
 internal/command/extensions/tigris/update.go | 8 +++++++-
 internal/command/redis/update.go             | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/internal/command/extensions/tigris/update.go b/internal/command/extensions/tigris/update.go
index 01ed5ea02c..61d9b59bb1 100644
--- a/internal/command/extensions/tigris/update.go
+++ b/internal/command/extensions/tigris/update.go
@@ -71,6 +71,12 @@ func runUpdate(ctx context.Context) (err error) {
 		options = make(map[string]interface{})
 	}
 
+	metadata, _ := addOn.Options.(map[string]interface{})
+
+	if metadata == nil {
+		metadata = make(map[string]interface{})
+	}
+
 	accessKey := flag.GetString(ctx, "shadow-access-key")
 	secretKey := flag.GetString(ctx, "shadow-secret-key")
 	region := flag.GetString(ctx, "shadow-region")
@@ -139,7 +145,7 @@ func runUpdate(ctx context.Context) (err error) {
 		}
 	}
 
-	_, err = gql.UpdateAddOn(ctx, client, addOn.Id, addOn.AddOnPlan.Id, []string{}, options, addOn.Metadata)
+	_, err = gql.UpdateAddOn(ctx, client, addOn.Id, addOn.AddOnPlan.Id, []string{}, options, metadata)
 	if err != nil {
 		return
 	}
diff --git a/internal/command/redis/update.go b/internal/command/redis/update.go
index 661a47e558..7444108aaf 100644
--- a/internal/command/redis/update.go
+++ b/internal/command/redis/update.go
@@ -94,6 +94,11 @@ func runUpdate(ctx context.Context) (err error) {
 		options = make(map[string]interface{})
 	}
 
+	metadata, _ := addOn.Metadata.(map[string]interface{})
+
+	if metadata == nil {
+		metadata = make(map[string]interface{})
+	}
 	if err != nil {
 		return
 	}
@@ -116,7 +121,7 @@ func runUpdate(ctx context.Context) (err error) {
 		readRegionCodes = append(readRegionCodes, region.Code)
 	}
 
-	_, err = gql.UpdateAddOn(ctx, client, addOn.Id, result.AddOnPlans.Nodes[index].Id, readRegionCodes, options, addOn.Metadata)
+	_, err = gql.UpdateAddOn(ctx, client, addOn.Id, result.AddOnPlans.Nodes[index].Id, readRegionCodes, options, metadata)
 
 	if err != nil {
 		return