From 7f2cfd0a793467f8c0d671a63a90f79be911b6dd Mon Sep 17 00:00:00 2001
From: Hridoy Roy <roy@hashicorp.com>
Date: Mon, 2 Aug 2021 15:30:49 -0700
Subject: [PATCH] Backport: Don't use autogenerated licenses in diagnose when
 config is specified (#12235)

* backport disk usage print fixes

* diagnose license fix backport
---
 changelog/_2071.txt          | 3 +++
 command/operator_diagnose.go | 2 +-
 vault/core_util.go           | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 changelog/_2071.txt

diff --git a/changelog/_2071.txt b/changelog/_2071.txt
new file mode 100644
index 0000000000000..7168d22e2a69d
--- /dev/null
+++ 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
index bfba8afd49c2b..64b6295989d36 100644
--- 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
index 6fd27fb3d1b34..5b95bc5287a47 100644
--- 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
 }