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

changelog/12229.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+core: fix byte printing for diagnose disk checks
+```

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
+```

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()
 

go.mod

@@ -41,6 +41,7 @@ require (
 	github.com/docker/go-connections v0.4.0
 	github.com/dsnet/compress v0.0.1 // indirect
 	github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74
+	github.com/dustin/go-humanize v1.0.0
 	github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f
 	github.com/fatih/color v1.11.0
 	github.com/fatih/structs v1.1.0

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
 }

vault/diagnose/os_common.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/dustin/go-humanize"
 	"github.com/shirou/gopsutil/disk"
 )
 
@@ -31,11 +32,11 @@ partLoop:
 			Warn(ctx, fmt.Sprintf("Could not obtain partition usage for %s: %v.", partition.Mountpoint, err))
 		} else {
 			if usage.UsedPercent > 95 {
-				SpotWarn(ctx, testName, fmt.Sprintf(partition.Mountpoint+" is %d percent full.", usage.UsedPercent),
-					Advice("It is recommended to have more than five percent of the partition free."))
-			} else if usage.Free < 2<<30 {
-				SpotWarn(ctx, testName, partition.Mountpoint+" has %d bytes full.",
-					Advice("It is recommended to have at least 1 GB of space free per partition."))
+				SpotWarn(ctx, testName, fmt.Sprintf(partition.Mountpoint+" is %.2f percent full.", usage.UsedPercent))
+				Advise(ctx, "It is recommended to have more than five percent of the partition free.")
+			} else if usage.Free < 1<<30 {
+				SpotWarn(ctx, testName, fmt.Sprintf(partition.Mountpoint+" has %s free.", humanize.Bytes(usage.Free)))
+				Advise(ctx, "It is recommended to have at least 1 GB of space free per partition.")
 			} else {
 				SpotOk(ctx, testName, partition.Mountpoint+" usage ok.")
 			}