[server] Make Stripe usage-based product price IDs configurable

jankeromnes · jankeromnes · commit 141a440b7c3b · 2022-06-16T08:49:00.000Z
diff --git a/.werft/jobs/build/helm/values.payment.yaml b/.werft/jobs/build/helm/values.payment.yaml
@@ -6,16 +6,22 @@ components:
       - name: chargebee-config
         mountPath: "/chargebee"
         readOnly: true
+      - name: stripe-secret
+        mountPath: "/stripe-secret"
+        readOnly: true
       - name: stripe-config
-        mountPath: "/stripe"
+        mountPath: "/stripe-config"
         readOnly: true
     volumes:
     - name: chargebee-config
       secret:
         secretName: chargebee-config
-    - name: stripe-config
+    - name: stripe-secret
       secret:
         secretName: stripe-api-keys
+    - name: stripe-config
+      configMap:
+        name: stripe-config
 
   paymentEndpoint:
     disabled: false
diff --git a/.werft/jobs/build/installer/installer.ts b/.werft/jobs/build/installer/installer.ts
@@ -83,7 +83,8 @@ export class Installer {
                 exec(`yq w -i ${this.options.installerConfigPath} experimental.webapp.server.chargebeeSecret chargebee-config`, { slice: slice });
 
                 // let installer know that there is a stripe config
-                exec(`yq w -i ${this.options.installerConfigPath} experimental.webapp.server.stripeSecret stripe-api-keys`, { slice: slice });
+                exec(`yq w -i ${this.options.installerConfigPath} experimental.webapp.server.stripeSecret stripe-secret`, { slice: slice });
+                exec(`yq w -i ${this.options.installerConfigPath} experimental.webapp.server.stripeConfig stripe-config`, { slice: slice });
             }
 
         } catch (err) {
diff --git a/.werft/jobs/build/payment/stripe-config.yaml b/.werft/jobs/build/payment/stripe-config.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: stripe-config
+  namespace: ${NAMESPACE}
+data:
+  config: >
+    {
+      "usageProductPriceIds": {
+        "EUR": "price_1LAE0AGadRXm50o3xjegX0Kd",
+        "USD": "price_1LAE0AGadRXm50o3rKoktPiJ"
+      }
+    }
diff --git a/components/server/ee/src/user/stripe-service.ts b/components/server/ee/src/user/stripe-service.ts
@@ -116,16 +116,15 @@ export class StripeService {
     }
 
     async createSubscriptionForCustomer(customerId: string, currency: Currency): Promise<void> {
-        // FIXME(janx): Use configmap.
-        const prices = {
-            EUR: "price_1LAE0AGadRXm50o3xjegX0Kd",
-            USD: "price_1LAE0AGadRXm50o3rKoktPiJ",
-        };
+        const priceId = this.config?.stripeConfig?.usageProductPriceIds[currency];
+        if (!priceId) {
+            throw new Error(`No Stripe Price ID configured for currency '${currency}'`);
+        }
         const startOfNextMonth = new Date(new Date().toISOString().slice(0, 7) + "-01"); // First day of this month (YYYY-MM-01)
         startOfNextMonth.setMonth(startOfNextMonth.getMonth() + 1); // Add one month
         await this.getStripe().subscriptions.create({
             customer: customerId,
-            items: [{ price: prices[currency] }],
+            items: [{ price: priceId }],
             billing_cycle_anchor: Math.round(startOfNextMonth.getTime() / 1000),
         });
     }
diff --git a/components/server/src/config.ts b/components/server/src/config.ts
@@ -20,12 +20,18 @@ import { filePathTelepresenceAware } from "@gitpod/gitpod-protocol/lib/env";
 export const Config = Symbol("Config");
 export type Config = Omit<
     ConfigSerialized,
-    "blockedRepositories" | "hostUrl" | "chargebeeProviderOptionsFile" | "stripeSecretsFile" | "licenseFile"
+    | "blockedRepositories"
+    | "hostUrl"
+    | "chargebeeProviderOptionsFile"
+    | "stripeSecretsFile"
+    | "stripeConfigFile"
+    | "licenseFile"
 > & {
     hostUrl: GitpodHostUrl;
     workspaceDefaults: WorkspaceDefaults;
     chargebeeProviderOptions?: ChargebeeProviderOptions;
     stripeSecrets?: { publishableKey: string; secretKey: string };
+    stripeConfig?: { usageProductPriceIds: { EUR: string; USD: string } };
     builtinAuthProvidersConfigured: boolean;
     blockedRepositories: { urlRegExp: RegExp; blockUser: boolean }[];
     inactivityPeriodForRepos?: number;
@@ -152,6 +158,7 @@ export interface ConfigSerialized {
      */
     chargebeeProviderOptionsFile?: string;
     stripeSecretsFile?: string;
+    stripeConfigFile?: string;
     enablePayment?: boolean;
 
     /**
@@ -222,7 +229,15 @@ export namespace ConfigFile {
                     fs.readFileSync(filePathTelepresenceAware(config.stripeSecretsFile), "utf-8"),
                 );
             } catch (error) {
-                console.error("Could not load Stripe secrets", error);
+                log.error("Could not load Stripe secrets", error);
+            }
+        }
+        let stripeConfig: { usageProductPriceIds: { EUR: string; USD: string } } | undefined;
+        if (config.enablePayment && config.stripeConfigFile) {
+            try {
+                stripeConfig = JSON.parse(fs.readFileSync(filePathTelepresenceAware(config.stripeConfigFile), "utf-8"));
+            } catch (error) {
+                log.error("Could not load Stripe config", error);
             }
         }
         let license = config.license;
@@ -252,6 +267,7 @@ export namespace ConfigFile {
             builtinAuthProvidersConfigured,
             chargebeeProviderOptions,
             stripeSecrets,
+            stripeConfig,
             license,
             workspaceGarbageCollection: {
                 ...config.workspaceGarbageCollection,
diff --git a/install/installer/pkg/components/server/configmap.go b/install/installer/pkg/components/server/configmap.go
@@ -99,6 +99,14 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		return nil
 	})
 
+	stripeConfig := ""
+	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
+		if cfg.WebApp != nil && cfg.WebApp.Server != nil {
+			stripeConfig = cfg.WebApp.Server.StripeConfig
+		}
+		return nil
+	})
+
 	disableWsGarbageCollection := false
 	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
 		if cfg.WebApp != nil && cfg.WebApp.Server != nil {
@@ -216,9 +224,10 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		ImageBuilderAddr:             "image-builder-mk3:8080",
 		CodeSync:                     CodeSync{},
 		VSXRegistryUrl:               fmt.Sprintf("https://open-vsx.%s", ctx.Config.Domain), // todo(sje): or "https://{{ .Values.vsxRegistry.host | default "open-vsx.org" }}" if not using OpenVSX proxy
-		EnablePayment:                chargebeeSecret != "" || stripeSecret != "",
+		EnablePayment:                chargebeeSecret != "" || stripeSecret != "" || stripeConfig != "",
 		ChargebeeProviderOptionsFile: fmt.Sprintf("%s/providerOptions", chargebeeMountPath),
-		StripeSecretsFile:            fmt.Sprintf("%s/apikeys", stripeMountPath),
+		StripeSecretsFile:            fmt.Sprintf("%s/apikeys", stripeSecretMountPath),
+		StripeConfigFile:             fmt.Sprintf("%s/config", stripeConfigMountPath),
 		InsecureNoDomain:             false,
 		PrebuildLimiter: map[string]int{
 			// default limit for all cloneURLs
diff --git a/install/installer/pkg/components/server/constants.go b/install/installer/pkg/components/server/constants.go
@@ -15,7 +15,8 @@ const (
 	authProviderFilePath  = "/gitpod/auth-providers"
 	licenseFilePath       = "/gitpod/license"
 	chargebeeMountPath    = "/chargebee"
-	stripeMountPath       = "/stripe"
+	stripeSecretMountPath = "/stripe-secret"
+	stripeConfigMountPath = "/stripe-config"
 	githubAppCertSecret   = "github-app-cert-secret"
 	PrometheusPort        = 9500
 	PrometheusPortName    = "metrics"
diff --git a/install/installer/pkg/components/server/deployment.go b/install/installer/pkg/components/server/deployment.go
@@ -204,7 +204,30 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 
 			volumeMounts = append(volumeMounts, corev1.VolumeMount{
 				Name:      "stripe-secret",
-				MountPath: stripeMountPath,
+				MountPath: stripeSecretMountPath,
+				ReadOnly:  true,
+			})
+		}
+		return nil
+	})
+
+	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
+		if cfg.WebApp != nil && cfg.WebApp.Server != nil && cfg.WebApp.Server.StripeConfig != "" {
+			stripeConfig := cfg.WebApp.Server.StripeConfig
+
+			volumes = append(volumes,
+				corev1.Volume{
+					Name: "stripe-config",
+					VolumeSource: corev1.VolumeSource{
+						ConfigMap: &corev1.ConfigMapVolumeSource{
+							LocalObjectReference: corev1.LocalObjectReference{Name: stripeConfig},
+						},
+					},
+				})
+
+			volumeMounts = append(volumeMounts, corev1.VolumeMount{
+				Name:      "stripe-config",
+				MountPath: stripeConfigMountPath,
 				ReadOnly:  true,
 			})
 		}
diff --git a/install/installer/pkg/components/server/types.go b/install/installer/pkg/components/server/types.go
@@ -33,6 +33,7 @@ type ConfigSerialized struct {
 	VSXRegistryUrl                    string   `json:"vsxRegistryUrl"`
 	ChargebeeProviderOptionsFile      string   `json:"chargebeeProviderOptionsFile"`
 	StripeSecretsFile                 string   `json:"stripeSecretsFile"`
+	StripeConfigFile                  string   `json:"stripeConfigFile"`
 	EnablePayment                     bool     `json:"enablePayment"`
 
 	WorkspaceHeartbeat         WorkspaceHeartbeat         `json:"workspaceHeartbeat"`
diff --git a/install/installer/pkg/config/v1/experimental/experimental.go b/install/installer/pkg/config/v1/experimental/experimental.go
@@ -140,6 +140,7 @@ type ServerConfig struct {
 	GithubApp                         *GithubApp          `json:"githubApp"`
 	ChargebeeSecret                   string              `json:"chargebeeSecret"`
 	StripeSecret                      string              `json:"stripeSecret"`
+	StripeConfig                      string              `json:"stripeConfig"`
 	DisableDynamicAuthProviderLogin   bool                `json:"disableDynamicAuthProviderLogin"`
 	EnableLocalApp                    *bool               `json:"enableLocalApp"`
 	RunDbDeleter                      *bool               `json:"runDbDeleter"`

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,8 @@ export class Installer {`
`83`	`83`	exec(`yq w -i ${this.options.installerConfigPath} experimental.webapp.server.chargebeeSecret chargebee-config`, { slice: slice });
`84`	`84`
`85`	`85`	`// let installer know that there is a stripe config`
`86`		- exec(`yq w -i ${this.options.installerConfigPath} experimental.webapp.server.stripeSecret stripe-api-keys`, { slice: slice });
	`86`	+ exec(`yq w -i ${this.options.installerConfigPath} experimental.webapp.server.stripeSecret stripe-secret`, { slice: slice });
	`87`	+ exec(`yq w -i ${this.options.installerConfigPath} experimental.webapp.server.stripeConfig stripe-config`, { slice: slice });
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`} catch (err) {`