Merge branch '401-standard-engine-edition' into 'master'

feat(engine,ui): report the type of subscription in UI (#401)

Closes #401

See merge request postgres-ai/database-lab!563

Author: agneum

engine/cmd/database-lab/main.go

@@ -233,10 +233,16 @@ func getEngineProperties(ctx context.Context, dockerCLI *client.Client, cfg *con
 		return global.EngineProps{}, fmt.Errorf("failed to load instance ID: %w", err)
 	}
 
+	infra := os.Getenv("DLE_COMPUTING_INFRASTRUCTURE")
+	if infra == "" {
+		infra = global.LocalInfra
+	}
+
 	engProps := global.EngineProps{
-		InstanceID:    instanceID,
-		ContainerName: strings.Trim(dleContainer.Name, "/"),
-		EnginePort:    cfg.Server.Port,
+		InstanceID:     instanceID,
+		ContainerName:  strings.Trim(dleContainer.Name, "/"),
+		Infrastructure: infra,
+		EnginePort:     cfg.Server.Port,
 	}
 
 	return engProps, nil

engine/go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-units v0.4.0
 	github.com/dustin/go-humanize v1.0.0
+	github.com/golang-jwt/jwt/v4 v4.4.2
 	github.com/google/go-github/v34 v34.0.0
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.4.2
@@ -44,7 +45,6 @@ require (
 	github.com/docker/distribution v2.8.0+incompatible // indirect
 	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect

engine/internal/srv/routes.go

@@ -540,6 +540,7 @@ func (s *Server) healthCheck(w http.ResponseWriter, _ *http.Request) {
 
 	healthResponse := models.Engine{
 		Version: version.GetVersion(),
+		Edition: s.engProps.GetEdition(),
 	}
 
 	if err := json.NewEncoder(w).Encode(healthResponse); err != nil {

engine/pkg/config/global/config.go

@@ -49,7 +49,25 @@ type Telemetry struct {
 
 // EngineProps contains internal Database Lab Engine properties.
 type EngineProps struct {
-	InstanceID    string
-	ContainerName string
-	EnginePort    uint
+	InstanceID     string
+	ContainerName  string
+	Infrastructure string
+	EnginePort     uint
+}
+
+const (
+	// LocalInfra defines a local infra.
+	LocalInfra = "local"
+
+	communityEdition = "community"
+	standardEdition  = "standard"
+)
+
+// GetEdition provides the DLE edition.
+func (p *EngineProps) GetEdition() string {
+	if p.Infrastructure != LocalInfra {
+		return standardEdition
+	}
+
+	return communityEdition
 }

engine/pkg/models/instance_status.go

@@ -44,6 +44,7 @@ type Cloning struct {
 // Engine represents info about Database Lab Engine instance.
 type Engine struct {
 	Version   string     `json:"version"`
+	Edition   string     `json:"edition"`
 	StartedAt *LocalTime `json:"startedAt,omitempty"`
 	Telemetry *bool      `json:"telemetry,omitempty"`
 }

ui/packages/ce/src/App/Menu/Header/index.tsx

@@ -10,6 +10,7 @@ import logoIconUrl from './icons/logo.svg'
 import { ReactComponent as StarsIcon } from './icons/stars.svg'
 
 import styles from './styles.module.scss'
+import { DLEEdition } from "helpers/edition";
 
 type Props = {
   isCollapsed: boolean
@@ -28,7 +29,7 @@ export const Header = (props: Props) => {
           <h1 className={styles.title}>
             Database Lab
             <br />
-            <span className={styles.name}>Community Edition</span>
+            <span className={styles.name}>{DLEEdition()}</span>
           </h1>
         )}
       </Link>

ui/packages/ce/src/config/routes.tsx

@@ -1,5 +1,5 @@
 export const ROUTES = {
-  name: 'Database Lab Community Edition',
+  name: 'Database Lab',
   path: '/',
 
   AUTH: {

ui/packages/ce/src/helpers/edition.ts

@@ -0,0 +1,17 @@
+import { appStore } from "stores/app";
+
+const communityEdition = 'Community Edition'
+const standardEdition = 'Standard Edition'
+
+export const DLEEdition = (): string => {
+    switch (appStore.engine?.data?.edition) {
+        case 'standard':
+            return standardEdition
+
+        case 'community':
+            return communityEdition
+
+        default:
+            return communityEdition
+    }
+}

ui/packages/ce/src/types/api/entities/engine.ts

@@ -1,5 +1,6 @@
 export type EngineDto = {
   version: string
+  edition?: string
 }
 
 export const formatEngineDto = (dto: EngineDto) => dto