Repository navigation
Fix STI subclass bug in FieldEncryptor#before_create - #5616
Merged
Merged
Conversation
ManagedServiceInstance and UserProvidedServiceInstance are STI subclasses of ServiceInstance, but only "ServiceInstance" is registered in encrypted_classes. The before_create hook checked only self.class.name, so precursor INSERTs for managed service instances never set encryption_key_label, leaving it NULL permanently when the failure path skipped the credentials= setter. Fix: walk the ancestor chain instead of checking the class name directly.
jochenehret
force-pushed
the
fix_null_encryption_key_labels
branch
from
November 2, 2026 14:30
bec370f to
bced62b
Compare
johha
approved these changes
Nov 3, 2026
ari-wg-gitbot
added a commit
to cloudfoundry/capi-release
that referenced
this pull request
Nov 3, 2026
Changes in cloud_controller_ng:
- Fix STI subclass bug in FieldEncryptor#before_create
PR: cloudfoundry/cloud_controller_ng#5616
Author: Jochen Ehret <jochen.ehret@sap.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A short explanation of the proposed change:
ManagedServiceInstance and UserProvidedServiceInstance are STI subclasses
of ServiceInstance, but only "ServiceInstance" is registered in
encrypted_classes. The before_create hook checked only self.class.name,
so precursor INSERTs for managed service instances never set
encryption_key_label, leaving it NULL permanently when the failure path
skipped the credentials= setter.
Fix: walk the ancestor chain instead of checking the class name directly.
An explanation of the use cases your change solves
On a productive system, there are often a few
service_instancerows without anencryption_key_label, e.g. when the service instance creation failed. In this case, thecheck_cc_database_keyerrand reports that some rows need re-encryption and then you have to start therotate_cc_database_keyerrand. We would like to avoid this overhead. Assigning the currentencryption_key_labeleven if the creation fails solves the problem.Links to any other associated PRs
New Rake task to check for ccdb encryption key rotation #5476
Rotate cc db key pre check capi-release#696
"check" db key errand: Log number of rows using encryption keys #5593
I have reviewed the contributing guide
I have viewed, signed, and submitted the Contributor License Agreement
I have made this pull request to the
mainbranchI have run all the unit tests using
bundle exec rakeI have run CF Acceptance Tests -> only the
include_servicessuite, passesThis PR has been created with Claude Code.