Skip to content

feat: add platform and max_joins fields to SHOW LICENSE output #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fupelaqu wants to merge 1 commit into
base: main
Choose a base branch
from
+74 −3
Draft

feat: add platform and max_joins fields to SHOW LICENSE output #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/main/scala/app/softnetwork/elastic/client/GatewayApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1628,6 +1628,7 @@ class LicenseExecutor(
val row = ListMap[String, Any](
"license_type" -> s"${mgr.licenseType}$trialNote$degradedNote",
"trial" -> key.isTrial,
"platform" -> key.platform.map(_.name).getOrElse("PRODUCTION"),
"max_materialized_views" -> formatQuota(mgr.quotas.maxMaterializedViews),
"max_clusters" -> formatQuota(mgr.quotas.maxClusters),
"max_result_rows" -> formatQuota(mgr.quotas.maxQueryResults),
Expand Down
68 changes: 68 additions & 0 deletions core/src/test/scala/app/softnetwork/elastic/client/LicenseExecutorSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ class LicenseExecutorSpec extends AnyFlatSpec with Matchers {
row should contain key "license_type"
row("license_type") shouldBe "Community"
row("trial") shouldBe false
row should contain key "platform"
row("platform") shouldBe "PRODUCTION"
row should contain key "max_materialized_views"
row("max_materialized_views") shouldBe "3"
row should contain key "max_clusters"
Expand Down Expand Up @@ -116,6 +118,7 @@ class LicenseExecutorSpec extends AnyFlatSpec with Matchers {
row("max_clusters") shouldBe "5"
row("max_result_rows") shouldBe "1000000"
row("max_concurrent_queries") shouldBe "50"
row("platform") shouldBe "PRODUCTION"
row("expires_at") shouldBe "2026-12-31T23:59:59Z"
row("days_remaining").asInstanceOf[Long] should be > 0L
row("status") shouldBe "Active"
Expand Down Expand Up @@ -191,6 +194,71 @@ class LicenseExecutorSpec extends AnyFlatSpec with Matchers {
row("status") shouldBe "Active"
}

it should "show platform field matching LicenseKey.platform when set" in {
val stagingManager = new LicenseManager {
override def validate(key: String): Either[LicenseError, LicenseKey] =
Left(InvalidLicense("test"))
override def hasFeature(feature: Feature): Boolean = true
override def quotas: Quota = Quota(
maxMaterializedViews = Some(25),
maxQueryResults = Some(500000),
maxConcurrentQueries = Some(25),
maxClusters = Some(2),
maxJoins = Some(2)
)
override def licenseType: LicenseType = LicenseType.Pro
override def currentLicenseKey: LicenseKey = LicenseKey(
id = "test-staging",
licenseType = LicenseType.Pro,
features = Feature.values.toSet,
expiresAt = Some(Instant.parse("2026-12-31T23:59:59Z")),
platform = Some(Platform.Staging)
)
}
val executor = new LicenseExecutor(strategy = mkStrategy(stagingManager))
val row = execute(executor, ShowLicense)

row("platform") shouldBe "STAGING"
row("license_type") shouldBe "Pro"
row("max_materialized_views") shouldBe "25"
row("max_clusters") shouldBe "2"
row("max_result_rows") shouldBe "500000"
row("max_concurrent_queries") shouldBe "25"
row("max_joins") shouldBe "2"
}

it should "show DEVELOPMENT platform when LicenseKey has Development platform" in {
val devManager = new LicenseManager {
override def validate(key: String): Either[LicenseError, LicenseKey] =
Left(InvalidLicense("test"))
override def hasFeature(feature: Feature): Boolean = true
override def quotas: Quota = Quota(
maxMaterializedViews = Some(5),
maxQueryResults = Some(10000),
maxConcurrentQueries = Some(5),
maxClusters = Some(1),
maxJoins = Some(1)
)
override def licenseType: LicenseType = LicenseType.Pro
override def currentLicenseKey: LicenseKey = LicenseKey(
id = "test-dev",
licenseType = LicenseType.Pro,
features = Feature.values.toSet,
expiresAt = Some(Instant.parse("2026-12-31T23:59:59Z")),
platform = Some(Platform.Development)
)
}
val executor = new LicenseExecutor(strategy = mkStrategy(devManager))
val row = execute(executor, ShowLicense)

row("platform") shouldBe "DEVELOPMENT"
row("max_materialized_views") shouldBe "5"
row("max_clusters") shouldBe "1"
row("max_result_rows") shouldBe "10000"
row("max_concurrent_queries") shouldBe "5"
row("max_joins") shouldBe "1"
}

// -------------------------------------------------------------------------
// REFRESH LICENSE
// -------------------------------------------------------------------------
Expand Down
8 changes: 5 additions & 3 deletions documentation/sql/dql_statements.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1320,10 +1320,12 @@ Returns the current license type, quota values, expiration date, and grace statu
|--------|-------------|
| `license_type` | Current license tier (Community, Pro, Enterprise). Shows "(trial)" suffix for trial licenses, "(degraded)" suffix if degraded from a higher tier. |
| `trial` | `true` if the license is a Pro trial, `false` otherwise |
| `platform` | Platform scope of the current license key (PRODUCTION, STAGING, DEVELOPMENT, INTEGRATION). Defaults to "PRODUCTION" when not platform-scoped. |
| `max_materialized_views` | Maximum number of materialized views allowed, or "unlimited" |
| `max_clusters` | Maximum number of federated clusters allowed, or "unlimited" |
| `max_result_rows` | Maximum rows returned per query, or "unlimited" |
| `max_concurrent_queries` | Maximum concurrent queries allowed, or "unlimited" |
| `max_joins` | Maximum number of JOIN operations allowed per query, or "unlimited" |
| `expires_at` | License expiration timestamp, or "never" for Community |
| `days_remaining` | Days until expiration, or -1 for Community (no expiry) |
| `status` | "Active", or grace period details if expired |
Expand All @@ -1334,9 +1336,9 @@ Returns the current license type, quota values, expiration date, and grace statu
SHOW LICENSE;
```

| license_type | trial | max_materialized_views | max_clusters | max_result_rows | max_concurrent_queries | expires_at | days_remaining | status |
|---|---|---|---|---|---|---|---|---|
| Community | false | 3 | 2 | 10000 | 5 | never | -1 | Active |
| license_type | trial | platform | max_materialized_views | max_clusters | max_result_rows | max_concurrent_queries | max_joins | expires_at | days_remaining | status |
|---|---|---|---|---|---|---|---|---|---|---|
| Community | false | PRODUCTION | 3 | 1 | 10000 | 5 | 1 | never | -1 | Active |
📊 1 row(s) (1ms)

---
Expand Down
Loading