Support partial merging in messaging config

Author: tung2744

pkg/lib/config/feature_messaging.go

@@ -24,12 +24,12 @@ type MessagingFeatureConfig struct {
 	EmailUsage    *UsageLimitConfig `json:"email_usage,omitempty"`
 	WhatsappUsage *UsageLimitConfig `json:"whatsapp_usage,omitempty"`
 
-	SMSUsageCountDisabled      bool `json:"sms_usage_count_disabled,omitempty"`
-	WhatsappUsageCountDisabled bool `json:"whatsapp_usage_count_disabled,omitempty"`
+	SMSUsageCountDisabled      *bool `json:"sms_usage_count_disabled,omitempty"`
+	WhatsappUsageCountDisabled *bool `json:"whatsapp_usage_count_disabled,omitempty"`
 
-	TemplateCustomizationDisabled bool `json:"template_customization_disabled,omitempty"`
+	TemplateCustomizationDisabled *bool `json:"template_customization_disabled,omitempty"`
 
-	CustomSMTPDisabled bool `json:"custom_smtp_disabled,omitempty"`
+	CustomSMTPDisabled *bool `json:"custom_smtp_disabled,omitempty"`
 }
 
 var _ MergeableFeatureConfig = &MessagingFeatureConfig{}
@@ -38,7 +38,36 @@ func (c *MessagingFeatureConfig) Merge(layer *FeatureConfig) MergeableFeatureCon
 	if layer.Messaging == nil {
 		return c
 	}
-	return layer.Messaging
+	var merged *MessagingFeatureConfig = c
+	if merged == nil {
+		merged = &MessagingFeatureConfig{}
+	}
+	if layer.Messaging.RateLimits != nil {
+		merged.RateLimits = layer.Messaging.RateLimits
+	}
+	if layer.Messaging.SMSUsage != nil {
+		merged.SMSUsage = layer.Messaging.SMSUsage
+	}
+	if layer.Messaging.EmailUsage != nil {
+		merged.EmailUsage = layer.Messaging.EmailUsage
+	}
+	if layer.Messaging.WhatsappUsage != nil {
+		merged.WhatsappUsage = layer.Messaging.WhatsappUsage
+	}
+	if layer.Messaging.SMSUsageCountDisabled != nil {
+		merged.SMSUsageCountDisabled = layer.Messaging.SMSUsageCountDisabled
+	}
+	if layer.Messaging.WhatsappUsageCountDisabled != nil {
+		merged.WhatsappUsageCountDisabled = layer.Messaging.WhatsappUsageCountDisabled
+	}
+	if layer.Messaging.TemplateCustomizationDisabled != nil {
+		merged.TemplateCustomizationDisabled = layer.Messaging.TemplateCustomizationDisabled
+	}
+	if layer.Messaging.CustomSMTPDisabled != nil {
+		merged.CustomSMTPDisabled = layer.Messaging.CustomSMTPDisabled
+	}
+
+	return merged
 }
 
 func (c *MessagingFeatureConfig) SetDefaults() {
@@ -57,6 +86,19 @@ func (c *MessagingFeatureConfig) SetDefaults() {
 			Enabled: newBool(false),
 		}
 	}
+
+	if c.SMSUsageCountDisabled == nil {
+		c.SMSUsageCountDisabled = newBool(false)
+	}
+	if c.WhatsappUsageCountDisabled == nil {
+		c.WhatsappUsageCountDisabled = newBool(false)
+	}
+	if c.TemplateCustomizationDisabled == nil {
+		c.TemplateCustomizationDisabled = newBool(false)
+	}
+	if c.CustomSMTPDisabled == nil {
+		c.CustomSMTPDisabled = newBool(false)
+	}
 }
 
 var _ = FeatureConfigSchema.Add("MessagingRateLimitsFeatureConfig", `

pkg/lib/messaging/sender.go

@@ -224,7 +224,7 @@ func (s *Sender) SendSMSInNewGoroutine(ctx context.Context, msgType translation.
 				Sender:              opts.Sender,
 				Recipient:           opts.To,
 				Type:                string(msgType),
-				IsNotCountedInUsage: s.MessagingFeatureConfig.SMSUsageCountDisabled,
+				IsNotCountedInUsage: *s.MessagingFeatureConfig.SMSUsageCountDisabled,
 			})
 		})
 		if err != nil {
@@ -327,7 +327,7 @@ func (s *Sender) SendWhatsappImmediately(ctx context.Context, msgType translatio
 	err = s.Events.DispatchEventImmediately(ctx, &nonblocking.WhatsappSentEventPayload{
 		Recipient:           opts.To,
 		Type:                string(msgType),
-		IsNotCountedInUsage: s.MessagingFeatureConfig.WhatsappUsageCountDisabled,
+		IsNotCountedInUsage: *s.MessagingFeatureConfig.WhatsappUsageCountDisabled,
 	})
 	if err != nil {
 		s.Logger.WithError(err).Errorf("failed to emit %v event", nonblocking.WhatsappSent)

pkg/util/template/resource.go

@@ -26,7 +26,7 @@ func isTemplateUpdateAllowed(ctx context.Context) (bool, error) {
 	if !ok || fc == nil {
 		return false, ErrMissingFeatureFlagInCtx
 	}
-	if fc.Messaging.TemplateCustomizationDisabled {
+	if *fc.Messaging.TemplateCustomizationDisabled {
 		return false, ErrUpdateDisallowed
 	}
 	return true, nil

pkg/util/template/resource_test.go

@@ -384,7 +384,8 @@ func TestTemplateResource(t *testing.T) {
 		}
 		Convey("Should not allow update if disallowed", func() {
 			featureConfig := config.NewEffectiveDefaultFeatureConfig()
-			featureConfig.Messaging.TemplateCustomizationDisabled = true
+			trueVal := true
+			featureConfig.Messaging.TemplateCustomizationDisabled = &trueVal
 			ctx := context.Background()
 			ctx = context.WithValue(ctx, configsource.ContextKeyFeatureConfig, featureConfig)
 			res, err := messageHtml.UpdateResource(ctx, nil, &resourceFile, []byte("asdf"))
@@ -417,7 +418,8 @@ func TestTemplateResource(t *testing.T) {
 		}
 		Convey("Should not allow update if disallowed", func() {
 			featureConfig := config.NewEffectiveDefaultFeatureConfig()
-			featureConfig.Messaging.TemplateCustomizationDisabled = true
+			trueVal := true
+			featureConfig.Messaging.TemplateCustomizationDisabled = &trueVal
 			ctx := context.Background()
 			ctx = context.WithValue(ctx, configsource.ContextKeyFeatureConfig, featureConfig)
 			res, err := messageTxt.UpdateResource(ctx, nil, &resourceFile, []byte("asdf"))

pkg/util/template/translation.go

@@ -155,7 +155,7 @@ func (t *translationJSON) processAppTranslationData(ctx context.Context, data []
 	if !ok || fc == nil {
 		return nil, ErrMissingFeatureFlagInCtx
 	}
-	isCustomizationDisallowed := fc.Messaging.TemplateCustomizationDisabled
+	isCustomizationDisallowed := *fc.Messaging.TemplateCustomizationDisabled
 
 	appTranslationRaw := make(map[string]interface{})
 	err := json.Unmarshal(data, &appTranslationRaw)

pkg/util/template/translation_test.go

@@ -792,7 +792,8 @@ func TestTranslationResource(t *testing.T) {
 
 		Convey("it should skip write value for email template if disallowed by feature flag", func() {
 			featureConfig := config.NewEffectiveDefaultFeatureConfig()
-			featureConfig.Messaging.TemplateCustomizationDisabled = true
+			trueVal := true
+			featureConfig.Messaging.TemplateCustomizationDisabled = &trueVal
 			ctx := context.Background()
 			ctx = context.WithValue(ctx, configsource.ContextKeyFeatureConfig, featureConfig)
 			updated, err := template.TranslationJSON.UpdateResource(