Skip to content

Commit df8f659

Browse files
committed
Enforce lifecycle_type on apps, droplets, and builds
1 parent 20fb68b commit df8f659

22 files changed

Lines changed: 159 additions & 193 deletions

‎app/actions/build_create.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ def create_and_stage(package:, lifecycle:, metadata: nil, start_after_staging: f
5454
state: BuildModel::STAGING_STATE,
5555
package_guid: package.guid,
5656
app: package.app,
57+
lifecycle_type: lifecycle.type,
5758
staging_memory_in_mb: staging_details.staging_memory_in_mb,
5859
staging_disk_in_mb: staging_details.staging_disk_in_mb,
5960
staging_log_rate_limit: staging_details.staging_log_rate_limit_bytes_per_second,

‎app/actions/droplet_copy.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def copy(destination_app, user_audit_info)
2020
raise InvalidCopyError.new('source droplet is not staged') unless @source_droplet.staged?
2121
raise InvalidCopyError.new('source and destination lifecycle types do not match') unless @source_droplet.lifecycle_type == destination_app.lifecycle_type
2222

23-
new_droplet = DropletModel.new(state: DropletModel::COPYING_STATE, app: destination_app)
23+
new_droplet = DropletModel.new(state: DropletModel::COPYING_STATE, app: destination_app, lifecycle_type: destination_app.lifecycle_type)
2424

2525
# Needed to execute serializers and deserializers correctly on source and destination models
2626
CLONED_ATTRIBUTES.each do |attr|

‎app/actions/droplet_create.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ def create(app, message, user_audit_info)
1414
droplet = DropletModel.new(
1515
app: app,
1616
state: DropletModel::AWAITING_UPLOAD_STATE,
17+
lifecycle_type: BuildpackLifecycleDataModel::LIFECYCLE_TYPE,
1718
process_types: message.process_types || DEFAULT_PROCESS_TYPES,
1819
execution_metadata: ''
1920
)
@@ -87,6 +88,7 @@ def droplet_from_build(build)
8788
app: build.app,
8889
package_guid: build.package_guid,
8990
state: DropletModel::STAGING_STATE,
91+
lifecycle_type: build.lifecycle_type,
9092
build: build
9193
)
9294
end

‎app/controllers/internal/staging_completion_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def droplet_completed(staging_guid)
2222
droplet = DropletModel.find(guid: staging_guid)
2323
raise CloudController::Errors::ApiError.new_from_details('ResourceNotFound', 'Droplet not found') if droplet.nil?
2424

25-
build = BuildModel.create(package: droplet.package, app: droplet.app, state: DropletModel::STAGING_STATE)
25+
build = BuildModel.create(package: droplet.package, app: droplet.app, state: DropletModel::STAGING_STATE, lifecycle_type: droplet.lifecycle_type)
2626

2727
BuildModel.db.transaction do
2828
build.lock!

‎app/controllers/runtime/apps_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def upload_droplet(guid)
194194

195195
enqueued_job = nil
196196
DropletModel.db.transaction do
197-
droplet = DropletModel.create(app: process.app, state: DropletModel::PROCESSING_UPLOAD_STATE)
197+
droplet = DropletModel.create(app: process.app, state: DropletModel::PROCESSING_UPLOAD_STATE, lifecycle_type: BuildpackLifecycleDataModel::LIFECYCLE_TYPE)
198198
BuildpackLifecycleDataModel.create(droplet:)
199199

200200
droplet_upload_job = Jobs::V2::UploadDropletFromUser.new(droplet_path, droplet.guid)

‎app/fetchers/app_list_fetcher.rb‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,7 @@ def filter(message, dataset)
3333
dataset = dataset.where(guid: buildpack_lifecycle_data_dataset.select(:app_guid))
3434
end
3535

36-
if message.requested?(:lifecycle_type)
37-
case message.lifecycle_type
38-
when BuildpackLifecycleDataModel::LIFECYCLE_TYPE
39-
dataset = dataset.where(
40-
guid: BuildpackLifecycleDataModel.
41-
where(Sequel.~(app_guid: nil)).
42-
select(:app_guid)
43-
)
44-
when DockerLifecycleDataModel::LIFECYCLE_TYPE
45-
dataset = dataset.exclude(
46-
guid: BuildpackLifecycleDataModel.
47-
where(Sequel.~(app_guid: nil)).
48-
select(:app_guid)
49-
).exclude(
50-
guid: CNBLifecycleDataModel.
51-
where(Sequel.~(app_guid: nil)).
52-
select(:app_guid)
53-
)
54-
when CNBLifecycleDataModel::LIFECYCLE_TYPE
55-
dataset = dataset.where(
56-
guid: CNBLifecycleDataModel.
57-
where(Sequel.~(app_guid: nil)).
58-
select(:app_guid)
59-
)
60-
end
61-
end
36+
dataset = dataset.where(lifecycle_type: message.lifecycle_type) if message.requested?(:lifecycle_type)
6237

6338
if message.requested?(:organization_guids)
6439
dataset = dataset.

‎app/models/runtime/app_model.rb‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,7 @@ def validate
9898
end
9999

100100
def lifecycle_type
101-
return self[:lifecycle_type] if self[:lifecycle_type].present?
102-
103-
# Fallback for records written before the lifecycle_type column
104-
# existed. Remove once existing rows are backfilled (see #5067).
105-
return BuildpackLifecycleDataModel::LIFECYCLE_TYPE if buildpack_lifecycle_data
106-
return CNBLifecycleDataModel::LIFECYCLE_TYPE if cnb_lifecycle_data
107-
108-
DockerLifecycleDataModel::LIFECYCLE_TYPE
101+
self[:lifecycle_type]
109102
end
110103

111104
def lifecycle_data

‎app/models/runtime/build_model.rb‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,7 @@ def before_create
6363
end
6464

6565
def lifecycle_type
66-
return self[:lifecycle_type] if self[:lifecycle_type].present?
67-
68-
# Fallback for records written before the lifecycle_type column
69-
# existed. Remove once existing rows are backfilled (see #5067).
70-
return BuildpackLifecycleDataModel::LIFECYCLE_TYPE if buildpack_lifecycle_data
71-
return CNBLifecycleDataModel::LIFECYCLE_TYPE if cnb_lifecycle_data
72-
73-
DockerLifecycleDataModel::LIFECYCLE_TYPE
66+
self[:lifecycle_type]
7467
end
7568

7669
def buildpack_lifecycle?

‎app/models/runtime/droplet_model.rb‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,7 @@ def fail_to_stage!(reason='StagingError', details='staging failed')
176176
end
177177

178178
def lifecycle_type
179-
return self[:lifecycle_type] if self[:lifecycle_type].present?
180-
181-
# Fallback for records written before the lifecycle_type column
182-
# existed. Remove once existing rows are backfilled (see #5067).
183-
return BuildpackLifecycleDataModel::LIFECYCLE_TYPE if buildpack_lifecycle_data
184-
return CNBLifecycleDataModel::LIFECYCLE_TYPE if cnb_lifecycle_data
185-
186-
DockerLifecycleDataModel::LIFECYCLE_TYPE
179+
self[:lifecycle_type]
187180
end
188181

189182
def lifecycle_data

‎app/presenters/v3/process_presenter.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ProcessPresenter < BasePresenter
1111
class << self
1212
# :labels and :annotations come from MetadataPresentationHelpers
1313
def associated_resources
14-
super + [{ app: %i[buildpack_lifecycle_data cnb_lifecycle_data] }]
14+
super + [:app]
1515
end
1616
end
1717

0 commit comments

Comments
 (0)