feat/enterpriseportal: all subscriptions APIs use enterprise portal DB

cmd/enterprise-portal/internal/database/codyaccess/BUILD.bazel

@@ -33,8 +33,8 @@ go_test(
         "//cmd/enterprise-portal/internal/database",
         "//cmd/enterprise-portal/internal/database/databasetest",
         "//cmd/enterprise-portal/internal/database/internal/tables",
-        "//cmd/enterprise-portal/internal/database/internal/utctime",
         "//cmd/enterprise-portal/internal/database/subscriptions",
+        "//cmd/enterprise-portal/internal/database/utctime",
         "//internal/license",
         "//lib/pointers",
         "@com_github_google_uuid//:uuid",

cmd/enterprise-portal/internal/database/codyaccess/codygateway_test.go

@@ -15,8 +15,8 @@ import (
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/codyaccess"
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/databasetest"
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/tables"
-	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/utctime"
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/subscriptions"
+	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/utctime"
 	"github.com/sourcegraph/sourcegraph/internal/license"
 	"github.com/sourcegraph/sourcegraph/lib/pointers"
 )

cmd/enterprise-portal/internal/database/importer/BUILD.bazel

@@ -8,8 +8,8 @@ go_library(
     deps = [
         "//cmd/enterprise-portal/internal/database",
         "//cmd/enterprise-portal/internal/database/codyaccess",
-        "//cmd/enterprise-portal/internal/database/internal/utctime",
         "//cmd/enterprise-portal/internal/database/subscriptions",
+        "//cmd/enterprise-portal/internal/database/utctime",
         "//cmd/enterprise-portal/internal/dotcomdb",
         "//internal/goroutine",
         "//internal/license",

cmd/enterprise-portal/internal/database/importer/importer.go

@@ -13,8 +13,8 @@ import (
 
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database"
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/codyaccess"
-	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/utctime"
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/subscriptions"
+	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/utctime"
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/dotcomdb"
 	"github.com/sourcegraph/sourcegraph/internal/goroutine"
 	"github.com/sourcegraph/sourcegraph/internal/license"
@@ -198,8 +198,8 @@ func (i *Importer) importSubscription(ctx context.Context, dotcomSub *dotcomdb.S
 				}
 				return pointers.Ptr(utctime.FromTime(*dotcomSub.ArchivedAt))
 			}(),
-			SalesforceSubscriptionID: activeLicense.SalesforceSubscriptionID,
-			SalesforceOpportunityID:  activeLicense.SalesforceOpportunityID,
+			SalesforceSubscriptionID: pointers.Ptr(database.NewNullStringPtr(activeLicense.SalesforceSubscriptionID)),
+			SalesforceOpportunityID:  pointers.Ptr(database.NewNullStringPtr(activeLicense.SalesforceOpportunityID)),
 		},
 		conditions...,
 	); err != nil {

cmd/enterprise-portal/internal/database/subscriptions/BUILD.bazel

@@ -15,7 +15,7 @@ go_library(
     deps = [
         "//cmd/enterprise-portal/internal/database/internal/pgxerrors",
         "//cmd/enterprise-portal/internal/database/internal/upsert",
-        "//cmd/enterprise-portal/internal/database/internal/utctime",
+        "//cmd/enterprise-portal/internal/database/utctime",
         "//internal/license",
         "//lib/enterpriseportal/subscriptions/v1:subscriptions",
         "//lib/errors",
@@ -42,7 +42,7 @@ go_test(
         "//cmd/enterprise-portal/internal/database",
         "//cmd/enterprise-portal/internal/database/databasetest",
         "//cmd/enterprise-portal/internal/database/internal/tables",
-        "//cmd/enterprise-portal/internal/database/internal/utctime",
+        "//cmd/enterprise-portal/internal/database/utctime",
         "//internal/license",
         "//lib/enterpriseportal/subscriptions/v1:subscriptions",
         "//lib/pointers",

cmd/enterprise-portal/internal/database/subscriptions/license_conditions.go

@@ -6,7 +6,7 @@ import (
 	"github.com/jackc/pgx/v5"
 	"gorm.io/gorm"
 
-	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/utctime"
+	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/utctime"
 	subscriptionsv1 "github.com/sourcegraph/sourcegraph/lib/enterpriseportal/subscriptions/v1"
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 	"github.com/sourcegraph/sourcegraph/lib/pointers"

cmd/enterprise-portal/internal/database/subscriptions/licenses.go

@@ -13,7 +13,7 @@ import (
 	"gorm.io/gorm"
 
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/pgxerrors"
-	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/utctime"
+	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/utctime"
 	internallicense "github.com/sourcegraph/sourcegraph/internal/license"
 	subscriptionsv1 "github.com/sourcegraph/sourcegraph/lib/enterpriseportal/subscriptions/v1"
 	"github.com/sourcegraph/sourcegraph/lib/pointers"
@@ -399,6 +399,9 @@ WHERE id = @licenseID
 		"revokedAt": opts.Time,
 		"licenseID": licenseID,
 	}); err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return nil, ErrSubscriptionLicenseNotFound
+		}
 		return nil, errors.Wrap(err, "revoke license")
 	}
 

cmd/enterprise-portal/internal/database/subscriptions/licenses_test.go

@@ -15,8 +15,8 @@ import (
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database"
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/databasetest"
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/tables"
-	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/utctime"
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/subscriptions"
+	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/utctime"
 	"github.com/sourcegraph/sourcegraph/internal/license"
 	"github.com/sourcegraph/sourcegraph/lib/pointers"
 )

cmd/enterprise-portal/internal/database/subscriptions/subscriptions.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/pgxerrors"
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/upsert"
-	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/utctime"
+	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/utctime"
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 )
 
@@ -205,8 +205,8 @@ type UpsertSubscriptionOptions struct {
 	CreatedAt  utctime.Time
 	ArchivedAt *utctime.Time
 
-	SalesforceSubscriptionID *string
-	SalesforceOpportunityID  *string
+	SalesforceSubscriptionID *sql.NullString
+	SalesforceOpportunityID  *sql.NullString
 
 	// ForceUpdate indicates whether to force update all fields of the subscription
 	// record.
@@ -235,9 +235,14 @@ func (opts UpsertSubscriptionOptions) apply(ctx context.Context, db upsert.Exece
 	return b.Exec(ctx, db)
 }
 
+var ErrInvalidArgument = errors.New("invalid argument")
+
 // Upsert upserts a subscription record based on the given options. If the
 // operation has additional application meaning, conditions can be provided
 // for insert as well.
+//
+// Constraint errors are returned as a human-friendly error that wraps
+// ErrInvalidArgument.
 func (s *Store) Upsert(
 	ctx context.Context,
 	subscriptionID string,
@@ -267,7 +272,12 @@ func (s *Store) Upsert(
 	if err := opts.apply(ctx, tx, subscriptionID); err != nil {
 		if pgxerrors.IsContraintError(err, "idx_enterprise_portal_subscriptions_display_name") {
 			return nil, errors.WithSafeDetails(
-				errors.Newf("display_name %q is already in use", opts.DisplayName.String),
+				errors.Wrapf(ErrInvalidArgument, "display_name %q is already in use", opts.DisplayName.String),
+				"%+v", err)
+		}
+		if pgxerrors.IsContraintError(err, "idx_enterprise_portal_subscriptions_instance_domain") {
+			return nil, errors.WithSafeDetails(
+				errors.Wrapf(ErrInvalidArgument, "instance_domain %q is assigned to another subscription", opts.DisplayName.String),
 				"%+v", err)
 		}
 		return nil, errors.Wrap(err, "upsert")

cmd/enterprise-portal/internal/database/subscriptions/subscriptions_conditions.go

@@ -6,7 +6,7 @@ import (
 	"github.com/jackc/pgx/v5"
 	"gorm.io/gorm"
 
-	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/utctime"
+	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/utctime"
 	subscriptionsv1 "github.com/sourcegraph/sourcegraph/lib/enterpriseportal/subscriptions/v1"
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 	"github.com/sourcegraph/sourcegraph/lib/pointers"

cmd/enterprise-portal/internal/database/subscriptions/subscriptions_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database"
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/databasetest"
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/tables"
-	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/utctime"
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/subscriptions"
+	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/utctime"
 	subscriptionsv1 "github.com/sourcegraph/sourcegraph/lib/enterpriseportal/subscriptions/v1"
 	"github.com/sourcegraph/sourcegraph/lib/pointers"
 )

cmd/enterprise-portal/internal/database/types.go

@@ -8,3 +8,13 @@ func NewNullString(v string) sql.NullString {
 		Valid:  v != "",
 	}
 }
+
+func NewNullStringPtr(v *string) sql.NullString {
+	if v == nil {
+		return sql.NullString{}
+	}
+	return sql.NullString{
+		String: *v,
+		Valid:  *v != "",
+	}
+}

cmd/enterprise-portal/internal/database/internal/utctime/BUILD.bazel → cmd/enterprise-portal/internal/database/utctime/BUILD.bazel

@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "utctime",
     srcs = ["utctime.go"],
-    importpath = "github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/internal/utctime",
+    importpath = "github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/utctime",
     visibility = ["//cmd/enterprise-portal:__subpackages__"],
     deps = [
         "//lib/errors",

cmd/enterprise-portal/internal/subscriptionsservice/BUILD.bazel

@@ -16,16 +16,19 @@ go_library(
         "//cmd/enterprise-portal/internal/connectutil",
         "//cmd/enterprise-portal/internal/database",
         "//cmd/enterprise-portal/internal/database/subscriptions",
+        "//cmd/enterprise-portal/internal/database/utctime",
         "//cmd/enterprise-portal/internal/dotcomdb",
         "//cmd/enterprise-portal/internal/samsm2m",
         "//internal/collections",
+        "//internal/license",
         "//internal/trace",
         "//lib/enterpriseportal/subscriptions/v1:subscriptions",
         "//lib/enterpriseportal/subscriptions/v1/v1connect",
         "//lib/errors",
         "//lib/managedservicesplatform/iam",
         "//lib/pointers",
         "@com_connectrpc_connect//:connect",
+        "@com_github_google_uuid//:uuid",
         "@com_github_sourcegraph_log//:log",
         "@com_github_sourcegraph_sourcegraph_accounts_sdk_go//:sourcegraph-accounts-sdk-go",
         "@com_github_sourcegraph_sourcegraph_accounts_sdk_go//clients/v1:clients",

cmd/enterprise-portal/internal/subscriptionsservice/adapters.go

@@ -2,10 +2,16 @@ package subscriptionsservice
 
 import (
 	"encoding/json"
+	"fmt"
+	"strings"
+	"time"
 
+	"connectrpc.com/connect"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/subscriptions"
+	"github.com/sourcegraph/sourcegraph/cmd/enterprise-portal/internal/database/utctime"
+	"github.com/sourcegraph/sourcegraph/internal/license"
 	subscriptionsv1 "github.com/sourcegraph/sourcegraph/lib/enterpriseportal/subscriptions/v1"
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 	"github.com/sourcegraph/sourcegraph/lib/managedservicesplatform/iam"
@@ -107,8 +113,52 @@ func convertProtoToIAMTupleRelation(action subscriptionsv1.PermissionRelation) i
 func convertProtoRoleToIAMTupleObject(role subscriptionsv1.Role, subscriptionID string) iam.TupleObject {
 	switch role {
 	case subscriptionsv1.Role_ROLE_SUBSCRIPTION_CUSTOMER_ADMIN:
-		return iam.ToTupleObject(iam.TupleTypeCustomerAdmin, subscriptionID)
+		return iam.ToTupleObject(iam.TupleTypeCustomerAdmin,
+			strings.TrimPrefix(subscriptionID, subscriptionsv1.EnterpriseSubscriptionIDPrefix))
 	default:
 		return ""
 	}
 }
+
+// convertLicenseKeyToLicenseKeyData converts a create-license request into an
+// actual license key. It only returns valid Connect errors.
+func convertLicenseKeyToLicenseKeyData(
+	createdAt utctime.Time,
+	sub *subscriptions.Subscription,
+	key *subscriptionsv1.EnterpriseSubscriptionLicenseKey,
+) (*subscriptions.DataLicenseKey, error) {
+	expires := key.GetInfo().GetExpireTime().AsTime()
+	if expires.Before(time.Now()) {
+		return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("expiry must be in the future"))
+	}
+	tags := key.GetInfo().GetTags()
+	providedTagPrefixes := map[string]struct{}{}
+	for _, t := range tags {
+		providedTagPrefixes[strings.SplitN(t, ":", 2)[0]] = struct{}{}
+	}
+	if _, exists := providedTagPrefixes["customer"]; !exists && sub.DisplayName != nil {
+		tags = append(tags, fmt.Sprintf("customer:%s", *sub.DisplayName))
+	}
+
+	info := license.Info{
+		Tags:      tags,
+		UserCount: uint(key.GetInfo().GetUserCount()),
+		CreatedAt: createdAt.AsTime(),
+		ExpiresAt: expires.UTC(),
+
+		// Inherited from subscription
+		SalesforceSubscriptionID: sub.SalesforceSubscriptionID,
+		SalesforceOpportunityID:  sub.SalesforceOpportunityID,
+	}
+
+	// TODO
+	// signedKey, _, err := licensing.GenerateProductLicenseKey(info)
+	// if err != nil {
+	// 	return nil, connectutil.InternalError(ctx, logger, err, "")
+	// }
+
+	return &subscriptions.DataLicenseKey{
+		Info:      info,
+		SignedKey: "TODO",
+	}, nil
+}