Skip to content

Commit adb37dc

Browse files
authored
chore(license): rename temporary -> trial and customer -> enterprise (#325)
1 parent eb4ad7b commit adb37dc

4 files changed

Lines changed: 19 additions & 19 deletions

File tree

ctl/internal/cmd/license/license.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,11 @@ func runLicenseCmd(cmd *cobra.Command, cfg license_Config) error {
175175
header = fmt.Sprintf("NOT FOR RESALE License Certificate %s", license.Data.CommonName)
176176
} else if slices.Contains(scopes, "beeond") {
177177
header = fmt.Sprintf("BeeOND License Certificate %s", license.Data.CommonName)
178-
} else if license.Data.Type == pl.CertType_CERT_TYPE_CUSTOMER {
178+
} else if license.Data.Type == pl.CertType_CERT_TYPE_ENTERPRISE {
179179
header = fmt.Sprintf("BeeGFS Enterprise License Certificate %s", license.Data.CommonName)
180-
} else if license.Data.Type == pl.CertType_CERT_TYPE_TEMPORARY {
181-
header = fmt.Sprintf("BeeGFS Temporary License Certificate %s", license.Data.CommonName)
182-
defer genLicHelpFunc(cmd.Context(), "\nWARNING: This system has a temporary license installed.")
180+
} else if license.Data.Type == pl.CertType_CERT_TYPE_TRIAL {
181+
header = fmt.Sprintf("BeeGFS Trial License Certificate %s", license.Data.CommonName)
182+
defer genLicHelpFunc(cmd.Context(), "\nWARNING: This system has a trial license installed.")
183183
} else if license.Data.Type == pl.CertType_CERT_TYPE_COMMUNITY {
184184
header = fmt.Sprintf("BeeGFS Community License Certificate %s", license.Data.CommonName)
185185
} else {
@@ -188,10 +188,10 @@ func runLicenseCmd(cmd *cobra.Command, cfg license_Config) error {
188188

189189
var color string
190190
switch license.Data.Type {
191-
case pl.CertType_CERT_TYPE_CUSTOMER:
192-
color = "\033[32m" // Green if license is valid and customer license
193-
case pl.CertType_CERT_TYPE_TEMPORARY:
194-
color = "\033[33m" // Yellow if license is valid and temporary license
191+
case pl.CertType_CERT_TYPE_ENTERPRISE:
192+
color = "\033[32m" // Green if license is valid and enterprise license
193+
case pl.CertType_CERT_TYPE_TRIAL:
194+
color = "\033[33m" // Yellow if license is valid and trial license
195195
default:
196196
color = "\033[34m" // Blue for all other license types including community licenses
197197
}
@@ -222,12 +222,12 @@ func runLicenseCmd(cmd *cobra.Command, cfg license_Config) error {
222222
"\033[0m", // Reset font color
223223
header,
224224
strings.Repeat("=", len(header)),
225-
license.Data.Organization,
226-
license.Data.Locality,
227-
license.Data.Country,
228-
license.Data.ParentData.Organization,
229-
license.Data.ParentData.Locality,
230-
license.Data.ParentData.Country,
225+
license.Data.GetOrganization(),
226+
license.Data.GetLocality(),
227+
license.Data.GetCountry(),
228+
license.Data.ParentData.GetOrganization(),
229+
license.Data.ParentData.GetLocality(),
230+
license.Data.ParentData.GetCountry(),
231231
validFrom.Format("2006-01-02 MST"),
232232
validUntil.Format("2006-01-02 MST"),
233233
daysLeftMessage,

ctl/pkg/ctl/license/license.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ func Check(ctx context.Context, allTargets []target.GetTargets_Result) (result C
6767
remaining, message := GetTimeToExpiration(license)
6868
// Warn by default 90 days before expiry.
6969
renewalWindow := 90 * 24 * time.Hour
70-
if license.Data.Type == pl.CertType_CERT_TYPE_TEMPORARY {
71-
// For temp licenses only warn 14 days before.
70+
if license.Data.Type == pl.CertType_CERT_TYPE_TRIAL {
71+
// For trial licenses only warn 14 days before.
7272
renewalWindow = 14 * 24 * time.Hour
7373
}
7474

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/spf13/pflag v1.0.10
2828
github.com/spf13/viper v1.20.1
2929
github.com/stretchr/testify v1.11.1
30-
github.com/thinkparq/protobuf v0.8.3-0.20260212175550-a80b99765f45
30+
github.com/thinkparq/protobuf v0.8.4-0.20260512100505-4d5e5db08506
3131
go.opentelemetry.io/contrib/bridges/otelzap v0.18.0
3232
go.opentelemetry.io/otel v1.44.0
3333
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.20.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
187187
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
188188
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
189189
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
190-
github.com/thinkparq/protobuf v0.8.3-0.20260212175550-a80b99765f45 h1:c9FgSLwEY4qoHz5qeR2JY08xZjI/Cw0IZi2qGyIWMBY=
191-
github.com/thinkparq/protobuf v0.8.3-0.20260212175550-a80b99765f45/go.mod h1:AaUUy9mWaja/EggLSfzbKydAe+We+440z/6FdmPz5yI=
190+
github.com/thinkparq/protobuf v0.8.4-0.20260512100505-4d5e5db08506 h1:RtVAV/tc2GatkOCQIWH282/F9NUX1iIriny0oddNMzk=
191+
github.com/thinkparq/protobuf v0.8.4-0.20260512100505-4d5e5db08506/go.mod h1:iqZlCWzy4WL/0k5I/AU6muxmUif4XcSwjC3mvwkkhHs=
192192
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
193193
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
194194
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=

0 commit comments

Comments
 (0)