Remove default buildpacks filter and change default sort to 'lifecycle'

* also add missing docs

Author: sethboyles

app/fetchers/buildpack_list_fetcher.rb

@@ -19,7 +19,8 @@ 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 : Config.config.get(:default_app_lifecycle))
+
+        dataset = dataset.where(lifecycle: message.lifecycle) if message.requested?(:lifecycle)
 
         if message.requested?(:label_selector)
           dataset = LabelSelectorQueryGenerator.add_selector_queries(

app/messages/buildpacks_list_message.rb

@@ -21,7 +21,8 @@ class BuildpacksListMessage < MetadataListMessage
 
     def initialize(params={})
       super
-      pagination_options.default_order_by = :position
+      pagination_options.default_order_by = :lifecycle
+      pagination_options.secondary_default_order_by = :position
     end
 
     def self.from_params(params)
@@ -33,7 +34,7 @@ def to_param_hash
     end
 
     def valid_order_by_values
-      super << :position
+      super + %i[position lifecycle]
     end
   end
 

docs/v3/source/includes/api_resources/_buildpacks.erb

@@ -8,6 +8,7 @@
     "filename": null,
     "stack": "windows64",
     "position": 42,
+    "lifecycle": "buildpack",
     "enabled": true,
     "locked": false,
     "metadata": {
@@ -52,6 +53,7 @@
         "filename": null,
         "stack": "my-stack",
         "position": 1,
+        "lifecycle": "cnb",
         "enabled": true,
         "locked": false,
         "metadata": {

docs/v3/source/includes/resources/buildpacks/_create.md.erb

@@ -44,6 +44,7 @@ Name         | Type      | Description
 -----------  | --------  | -----------------------------------------------------------------------------  | -------
 **stack**    | _string_  | The name of the stack that the buildpack will use                             | null
 **position** | _integer_ | The order in which the buildpacks are checked during buildpack auto-detection | 1
+**lifecycle**| _string_  | The version of buildpack the buildpack will use. `buildpack` indicates [Classic Buildpacks](https://docs.cloudfoundry.org/buildpacks/classic.html). `cnb` indicates [Cloud Native Buildpacks](https://docs.cloudfoundry.org/buildpacks/cnb/) | buildpack
 **enabled**  | _boolean_ | Whether or not the buildpack will be used for staging                          | true
 **locked**   | _boolean_ | Whether or not the buildpack is locked to prevent updating the bits            | false
 **metadata.labels** | [_label object_](#labels) | Labels applied to the buildpack

docs/v3/source/includes/resources/buildpacks/_list.md.erb

@@ -34,7 +34,8 @@ Name | Type | Description
 **per_page** | _integer_ | Number of results per page; <br>valid values are 1 through 5000
 **names** | _list of strings_ | Comma-delimited list of buildpack names to filter by
 **stacks**| _list of strings_ | Comma-delimited list of stack names to filter by
-**order_by** | _string_ | Value to sort by; defaults to ascending. Prepend with `-` to sort descending. <br>Valid values are `created_at`, `updated_at`, and `position`
+**lifecycle**| _string_ | Type of buildpack. Valid values are `buildpack` and `cnb`
+**order_by** | _string_ | Value to sort by; defaults to ascending. Prepend with `-` to sort descending. <br>Valid values are `created_at`, `updated_at`, `lifecycle`, and `position`
 **label_selector** | _string_ | A query string containing a list of [label selector](#labels-and-selectors) requirements
 **created_ats** | _[timestamp](#timestamps)_ | Timestamp to filter by. When filtering on equality, several comma-delimited timestamps may be passed. Also supports filtering with [relational operators](#relational-operators)
 **updated_ats** | _[timestamp](#timestamps)_ | Timestamp to filter by. When filtering on equality, several comma-delimited timestamps may be passed. Also supports filtering with [relational operators](#relational-operators)

docs/v3/source/includes/resources/buildpacks/_object.md.erb

@@ -15,7 +15,8 @@ Name           | Type                     | Description
 **updated_at** | _[timestamp](#timestamps)_               | The time with zone when the object was last updated
 **name**       | _string_                 | The name of the buildpack; to be used by app buildpack field (only alphanumeric characters)
 **state**      | _string_                 | The state of the buildpack; valid states are: `AWAITING_UPLOAD`, `READY`
-**stack**      | _string_                 | The name of the stack that the buildpack will use
+**stack**      | _string_                 | The name of the stack that the buildpack uses
+**lifecycle**  | _string_                 | The version of buildpacks the buildpack uses. `buildpack` indicates [Classic Buildpacks](https://docs.cloudfoundry.org/buildpacks/classic.html). `cnb` indicates [Cloud Native Buildpacks](https://docs.cloudfoundry.org/buildpacks/cnb/)
 **filename**   | _string_                 | The filename of the buildpack
 **position**   | _integer_                | The order in which the buildpacks are checked during buildpack auto-detection
 **enabled**    | _boolean_                | Whether or not the buildpack can be used for staging

lib/cloud_controller/paging/pagination_options.rb

@@ -12,7 +12,7 @@ class PaginationOptions
     DIRECTION_DEFAULT = 'asc'.freeze
     VALID_DIRECTIONS  = %w[asc desc].freeze
 
-    attr_writer :order_by, :order_direction, :default_order_by
+    attr_writer :order_by, :order_direction, :default_order_by, :secondary_default_order_by
     attr_accessor :page, :per_page
 
     def initialize(params)
@@ -38,6 +38,12 @@ def order_direction
       @order_direction || DIRECTION_DEFAULT
     end
 
+    def secondary_order_by
+      return if @order_by && @order_by.to_s != default_order_by.to_s
+
+      @secondary_default_order_by
+    end
+
     def keys
       %i[page per_page order_by order_direction]
     end

lib/cloud_controller/paging/sequel_paginator.rb

@@ -13,6 +13,8 @@ def get_page(dataset, pagination_options)
       order_type = Sequel.send(order_direction, Sequel.qualify(table_name, order_by))
       dataset = dataset.order(order_type)
 
+      secondary_order_by = pagination_options.secondary_order_by
+      dataset = dataset.order_append(Sequel.send(order_direction, Sequel.qualify(table_name, secondary_order_by))) if secondary_order_by
       dataset = dataset.order_append(Sequel.send(order_direction, Sequel.qualify(table_name, :guid))) if order_by != 'id' && has_guid_column
 
       distinct_opt = dataset.opts[:distinct]