Backport: Don't use autogenerated licenses in diagnose when config is…

… specified (#12235) * backport disk usage print fixes * diagnose license fix backport
hashicorp · Aug 2, 2021 · 7f2cfd0 · 7f2cfd0
1 parent 6748c7d
commit 7f2cfd0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/changelog/_2071.txt b/changelog/_2071.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+core (enterprise): Disallow autogenerated licenses to be used in diagnose even when config is specified
+```
diff --git a/command/operator_diagnose.go b/command/operator_diagnose.go
@@ -597,7 +597,7 @@ SEALFAIL:
 		if envLicense := os.Getenv(EnvVaultLicense); envLicense != "" {
 			coreConfig.License = envLicense
 		}
-		vault.DiagnoseCheckLicense(licenseCtx, vaultCore, coreConfig)
+		vault.DiagnoseCheckLicense(licenseCtx, vaultCore, coreConfig, false)
 	}
 	licenseSpan.End()
 

diff --git a/vault/core_util.go b/vault/core_util.go
@@ -181,6 +181,6 @@ func (c *Core) MissingRequiredState(raw []string, perfStandby bool) bool {
 	return false
 }
 
-func DiagnoseCheckLicense(ctx context.Context, vaultCore *Core, coreConfig CoreConfig) (bool, []string) {
+func DiagnoseCheckLicense(ctx context.Context, vaultCore *Core, coreConfig CoreConfig, generate bool) (bool, []string) {
 	return false, nil
 }