Enforce lifecycle_type on apps, droplets, and builds

Author: WeiQuan0605

.github/workflows/codeql.yml

@@ -69,7 +69,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4.37.8
+      uses: github/codeql-action/init@v4.37.6
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -97,6 +97,6 @@ jobs:
         exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4.37.8
+      uses: github/codeql-action/analyze@v4.37.6
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/openapi_breaking_changes.yml

@@ -55,7 +55,7 @@ jobs:
           yarn build
 
       - name: Check for Breaking Changes
-        uses: oasdiff/oasdiff-action/breaking@v0.1.13
+        uses: oasdiff/oasdiff-action/breaking@v0.1.12
         with:
           base: 'base/docs/openapi/dist/latest/openapi.yaml'
           revision: 'pr/docs/openapi/dist/latest/openapi.yaml'

Gemfile

@@ -26,7 +26,7 @@ gem 'sequel', '~> 5.107'
 gem 'sequel_pg', require: 'sequel'
 gem 'sinatra', '~> 4.2'
 gem 'sinatra-contrib'
-gem 'statsd-instrument', '~> 4.0'
+gem 'statsd-instrument', '~> 3.11'
 gem 'talentbox-delayed_job_sequel', '~> 4.4.0'
 gem 'uri', '~> 1.1'
 
@@ -62,7 +62,7 @@ group :test do
   gem 'rubocop', '~> 1.89.0'
   gem 'rubocop-capybara'
   gem 'rubocop-factory_bot'
-  gem 'rubocop-rails', '~> 2.37'
+  gem 'rubocop-rails', '~> 2.36'
   gem 'rubocop-rspec', '~> 3.10'
   gem 'rubocop-rspec_rails'
   gem 'rubocop-sequel', '~> 0.4.1'

Gemfile.lock

@@ -84,13 +84,13 @@ GEM
     fluent-logger (0.10.0)
       logger (~> 1.6)
       msgpack (>= 1.0.0, < 2)
-    google-protobuf (4.36.0)
+    google-protobuf (4.35.1)
       bigdecimal
       rake (~> 13.3)
-    google-protobuf (4.36.0-x86_64-darwin)
+    google-protobuf (4.35.1-x86_64-darwin)
       bigdecimal
       rake (~> 13.3)
-    google-protobuf (4.36.0-x86_64-linux-gnu)
+    google-protobuf (4.35.1-x86_64-linux-gnu)
       bigdecimal
       rake (~> 13.3)
     googleapis-common-protos (1.10.0)
@@ -153,12 +153,12 @@ GEM
       redis (~> 5)
     msgpack (1.8.4)
     multi_json (1.21.1)
-    mustache (1.1.3)
+    mustache (1.1.2)
     mustermann (3.1.1)
     mutex_m (0.3.0)
     mysql2 (0.5.7)
       bigdecimal
-    newrelic_rpm (10.7.1)
+    newrelic_rpm (10.7.0)
       logger
     nio4r (2.7.5)
     nokogiri (1.19.4)
@@ -202,14 +202,14 @@ GEM
     pry-byebug (3.12.0)
       byebug (~> 13.0)
       pry (>= 0.13, < 0.17)
-    psych (5.5.0)
+    psych (5.4.0)
       date
       stringio
     public_suffix (7.0.5)
     puma (8.0.2)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.2.7)
+    rack (3.2.6)
     rack-protection (4.2.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
@@ -242,7 +242,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (4.2.0)
+    rbs (4.1.3)
       logger
       prism (>= 1.6.0)
       tsort
@@ -316,11 +316,11 @@ GEM
     rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.37.0)
+    rubocop-rails (2.36.0)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.89.0, < 2.0)
+      rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.44.0, < 2.0)
     rubocop-rspec (3.10.2)
       lint_roller (~> 1.1)
@@ -333,7 +333,7 @@ GEM
     rubocop-sequel (0.4.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1, < 2)
-    ruby-lsp (0.26.11)
+    ruby-lsp (0.26.10)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
       rbs (>= 3, < 5)
@@ -343,15 +343,15 @@ GEM
     ruby_parser (3.22.0)
       racc (~> 1.5)
       sexp_processor (~> 4.16)
-    rubyzip (3.5.0)
+    rubyzip (3.4.1)
     securerandom (0.4.1)
     sequel (5.107.0)
       bigdecimal
     sequel_pg (1.19.0)
       pg (>= 0.18.0, != 1.2.0)
       sequel (>= 4.38.0)
     sexp_processor (4.17.5)
-    simplecov (1.1.1)
+    simplecov (1.1.0)
     sinatra (4.2.1)
       logger (>= 1.6.0)
       mustermann (~> 3.0)
@@ -390,7 +390,7 @@ GEM
       yard (~> 0.9, >= 0.9.24)
       yard-activesupport-concern (~> 0.0)
       yard-solargraph (~> 0.1)
-    sorbet-runtime (0.6.13439)
+    sorbet-runtime (0.6.13421)
     sord (7.1.0)
       commander (~> 5.0)
       parlour (~> 9.1)
@@ -401,13 +401,13 @@ GEM
     spring (4.7.0)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    statsd-instrument (4.0.0)
+    statsd-instrument (3.11.1)
     stringio (3.2.0)
     talentbox-delayed_job_sequel (4.4.0)
       delayed_job (~> 4.1)
       sequel (>= 5.0, < 6.0)
     thor (1.5.0)
-    tilt (2.9.0)
+    tilt (2.8.0)
     timecop (0.9.11)
     tsort (0.2.0)
     tzinfo (2.0.6)
@@ -417,7 +417,7 @@ GEM
     unicode-emoji (4.2.0)
     uri (1.1.1)
     useragent (0.16.11)
-    webmock (3.26.3)
+    webmock (3.26.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -482,7 +482,7 @@ DEPENDENCIES
   rubocop (~> 1.89.0)
   rubocop-capybara
   rubocop-factory_bot
-  rubocop-rails (~> 2.37)
+  rubocop-rails (~> 2.36)
   rubocop-rspec (~> 3.10)
   rubocop-rspec_rails
   rubocop-sequel (~> 0.4.1)
@@ -496,7 +496,7 @@ DEPENDENCIES
   solargraph
   spring
   spring-commands-rspec
-  statsd-instrument (~> 4.0)
+  statsd-instrument (~> 3.11)
   talentbox-delayed_job_sequel (~> 4.4.0)
   timecop
   uri (~> 1.1)

app/actions/build_create.rb

@@ -54,6 +54,7 @@ def create_and_stage(package:, lifecycle:, metadata: nil, start_after_staging: f
         state: BuildModel::STAGING_STATE,
         package_guid: package.guid,
         app: package.app,
+        lifecycle_type: lifecycle.type,
         staging_memory_in_mb: staging_details.staging_memory_in_mb,
         staging_disk_in_mb: staging_details.staging_disk_in_mb,
         staging_log_rate_limit: staging_details.staging_log_rate_limit_bytes_per_second,

app/actions/droplet_copy.rb

@@ -20,7 +20,7 @@ def copy(destination_app, user_audit_info)
       raise InvalidCopyError.new('source droplet is not staged') unless @source_droplet.staged?
       raise InvalidCopyError.new('source and destination lifecycle types do not match') unless @source_droplet.lifecycle_type == destination_app.lifecycle_type
 
-      new_droplet = DropletModel.new(state: DropletModel::COPYING_STATE, app: destination_app)
+      new_droplet = DropletModel.new(state: DropletModel::COPYING_STATE, app: destination_app, lifecycle_type: destination_app.lifecycle_type)
 
       # Needed to execute serializers and deserializers correctly on source and destination models
       CLONED_ATTRIBUTES.each do |attr|

app/actions/droplet_create.rb

@@ -14,6 +14,7 @@ def create(app, message, user_audit_info)
       droplet = DropletModel.new(
         app: app,
         state: DropletModel::AWAITING_UPLOAD_STATE,
+        lifecycle_type: BuildpackLifecycleDataModel::LIFECYCLE_TYPE,
         process_types: message.process_types || DEFAULT_PROCESS_TYPES,
         execution_metadata: ''
       )
@@ -87,6 +88,7 @@ def droplet_from_build(build)
         app: build.app,
         package_guid: build.package_guid,
         state: DropletModel::STAGING_STATE,
+        lifecycle_type: build.lifecycle_type,
         build: build
       )
     end

app/controllers/internal/staging_completion_controller.rb

@@ -22,7 +22,7 @@ def droplet_completed(staging_guid)
       droplet          = DropletModel.find(guid: staging_guid)
       raise CloudController::Errors::ApiError.new_from_details('ResourceNotFound', 'Droplet not found') if droplet.nil?
 
-      build = BuildModel.create(package: droplet.package, app: droplet.app, state: DropletModel::STAGING_STATE)
+      build = BuildModel.create(package: droplet.package, app: droplet.app, state: DropletModel::STAGING_STATE, lifecycle_type: droplet.lifecycle_type)
 
       BuildModel.db.transaction do
         build.lock!

app/controllers/runtime/apps_controller.rb

@@ -194,7 +194,7 @@ def upload_droplet(guid)
 
       enqueued_job = nil
       DropletModel.db.transaction do
-        droplet = DropletModel.create(app: process.app, state: DropletModel::PROCESSING_UPLOAD_STATE)
+        droplet = DropletModel.create(app: process.app, state: DropletModel::PROCESSING_UPLOAD_STATE, lifecycle_type: BuildpackLifecycleDataModel::LIFECYCLE_TYPE)
         BuildpackLifecycleDataModel.create(droplet:)
 
         droplet_upload_job = Jobs::V2::UploadDropletFromUser.new(droplet_path, droplet.guid)

app/fetchers/app_list_fetcher.rb

@@ -33,32 +33,7 @@ def filter(message, dataset)
           dataset = dataset.where(guid: buildpack_lifecycle_data_dataset.select(:app_guid))
         end
 
-        if message.requested?(:lifecycle_type)
-          case message.lifecycle_type
-          when BuildpackLifecycleDataModel::LIFECYCLE_TYPE
-            dataset = dataset.where(
-              guid: BuildpackLifecycleDataModel.
-                    where(Sequel.~(app_guid: nil)).
-                    select(:app_guid)
-            )
-          when DockerLifecycleDataModel::LIFECYCLE_TYPE
-            dataset = dataset.exclude(
-              guid: BuildpackLifecycleDataModel.
-                    where(Sequel.~(app_guid: nil)).
-                    select(:app_guid)
-            ).exclude(
-              guid: CNBLifecycleDataModel.
-                    where(Sequel.~(app_guid: nil)).
-                    select(:app_guid)
-            )
-          when CNBLifecycleDataModel::LIFECYCLE_TYPE
-            dataset = dataset.where(
-              guid: CNBLifecycleDataModel.
-                    where(Sequel.~(app_guid: nil)).
-                    select(:app_guid)
-            )
-          end
-        end
+        dataset = dataset.where(lifecycle_type: message.lifecycle_type) if message.requested?(:lifecycle_type)
 
         if message.requested?(:organization_guids)
           dataset = dataset.