[usage] Make Stripe payment integration optional

Enable stripe integration iff a Stripe secret is configured.

Author: Andrew Farries

components/usage/cmd/run.go

@@ -22,9 +22,10 @@ func init() {
 
 func run() *cobra.Command {
 	var (
-		verbose    bool
-		apiKeyFile string
-		schedule   time.Duration
+		verbose        bool
+		paymentEnabled bool
+		apiKeyFile     string
+		schedule       time.Duration
 	)
 
 	cmd := &cobra.Command{
@@ -44,12 +45,15 @@ func run() *cobra.Command {
 				log.WithError(err).Fatal("Failed to establish database connection.")
 			}
 
-			err = stripe.Authenticate(apiKeyFile)
-			if err != nil {
-				log.WithError(err).Fatal("Failed to initialize stripe client.")
+			log.Infof("payment integration with Stripe is set to %v", paymentEnabled)
+			if paymentEnabled {
+				err = stripe.Authenticate(apiKeyFile)
+				if err != nil {
+					log.WithError(err).Fatal("Failed to initialize stripe client.")
+				}
 			}
 
-			ctrl, err := controller.New(schedule, controller.NewUsageReconciler(conn))
+			ctrl, err := controller.New(schedule, controller.NewUsageReconciler(conn, paymentEnabled))
 			if err != nil {
 				log.WithError(err).Fatal("Failed to initialize usage controller.")
 			}
@@ -74,7 +78,8 @@ func run() *cobra.Command {
 
 	cmd.Flags().BoolVar(&verbose, "verbose", false, "Toggle verbose logging (debug level)")
 	cmd.Flags().DurationVar(&schedule, "schedule", 1*time.Hour, "The schedule on which the reconciler should run")
-	cmd.Flags().StringVar(&apiKeyFile, "api-key-file", "/stripe-secret/apikeys", "Location of the stripe credentials file on disk")
+	cmd.Flags().BoolVar(&paymentEnabled, "enable-payment", false, "Whether or not payment integration with Stripe should be enabled")
+	cmd.Flags().StringVar(&apiKeyFile, "api-key-file", "/stripe-secret/apikeys", "Location of the Stripe credentials file on disk")
 
 	return cmd
 }

components/usage/pkg/controller/reconciler.go

@@ -30,12 +30,13 @@ func (f ReconcilerFunc) Reconcile() error {
 }
 
 type UsageReconciler struct {
-	nowFunc func() time.Time
-	conn    *gorm.DB
+	nowFunc        func() time.Time
+	paymentEnabled bool
+	conn           *gorm.DB
 }
 
-func NewUsageReconciler(conn *gorm.DB) *UsageReconciler {
-	return &UsageReconciler{conn: conn, nowFunc: time.Now}
+func NewUsageReconciler(conn *gorm.DB, paymentEnabled bool) *UsageReconciler {
+	return &UsageReconciler{conn: conn, paymentEnabled: paymentEnabled, nowFunc: time.Now}
 }
 
 type UsageReconcileStatus struct {
@@ -126,7 +127,9 @@ func (u *UsageReconciler) ReconcileTimeRange(ctx context.Context, from, to time.
 	}
 	status.Report = report
 
-	submitUsageReport(status.Report)
+	if u.paymentEnabled {
+		submitUsageReport(status.Report)
+	}
 
 	return status, nil
 }

install/installer/pkg/components/usage/deployment.go

@@ -24,9 +24,11 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 
 	var volumes []corev1.Volume
 	var volumeMounts []corev1.VolumeMount
+	enablePayment := false
 	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
 		if cfg.WebApp != nil && cfg.WebApp.Server != nil && cfg.WebApp.Server.StripeSecret != "" {
 			stripeSecret := cfg.WebApp.Server.StripeSecret
+			enablePayment = true
 
 			volumes = append(volumes,
 				corev1.Volume{
@@ -79,8 +81,8 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 							Image: ctx.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.Usage.Version),
 							Args: []string{
 								"run",
-								"--schedule",
-								"$(RECONCILER_SCHEDULE)",
+								"--schedule=$(RECONCILER_SCHEDULE)",
+								fmt.Sprintf("--enable-payment=%v", enablePayment),
 							},
 							ImagePullPolicy: corev1.PullIfNotPresent,
 							Resources: common.ResourceRequirements(ctx, Component, Component, corev1.ResourceRequirements{

install/installer/pkg/components/usage/deployment_test.go

@@ -48,3 +48,35 @@ func TestDeployment_ContainsDBEnvVars(t *testing.T) {
 		}},
 	})
 }
+
+func TestDeployment_EnablesPaymentWhenAStripeSecretIsPresent(t *testing.T) {
+	ctx := renderContextWithStripeSecretSet(t)
+
+	objs, err := deployment(ctx)
+	require.NoError(t, err)
+
+	dpl, ok := objs[0].(*appsv1.Deployment)
+	require.True(t, ok)
+
+	containers := dpl.Spec.Template.Spec.Containers
+	require.Len(t, containers, 2)
+
+	usageContainer := containers[0]
+	require.Contains(t, usageContainer.Args, "--enable-payment=true")
+}
+
+func TestDeployment_DisablesPaymentWhenAStripeSecretIsNotPresent(t *testing.T) {
+	ctx := renderContextWithUsageEnabled(t)
+
+	objs, err := deployment(ctx)
+	require.NoError(t, err)
+
+	dpl, ok := objs[0].(*appsv1.Deployment)
+	require.True(t, ok)
+
+	containers := dpl.Spec.Template.Spec.Containers
+	require.Len(t, containers, 2)
+
+	usageContainer := containers[0]
+	require.Contains(t, usageContainer.Args, "--enable-payment=false")
+}

install/installer/pkg/components/usage/objects_test.go

@@ -61,3 +61,34 @@ func renderContextWithUsageConfig(t *testing.T, usage *experimental.UsageConfig)
 func renderContextWithUsageEnabled(t *testing.T) *common.RenderContext {
 	return renderContextWithUsageConfig(t, &experimental.UsageConfig{Enabled: true})
 }
+
+func renderContextWithStripeSecretSet(t *testing.T) *common.RenderContext {
+	ctx, err := common.NewRenderContext(config.Config{
+		Domain: "test.domain.everything.awesome.is",
+		Experimental: &experimental.Config{
+			WebApp: &experimental.WebAppConfig{
+				Server: &experimental.ServerConfig{StripeSecret: "some-stripe-secret"},
+				Usage:  &experimental.UsageConfig{Enabled: true},
+			},
+		},
+		Database: config.Database{
+			CloudSQL: &config.DatabaseCloudSQL{
+				ServiceAccount: config.ObjectRef{
+					Name: "gcp-db-creds-service-account-name",
+				},
+			},
+		},
+	}, versions.Manifest{
+		Components: versions.Components{
+			Usage: versions.Versioned{
+				Version: "commit-test-latest",
+			},
+			ServiceWaiter: versions.Versioned{
+				Version: "commit-test-latest",
+			},
+		},
+	}, "test-namespace")
+	require.NoError(t, err)
+
+	return ctx
+}