Skip to content

Ignore unique errors for domain, route & service instances #4641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johha merged 1 commit into from
Nov 5, 2025
Merged

Ignore unique errors for domain, route & service instances #4641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/models/runtime/domain.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ def shared_or_owned_by(organization_ids)
join_table: 'organizations_private_domains',
left_key: :private_domain_id,
right_key: :organization_id,
before_add: :validate_add_shared_organization
before_add: :validate_add_shared_organization,
ignored_unique_constraint_violation_errors: %w[orgs_pd_ids]
)

add_association_dependencies(
Expand Down
3 changes: 2 additions & 1 deletion app/models/runtime/route.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ class InvalidOrganizationRelation < CloudController::Errors::InvalidRelation; en
right_key: :target_space_guid,
right_primary_key: :guid,
join_table: :route_shares,
class: VCAP::CloudController::Space
class: VCAP::CloudController::Space,
ignored_unique_constraint_violation_errors: %w[route_shares.PRIMARY route_target_space_pk]

one_to_one :route_binding
one_through_one :service_instance, join_table: :route_bindings
Expand Down
3 changes: 2 additions & 1 deletion app/models/services/service_instance.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ class InvalidServiceBinding < StandardError; end
right_key: :target_space_guid,
right_primary_key: :guid,
join_table: :service_instance_shares,
class: VCAP::CloudController::Space
class: VCAP::CloudController::Space,
ignored_unique_constraint_violation_errors: %w[service_instance_shares.PRIMARY service_instance_target_space_pk]

many_to_many :routes, join_table: :route_bindings

Expand Down