Merge remote-tracking branch 'remotes/from/ce/main'

command/operator_diagnose.go

@@ -652,7 +652,9 @@ SEALFAIL:
 		if envLicense := os.Getenv(EnvVaultLicense); envLicense != "" {
 			coreConfig.License = envLicense
 		}
-		vault.DiagnoseCheckLicense(licenseCtx, vaultCore, coreConfig, false)
+		vault.DiagnoseCheckLicense(licenseCtx, vaultCore, coreConfig, vault.DiagnoseCheckLicenseGeneration{
+			Generate: false,
+		})
 	}
 	licenseSpan.End()
 

sdk/helper/ldaputil/connection.go

@@ -28,3 +28,8 @@ type PagingConnection interface {
 	Connection
 	SearchWithPaging(searchRequest *ldap.SearchRequest, pagingSize uint32) (*ldap.SearchResult, error)
 }
+
+type PasswordModifyConnection interface {
+	Connection
+	PasswordModify(passwordModifyRequest *ldap.PasswordModifyRequest) (*ldap.PasswordModifyResult, error)
+}

vault/core_util.go

@@ -207,7 +207,7 @@ func (c *Core) MissingRequiredState(raw []string, perfStandby bool) bool {
 	return false
 }
 
-func DiagnoseCheckLicense(ctx context.Context, vaultCore *Core, coreConfig CoreConfig, generate bool) (bool, []string) {
+func DiagnoseCheckLicense(ctx context.Context, vaultCore *Core, coreConfig CoreConfig, generateInput DiagnoseCheckLicenseGeneration) (bool, []string) {
 	return false, nil
 }
 

vault/core_util_common.go

@@ -11,6 +11,11 @@ import (
 	"github.com/hashicorp/vault/sdk/logical"
 )
 
+type DiagnoseCheckLicenseGeneration struct {
+	Generate           bool
+	GenerateIBMLicense bool
+}
+
 // GetCoreConfigInternal returns the server configuration
 // in struct format.
 func (c *Core) GetCoreConfigInternal() *server.Config {