Skip to content

Commit 62487cd

Browse files
authored
Fix lifecycle validation for partial app updates (#5570)
1 parent e33f2ae commit 62487cd

2 files changed

Lines changed: 69 additions & 3 deletions

File tree

‎lib/cloud_controller/diego/lifecycles/app_base_lifecycle.rb‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ class AppBaseLifecycle
77
def initialize(message, app=nil)
88
@message = message
99

10-
db_result = BuildpackLifecycleFetcher.fetch(effective_buildpacks(app), stack, type)
10+
validation_data = lifecycle_data_for_validation(app)
11+
db_result = BuildpackLifecycleFetcher.fetch(validation_data[:buildpacks], validation_data[:stack], type)
1112

1213
@validator = validator_class.new(
1314
buildpack_infos: db_result[:buildpack_infos],
@@ -37,8 +38,22 @@ def validator_class
3738
BuildpackLifecycleDataValidator
3839
end
3940

40-
def effective_buildpacks(app)
41-
message.buildpack_data.requested?(:buildpacks) ? buildpacks : (app&.lifecycle_data&.buildpacks || [])
41+
def lifecycle_data_for_validation(app)
42+
return { buildpacks:, stack: } unless app && validating_stored_buildpacks?
43+
44+
stored_data = app.lifecycle_data
45+
46+
{
47+
buildpacks: stored_data.buildpacks || [],
48+
stack: message.buildpack_data.requested?(:stack) ? stack : (stored_data.stack || stack)
49+
}
50+
end
51+
52+
def validating_stored_buildpacks?
53+
# Stored URLs are needed to detect embedded userinfo when credentials are added separately.
54+
message.buildpack_data.requested?(:credentials) &&
55+
message.buildpack_data.credentials.present? &&
56+
!message.buildpack_data.requested?(:buildpacks)
4257
end
4358

4459
def effective_credentials(app)

‎spec/unit/lib/cloud_controller/diego/lifecycles/app_buildpack_lifecycle_spec.rb‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,57 @@ module VCAP::CloudController
134134
end
135135
end
136136

137+
describe 'validation of stored lifecycle data' do
138+
let(:stored_stack) { create(:stack, name: 'some-stack') }
139+
let(:app) { create(:app_model, :buildpack) }
140+
let!(:stored_buildpack) { create(:buildpack, name: 'some-buildpack', stack: stored_stack.name) }
141+
142+
before do
143+
app.lifecycle_data.update(buildpacks: ['some-buildpack'], stack: stored_stack.name)
144+
end
145+
146+
context 'when the request does not include lifecycle data' do
147+
let(:message) { AppUpdateMessage.new(lifecycle: { type: 'buildpack', data: {} }) }
148+
149+
it 'does not validate stored buildpacks' do
150+
expect(BuildpackLifecycleFetcher).to receive(:fetch).with([], Stack.default.name, Lifecycles::BUILDPACK).and_call_original
151+
152+
lifecycle = AppBuildpackLifecycle.new(message, app)
153+
154+
expect(lifecycle).to be_valid
155+
end
156+
end
157+
158+
context 'when the request clears lifecycle credentials' do
159+
let(:message) { AppUpdateMessage.new(lifecycle: { type: 'buildpack', data: { credentials: nil } }) }
160+
161+
it 'does not validate stored buildpacks' do
162+
expect(BuildpackLifecycleFetcher).to receive(:fetch).with([], Stack.default.name, Lifecycles::BUILDPACK).and_call_original
163+
164+
lifecycle = AppBuildpackLifecycle.new(message, app)
165+
166+
expect(lifecycle).to be_valid
167+
end
168+
end
169+
170+
context 'when credentials are updated without buildpacks' do
171+
let(:message) do
172+
AppUpdateMessage.new(lifecycle: {
173+
type: 'buildpack',
174+
data: { credentials: { 'buildpacks.example.org' => { username: 'user', password: 'password' } } }
175+
})
176+
end
177+
178+
it 'validates the stored buildpacks against the stored stack' do
179+
expect(BuildpackLifecycleFetcher).to receive(:fetch).with(['some-buildpack'], stored_stack.name, Lifecycles::BUILDPACK).and_call_original
180+
181+
lifecycle = AppBuildpackLifecycle.new(message, app)
182+
183+
expect(lifecycle).to be_valid
184+
end
185+
end
186+
end
187+
137188
describe '#create_lifecycle_data_model with credentials' do
138189
context 'when credentials are provided' do
139190
let(:creds) { { 'git.example.com' => { 'username' => 'u', 'password' => 'p' } } }

0 commit comments

Comments
 (0)