read default lifecycle from config

Co-authored-by: Pavel Busko <[email protected]>
cloudfoundry · Jul 25, 2024 · 80baf46 · 80baf46
1 parent 08caa11
commit 80baf46
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/app/actions/buildpack_create.rb b/app/actions/buildpack_create.rb
@@ -14,7 +14,7 @@ def create(message)
         buildpack = Buildpack.create(
           name: message.name,
           stack: message.stack,
-          lifecycle: (message.lifecycle.nil? ? VCAP::CloudController::Config.config.get(:default_app_lifecycle) : message.lifecycle),
+          lifecycle: (message.lifecycle.nil? ? Config.config.get(:default_app_lifecycle) : message.lifecycle),
           enabled: (message.enabled.nil? ? DEFAULT_ENABLED : message.enabled),
           locked: (message.locked.nil? ? DEFAULT_LOCKED : message.locked)
         )

diff --git a/app/controllers/runtime/buildpacks_controller.rb b/app/controllers/runtime/buildpacks_controller.rb
@@ -7,7 +7,7 @@ def self.dependencies
     define_attributes do
       attribute :name, String
       attribute :stack, String, default: nil
-      attribute :lifecycle, String, default: Lifecycles::BUILDPACK, exclude_in: :update
+      attribute :lifecycle, String, default: nil, exclude_in: :update
       attribute :position, Integer, default: 0
       attribute :enabled, Message::Boolean, default: true
       attribute :locked, Message::Boolean, default: false

diff --git a/app/fetchers/buildpack_lifecycle_fetcher.rb b/app/fetchers/buildpack_lifecycle_fetcher.rb
@@ -3,7 +3,7 @@
 module VCAP::CloudController
   class BuildpackLifecycleFetcher
     class << self
-      def fetch(buildpack_names, stack_name, lifecycle=VCAP::CloudController::Lifecycles::BUILDPACK)
+      def fetch(buildpack_names, stack_name, lifecycle=Config.config.get(:default_app_lifecycle))
         {
           stack: Stack.find(name: stack_name),
           buildpack_infos: ordered_buildpacks(buildpack_names, stack_name, lifecycle)

diff --git a/app/fetchers/buildpack_list_fetcher.rb b/app/fetchers/buildpack_list_fetcher.rb
@@ -19,7 +19,7 @@ def filter(message, dataset)
         dataset = dataset.where(name: message.names) if message.requested?(:names)
 
         dataset = NullFilterQueryGenerator.add_filter(dataset, :stack, message.stacks) if message.requested?(:stacks)
-        dataset = dataset.where(lifecycle: message.requested?(:lifecycle) ? message.lifecycle : Lifecycles::BUILDPACK)
+        dataset = dataset.where(lifecycle: message.requested?(:lifecycle) ? message.lifecycle : Config.config.get(:default_app_lifecycle))
 
         if message.requested?(:label_selector)
           dataset = LabelSelectorQueryGenerator.add_selector_queries(

diff --git a/app/models/runtime/buildpack.rb b/app/models/runtime/buildpack.rb
@@ -14,7 +14,7 @@ class Buildpack < Sequel::Model
     ].map(&:freeze).freeze
 
     def after_initialize
-      self.lifecycle ||= Lifecycles::BUILDPACK
+      self.lifecycle ||= Config.config.get(:default_app_lifecycle)
     end
 
     one_to_many :labels, class: 'VCAP::CloudController::BuildpackLabelModel', key: :resource_guid, primary_key: :guid
@@ -27,7 +27,7 @@ def self.user_visibility_filter(_user)
       full_dataset_filter
     end
 
-    def self.list_admin_buildpacks(stack_name=nil, lifecycle=VCAP::CloudController::Lifecycles::BUILDPACK)
+    def self.list_admin_buildpacks(stack_name=nil, lifecycle=Config.config.get(:default_app_lifecycle))
       scoped = exclude(key: nil).exclude(key: '')
       scoped = scoped.filter(lifecycle:)
       if stack_name.present?

diff --git a/spec/unit/controllers/runtime/buildpacks_controller_spec.rb b/spec/unit/controllers/runtime/buildpacks_controller_spec.rb
@@ -26,7 +26,7 @@ def ordered_buildpacks
                                                                                            position: { type: 'integer', default: 0 },
                                                                                            enabled: { type: 'bool', default: true },
                                                                                            locked: { type: 'bool', default: false },
-                                                                                           lifecycle: { type: 'string', default: 'buildpack' }
+                                                                                           lifecycle: { type: 'string' }
                                                                                          })
       end