Issue license for community and enterprise edition with kubedb-ent (#11)

Signed-off-by: Tamal Saha <[email protected]>
appscode-cloud · Sep 16, 2020 · 13d804a · 13d804a
1 parent 67d8755
commit 13d804a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/pkg/server/constants.go b/pkg/server/constants.go
@@ -18,8 +18,6 @@ package server
 
 import (
  "time"
-
- "github.com/appscode/go/sets"
 )
 
 const (
@@ -35,9 +33,9 @@ const (
  LicenseBucket = "appscode-licenses"
 )
 
-var supportedProducts = sets.NewString(
- "kubedb-community",
- "kubedb-enterprise",
- "stash-community",
- "stash-enterprise",
-)
+var supportedProducts = map[string][]string{
+ "kubedb-community": {"kubedb-community"},
+ "kubedb-enterprise": {"kubedb-enterprise", "kubedb-community"},
+ "stash-community": {"stash-community"},
+ "stash-enterprise": {"stash-enterprise"},
+}
diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -399,7 +399,7 @@ func (s *Server) CreateLicense(license ProductLicense, cluster string) ([]byte,
  }
  cfg := Config{
  CommonName: getCN(sans),
- Organization: []string{license.Product},
+ Organization: supportedProducts[license.Product],
  AltNames: sans,
  Usages: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth},
  }

diff --git a/pkg/server/types.go b/pkg/server/types.go
@@ -54,7 +54,7 @@ func (form LicenseForm) Validate() error {
  if err != nil {
  return err
  }
- if !supportedProducts.Has(form.Product) {
+ if _, found := supportedProducts[form.Product]; !found {
  return fmt.Errorf("unknown product: %s", form.Product)
  }
  if agree, _ := strconv.ParseBool(form.Tos); !agree {