fix: Change quota type in domain subscription msg (#4676)

  The disk quota sent in a domain subscription change RabbitMQ message
  is an integer, not a string so the handler failed to unmarshal it.

Author: taratatach

pkg/rabbitmq/handlers.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"strconv"
 	"strings"
 
 	amqp "github.com/rabbitmq/amqp091-go"
@@ -304,7 +303,7 @@ type SubscriptionFeatures struct {
 
 type SubscriptionStackFeatures struct {
 	FeatureSets []string `json:"featureSets"`
-	DiskQuota   string   `json:"diskQuota"`
+	DiskQuota   int64    `json:"diskQuota"`
 }
 
 func (h *DomainSubscriptionChangedHandler) Handle(ctx context.Context, d amqp.Delivery) error {
@@ -327,14 +326,6 @@ func (h *DomainSubscriptionChangedHandler) Handle(ctx context.Context, d amqp.De
 	if msg.Features.Stack.FeatureSets == nil {
 		return fmt.Errorf("domain.subscription.changed: missing feature sets for organization %s: %v", msg.Domain, msg.Features)
 	}
-	if msg.Features.Stack.DiskQuota == "" {
-		return fmt.Errorf("domain.subscription.changed: missing disk quota for organization %s: %v", msg.Domain, msg.Features)
-	}
-
-	quota, err := strconv.ParseInt(msg.Features.Stack.DiskQuota, 10, 64)
-	if err != nil {
-		return fmt.Errorf("domain.subscription.changed: invalid disk quota for organization %s: %w", msg.Domain, err)
-	}
 
 	list, err := lifecycle.ListOrgInstances(msg.Domain)
 	if err != nil {
@@ -347,7 +338,7 @@ func (h *DomainSubscriptionChangedHandler) Handle(ctx context.Context, d amqp.De
 
 	for _, inst := range list {
 		if err := lifecycle.Patch(inst, &lifecycle.Options{
-			DiskQuota:    quota,
+			DiskQuota:    msg.Features.Stack.DiskQuota,
 			FeatureSets:  msg.Features.Stack.FeatureSets,
 			FromCloudery: true, // XXX: do not update the instance on the Cloudery as the message comes from the Cloudery
 		}); err != nil {

pkg/rabbitmq/rabbitmq_test.go

@@ -9,7 +9,6 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
-	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -470,7 +469,7 @@ func TestHandlers(t *testing.T) {
 			Features: rabbitmq.SubscriptionFeatures{
 				Stack: rabbitmq.SubscriptionStackFeatures{
 					FeatureSets: []string{"plan-uuid"},
-					DiskQuota:   "50000000000",
+					DiskQuota:   50000000000,
 				},
 			},
 		}
@@ -520,17 +519,15 @@ func TestHandlers(t *testing.T) {
 		// orgInst1 is updated
 		updated, err := lifecycle.GetInstance(orgInst1.Domain)
 		require.NoError(t, err)
-		msgQuota, err := strconv.ParseInt(msg.Features.Stack.DiskQuota, 10, 64)
 		quota := updated.DiskQuota()
-		require.Equal(t, msgQuota, quota)
+		require.Equal(t, msg.Features.Stack.DiskQuota, quota)
 		require.ElementsMatch(t, msg.Features.Stack.FeatureSets, updated.FeatureSets)
 
 		// orgInst2 is updated
 		updated, err = lifecycle.GetInstance(orgInst2.Domain)
 		require.NoError(t, err)
-		msgQuota, err = strconv.ParseInt(msg.Features.Stack.DiskQuota, 10, 64)
 		quota = updated.DiskQuota()
-		require.Equal(t, msgQuota, quota)
+		require.Equal(t, msg.Features.Stack.DiskQuota, quota)
 		require.ElementsMatch(t, msg.Features.Stack.FeatureSets, updated.FeatureSets)
 
 		// inst is not updated