Skip to content

Commit b9387c9

Browse files
committed
moving changes from ent
1 parent 35ab1d2 commit b9387c9

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

command/operator_diagnose.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,9 @@ SEALFAIL:
652652
if envLicense := os.Getenv(EnvVaultLicense); envLicense != "" {
653653
coreConfig.License = envLicense
654654
}
655-
vault.DiagnoseCheckLicense(licenseCtx, vaultCore, coreConfig, false)
655+
vault.DiagnoseCheckLicense(licenseCtx, vaultCore, coreConfig, vault.DiagnoseCheckLicenseGeneration{
656+
Generate: false,
657+
})
656658
}
657659
licenseSpan.End()
658660

vault/core_util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ func (c *Core) MissingRequiredState(raw []string, perfStandby bool) bool {
207207
return false
208208
}
209209

210-
func DiagnoseCheckLicense(ctx context.Context, vaultCore *Core, coreConfig CoreConfig, generate bool) (bool, []string) {
210+
func DiagnoseCheckLicense(ctx context.Context, vaultCore *Core, coreConfig CoreConfig, generateInput DiagnoseCheckLicenseGeneration) (bool, []string) {
211211
return false, nil
212212
}
213213

vault/core_util_common.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ import (
1111
"github.com/hashicorp/vault/sdk/logical"
1212
)
1313

14+
type DiagnoseCheckLicenseGeneration struct {
15+
Generate bool
16+
GenerateIBMLicense bool
17+
}
18+
1419
// GetCoreConfigInternal returns the server configuration
1520
// in struct format.
1621
func (c *Core) GetCoreConfigInternal() *server.Config {

0 commit comments

Comments
 (0)