cpl 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d187c354ac6a9a75c0aea498f8fbc060f741809d075439ee22663fdf06f265d
-  data.tar.gz: ffde2f0f3be4663ba85baadf599c6a12882c2ba11734f9220d26366bacc5368d
+  metadata.gz: ad4122f8c7a91e2f665f348383580db755fc380d98d27d843ecbd30d49f5f7f7
+  data.tar.gz: 7a8d3d37524fad90a3849f5f2e233beaee64c59dbc62719e7951fec20b12a05f
 SHA512:
-  metadata.gz: 70941d48b8ccc5bb3fb46b6c96c91fd0d3c2f13f2a702822ee6541231d90957df5a3b3c9d60d2091afad9f6e76be8870953f69085a97315c2a865d534d0c1ce7
-  data.tar.gz: 3a109996c812ec2b2e9dc76c189bd5d3518835e5b221ff8f12416982f3542f1753dcba441dbb3ec32224e807d0c83db54fe78e21cad43da0d829b8d65593a6d5
+  metadata.gz: f075cf14b7d694b0d208993340f34643079752e853314fd31da964899c712d5ace36d7419e33e650dfaf47f3b18a5d708cb9140b4053931ffe193269e11c50c5
+  data.tar.gz: cfad8e5b8ef74ca29c7df36dd36aaeb64c83ef184d401441604a88cbd2555a96af96917f9fccdc839e375de6311649c59b4b0dd8e2f22e88286b6aca94ed41e1

data/CHANGELOG.md

@@ -14,6 +14,44 @@ Changes since the last non-beta release.
 
 _Please add entries here for your pull requests that are not yet released._
 
+### Fixed
+
+- Fixed issue where `copy-image-from-upstream` command does not copy commit. [PR 70](https://github.com/shakacode/heroku-to-control-plane/pull/70) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+- Fixed issue where an error is not raised if the app is not defined. [PR 73](https://github.com/shakacode/heroku-to-control-plane/pull/73) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+- Fixed issue where `CPLN_ENDPOINT` is not used if available. [PR 75](https://github.com/shakacode/heroku-to-control-plane/pull/75) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+
+### Added
+
+- Added `image_retention_max_qty` config to clean up images based on max quantity with `cleanup-images` command. [PR 72](https://github.com/shakacode/heroku-to-control-plane/pull/72) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+
+### Changed
+
+- Updated docs for `run` commands regarding passing arguments at the end. [PR 71](https://github.com/shakacode/heroku-to-control-plane/pull/71) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+- Renamed `cleanup-old-images` command to `cleanup-images`. [PR 72](https://github.com/shakacode/heroku-to-control-plane/pull/72) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+- Renamed `old_image_retention_days` config to `image_retention_days`. [PR 72](https://github.com/shakacode/heroku-to-control-plane/pull/72) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+
+## [1.0.4] - 2023-07-21
+
+### Fixed
+
+- Fixed issue where `run` commands fail when not providing image. [PR 68](https://github.com/shakacode/heroku-to-control-plane/pull/68) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+
+## [1.0.3] - 2023-07-07
+
+### Fixed
+
+- Fixed `run` commands when specifying image. [PR 62](https://github.com/shakacode/heroku-to-control-plane/pull/62) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+- Fixed `run:cleanup` command for non-interactive workloads. [PR 63](https://github.com/shakacode/heroku-to-control-plane/pull/63) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+- Fixed `run:cleanup` command for all apps that start with name. [PR 64](https://github.com/shakacode/heroku-to-control-plane/pull/64) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+- Fixed `cleanup-old-images` command for all apps that start with name. [PR 65](https://github.com/shakacode/heroku-to-control-plane/pull/65) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+- Fixed `--help` option. [PR 66](https://github.com/shakacode/heroku-to-control-plane/pull/66) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+
+### Added
+
+- Added `--use-local-token` option to `run:detached` command. [PR 61](https://github.com/shakacode/heroku-to-control-plane/pull/61) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+
+## [1.0.2] - 2023-07-02
+
 ### Added
 
 - Added steps to migrate to docs. [PR 57](https://github.com/shakacode/heroku-to-control-plane/pull/57) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
@@ -33,6 +71,9 @@ _Please add entries here for your pull requests that are not yet released._
 
 - Initial release
 
-[Unreleased]: https://github.com/shakacode/heroku-to-control-plane/compare/v1.0.1...HEAD
+[Unreleased]: https://github.com/shakacode/heroku-to-control-plane/compare/v1.0.4...HEAD
+[1.0.4]: https://github.com/shakacode/heroku-to-control-plane/compare/v1.0.3...v1.0.4
+[1.0.3]: https://github.com/shakacode/heroku-to-control-plane/compare/v1.0.2...v1.0.3
+[1.0.2]: https://github.com/shakacode/heroku-to-control-plane/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/shakacode/heroku-to-control-plane/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/shakacode/heroku-to-control-plane/releases/tag/v1.0.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cpl (1.0.3)
+    cpl (1.1.0)
       debug (~> 1.7.1)
       dotenv (~> 2.8.1)
       psych (~> 5.1.0)
@@ -25,8 +25,9 @@ GEM
     hashdiff (1.0.1)
     iniparse (1.5.0)
     io-console (0.6.0)
-    irb (1.7.1)
-      reline (>= 0.3.0)
+    irb (1.8.1)
+      rdoc
+      reline (>= 0.3.8)
     json (2.6.3)
     overcommit (0.60.0)
       childprocess (>= 0.6.3, < 5)
@@ -40,8 +41,10 @@ GEM
     public_suffix (5.0.1)
     rainbow (3.1.1)
     rake (13.0.6)
+    rdoc (6.5.0)
+      psych (>= 4.0.0)
     regexp_parser (2.6.2)
-    reline (0.3.5)
+    reline (0.3.8)
       io-console (~> 0.5)
     rexml (3.2.5)
     rspec (3.12.0)
@@ -83,7 +86,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    stringio (3.0.7)
+    stringio (3.0.8)
     thor (1.2.2)
     timecop (0.9.6)
     unicode-display_width (2.4.2)

data/README.md

@@ -163,9 +163,13 @@ aliases:
     # when running the command `cpl cleanup-stale-apps`.
     stale_app_image_deployed_days: 5
 
+    # Images that exceed this quantity will be listed for deletion
+    # when running the command `cpl cleanup-images`.
+    image_retention_max_qty: 20
+
     # Images created before this amount of days will be listed for deletion
-    # when running the command `cpl cleanup-old-images`.
-    old_image_retention_days: 5
+    # when running the command `cpl cleanup-images` (`image_retention_max_qty` takes precedence).
+    image_retention_days: 5
 
     # Run workloads created before this amount of days will be listed for deletion
     # when running the command `cpl run:cleanup`.

data/docs/commands.md

@@ -46,15 +46,17 @@ cpl apply-template gvc postgres redis rails -a $APP_NAME
 cpl build-image -a $APP_NAME
 ```
 
-### `cleanup-old-images`
+### `cleanup-images`
 
-- Deletes all images for an app that are older than the specified amount of days
-- Specify the amount of days through `old_image_retention_days` in the `.controlplane/controlplane.yml` file
+- Deletes all images for an app that either exceed the max quantity or are older than the specified amount of days
+- Specify the max quantity through `image_retention_max_qty` in the `.controlplane/controlplane.yml` file
+- Specify the amount of days through `image_retention_days` in the `.controlplane/controlplane.yml` file
+- If `image_retention_max_qty` is specified, any images that exceed it will be deleted, regardless of `image_retention_days`
 - Will ask for explicit user confirmation
-- Does not affect the latest image, regardless of how old it is
+- Never deletes the latest image
 
 ```sh
-cpl cleanup-old-images -a $APP_NAME
+cpl cleanup-images -a $APP_NAME
 ```
 
 ### `cleanup-stale-apps`
@@ -314,8 +316,8 @@ cpl run -a $APP_NAME
 # Need to quote COMMAND if setting ENV value or passing args.
 cpl run 'LOG_LEVEL=warn rails db:migrate' -a $APP_NAME
 
-# COMMAND may also be passed at the end (in this case, no need to quote).
-cpl run -a $APP_NAME -- rails db:migrate
+# COMMAND may also be passed at the end.
+cpl run -a $APP_NAME -- 'LOG_LEVEL=warn rails db:migrate'
 
 # Runs command, displays output, and exits shell.
 cpl run ls / -a $APP_NAME
@@ -362,8 +364,8 @@ cpl run:detached rails db:prepare -a $APP_NAME
 # Need to quote COMMAND if setting ENV value or passing args.
 cpl run:detached 'LOG_LEVEL=warn rails db:migrate' -a $APP_NAME
 
-# COMMAND may also be passed at the end (in this case, no need to quote).
-cpl run:detached -a $APP_NAME -- rails db:migrate
+# COMMAND may also be passed at the end.
+cpl run:detached -a $APP_NAME -- 'LOG_LEVEL=warn rails db:migrate'
 
 # Uses a different image (which may not be promoted yet).
 cpl run:detached rails db:migrate -a $APP_NAME --image appimage:123 # Exact image name

data/lib/command/apply_template.rb

@@ -83,7 +83,7 @@ module Command
     end
 
     def ensure_templates!
-      missing_templates = templates.filter { |_template, filename| !File.exist?(filename) }.to_h
+      missing_templates = templates.reject { |_template, filename| File.exist?(filename) }.to_h
       return if missing_templates.empty?
 
       missing_templates_str = missing_templates.map do |template, filename|

data/lib/command/base.rb

@@ -206,7 +206,7 @@ module Command
     end
 
     def latest_image_from(items, app_name: config.app, name_only: true)
-      matching_items = items.filter { |item| item["name"].start_with?("#{app_name}:") }
+      matching_items = items.select { |item| item["name"].start_with?("#{app_name}:") }
 
       # Or special string to indicate no image available
       if matching_items.empty?
@@ -221,22 +221,28 @@ module Command
       @latest_image ||= {}
       @latest_image[app] ||=
         begin
-          items = cp.image_query(app, org)["items"]
+          items = cp.query_images(app, org)["items"]
           latest_image_from(items, app_name: app)
         end
     end
 
-    def latest_image_next(app = config.app, org = config.org)
+    def latest_image_next(app = config.app, org = config.org, commit: nil)
+      commit ||= config.options[:commit]
+
       @latest_image_next ||= {}
       @latest_image_next[app] ||= begin
         latest_image_name = latest_image(app, org)
         image = latest_image_name.split(":").first
         image += ":#{extract_image_number(latest_image_name) + 1}"
-        image += "_#{config.options[:commit]}" if config.options[:commit]
+        image += "_#{commit}" if commit
         image
       end
     end
 
+    def extract_image_commit(image_name)
+      image_name.match(/_(\h+)$/)&.captures&.first
+    end
+
     # NOTE: use simplified variant atm, as shelljoin do different escaping
     # TODO: most probably need better logic for escaping various quotes
     def args_join(args)

data/lib/command/cleanup_images.rb

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+module Command
+  class CleanupImages < Base # rubocop:disable Metrics/ClassLength
+    NAME = "cleanup-images"
+    OPTIONS = [
+      app_option(required: true),
+      skip_confirm_option
+    ].freeze
+    DESCRIPTION = <<~DESC
+      Deletes all images for an app that either exceed the max quantity or are older than the specified amount of days
+    DESC
+    LONG_DESCRIPTION = <<~DESC
+      - Deletes all images for an app that either exceed the max quantity or are older than the specified amount of days
+      - Specify the max quantity through `image_retention_max_qty` in the `.controlplane/controlplane.yml` file
+      - Specify the amount of days through `image_retention_days` in the `.controlplane/controlplane.yml` file
+      - If `image_retention_max_qty` is specified, any images that exceed it will be deleted, regardless of `image_retention_days`
+      - Will ask for explicit user confirmation
+      - Never deletes the latest image
+    DESC
+
+    def call # rubocop:disable Metrics/MethodLength
+      ensure_max_qty_or_days!
+
+      return progress.puts("No images to delete.") if images_to_delete.empty?
+
+      progress.puts("Images to delete:")
+      images_to_delete.each do |image|
+        created = Shell.color((image[:created]).to_s, :red)
+        reason = Shell.color(image[:reason], :red)
+        progress.puts("  - #{image[:name]} (#{created} - #{reason})")
+      end
+
+      return unless confirm_delete
+
+      progress.puts
+      delete_images
+    end
+
+    private
+
+    def ensure_max_qty_or_days!
+      @image_retention_max_qty = config.current[:image_retention_max_qty]
+      @image_retention_days = config.current[:image_retention_days]
+      return if @image_retention_max_qty || @image_retention_days
+
+      raise "Can't find either option 'image_retention_max_qty' or 'image_retention_days' " \
+            "for app '#{@config.app}' in 'controlplane.yml'."
+    end
+
+    def app_prefix
+      config.should_app_start_with?(config.app) ? "#{config.app}-" : "#{config.app}:"
+    end
+
+    def remove_deployed_image(app, images)
+      return images unless cp.fetch_gvc(app)
+
+      # If app exists, remove latest image, because we don't want to delete the image that is currently deployed
+      latest_image_name = latest_image_from(images, app_name: app)
+      images.reject { |image| image["name"] == latest_image_name }
+    end
+
+    def parse_images_and_sort_by_created(images)
+      images = images.map do |image|
+        {
+          name: image["name"],
+          created: DateTime.parse(image["created"])
+        }
+      end
+      images.sort_by { |image| image[:created] }
+    end
+
+    def add_reason_to_images(images, reason)
+      images.map do |image|
+        {
+          **image,
+          reason: reason
+        }
+      end
+    end
+
+    def filter_images_by_max_qty(images)
+      return [], images unless @image_retention_max_qty && images.length > @image_retention_max_qty
+
+      split_index = images.length - @image_retention_max_qty
+      excess_images = images[0...split_index]
+      remaining_images = images[split_index...]
+      excess_images = add_reason_to_images(excess_images, "exceeds max quantity of #{@image_retention_max_qty}")
+
+      [excess_images, remaining_images]
+    end
+
+    def filter_images_by_days(images)
+      return [] unless @image_retention_days
+
+      now = DateTime.now
+      old_images = images.select { |image| (now - image[:created]).to_i >= @image_retention_days }
+      add_reason_to_images(old_images, "older than #{@image_retention_days} days")
+    end
+
+    def images_to_delete # rubocop:disable Metrics/MethodLength
+      @images_to_delete ||=
+        begin
+          result_images = []
+
+          images = cp.query_images["items"].select { |item| item["name"].start_with?(app_prefix)	}
+          images_by_app = images.group_by { |item| item["repository"] }
+          images_by_app.each do |app, app_images|
+            app_images = remove_deployed_image(app, app_images)
+            app_images = parse_images_and_sort_by_created(app_images)
+            excess_images, remaining_images = filter_images_by_max_qty(app_images)
+            old_images = filter_images_by_days(remaining_images)
+
+            result_images += excess_images
+            result_images += old_images
+          end
+
+          result_images
+        end
+    end
+
+    def confirm_delete
+      return true if config.options[:yes]
+
+      Shell.confirm("\nAre you sure you want to delete these #{images_to_delete.length} images?")
+    end
+
+    def delete_images
+      images_to_delete.each do |image|
+        step("Deleting image '#{image[:name]}'") do
+          cp.image_delete(image[:name])
+        end
+      end
+    end
+  end
+end

data/lib/command/cleanup_stale_apps.rb

@@ -49,7 +49,7 @@ module Command
           gvcs.each do |gvc|
             app_name = gvc["name"]
 
-            images = cp.image_query(app_name)["items"].filter { |item| item["name"].start_with?("#{app_name}:") }
+            images = cp.query_images(app_name)["items"].select { |item| item["name"].start_with?("#{app_name}:") }
             image = latest_image_from(images, app_name: app_name, name_only: false)
             next unless image
 

data/lib/command/copy_image_from_upstream.rb

@@ -70,6 +70,7 @@ module Command
         cp.profile_switch(@upstream_profile)
         upstream_image = config.options[:image]
         upstream_image = latest_image(@upstream, @upstream_org) if !upstream_image || upstream_image == "latest"
+        @commit = extract_image_commit(upstream_image)
         @upstream_image_url = "#{@upstream_org}.registry.cpln.io/#{upstream_image}"
       end
     end
@@ -77,7 +78,7 @@ module Command
     def fetch_app_image_url
       step("Fetching app image URL") do
         cp.profile_switch("default")
-        app_image = latest_image_next(config.app, config.org)
+        app_image = latest_image_next(config.app, config.org, commit: @commit)
         @app_image_url = "#{config.org}.registry.cpln.io/#{app_image}"
       end
     end

data/lib/command/delete.rb

@@ -41,7 +41,7 @@ module Command
     end
 
     def delete_images
-      images = cp.image_query["items"]
+      images = cp.query_images["items"]
                  .filter_map { |item| item["name"] if item["name"].start_with?("#{config.app}:") }
 
       return progress.puts("No images to delete.") unless images.any?

data/lib/command/run.rb

@@ -31,8 +31,8 @@ module Command
       # Need to quote COMMAND if setting ENV value or passing args.
       cpl run 'LOG_LEVEL=warn rails db:migrate' -a $APP_NAME
 
-      # COMMAND may also be passed at the end (in this case, no need to quote).
-      cpl run -a $APP_NAME -- rails db:migrate
+      # COMMAND may also be passed at the end.
+      cpl run -a $APP_NAME -- 'LOG_LEVEL=warn rails db:migrate'
 
       # Runs command, displays output, and exits shell.
       cpl run ls / -a $APP_NAME
@@ -100,7 +100,7 @@ module Command
       # Override image if specified
       image = config.options[:image]
       image = latest_image if image == "latest"
-      container_spec["image"] = "/org/#{config.org}/image/#{image}"
+      container_spec["image"] = "/org/#{config.org}/image/#{image}" if image
 
       # Set runner
       container_spec["env"] ||= []

data/lib/command/run_cleanup.rb

@@ -69,12 +69,8 @@ module Command
           now = DateTime.now
           stale_run_workload_created_days = config[:stale_run_workload_created_days]
 
-          interactive_workloads = cp.query_workloads(
-            "-run-", partial_gvc_match: config.should_app_start_with?(config.app), partial_workload_match: true
-          )["items"]
-          non_interactive_workloads = cp.query_workloads(
-            "-runner-", partial_gvc_match: config.should_app_start_with?(config.app), partial_workload_match: true
-          )["items"]
+          interactive_workloads = cp.query_workloads("-run-", partial_workload_match: true)["items"]
+          non_interactive_workloads = cp.query_workloads("-runner-", partial_workload_match: true)["items"]
           workloads = interactive_workloads + non_interactive_workloads
 
           workloads.each do |workload|

data/lib/command/run_detached.rb

@@ -26,8 +26,8 @@ module Command
       # Need to quote COMMAND if setting ENV value or passing args.
       cpl run:detached 'LOG_LEVEL=warn rails db:migrate' -a $APP_NAME
 
-      # COMMAND may also be passed at the end (in this case, no need to quote).
-      cpl run:detached -a $APP_NAME -- rails db:migrate
+      # COMMAND may also be passed at the end.
+      cpl run:detached -a $APP_NAME -- 'LOG_LEVEL=warn rails db:migrate'
 
       # Uses a different image (which may not be promoted yet).
       cpl run:detached rails db:migrate -a $APP_NAME --image appimage:123 # Exact image name
@@ -91,7 +91,7 @@ module Command
       # Override image if specified
       image = config.options[:image]
       image = latest_image if image == "latest"
-      container_spec["image"] = "/org/#{config.org}/image/#{image}"
+      container_spec["image"] = "/org/#{config.org}/image/#{image}" if image
 
       # Set cron job props
       spec["type"] = "cron"

data/lib/core/config.rb

@@ -34,8 +34,8 @@ class Config
     "#{app_dir}/.controlplane"
   end
 
-  def should_app_start_with?(app)
-    apps[app.to_sym]&.dig(:match_if_app_name_starts_with) || false
+  def should_app_start_with?(app_name)
+    apps[app_name.to_sym]&.dig(:match_if_app_name_starts_with) || false
   end
 
   private
@@ -86,6 +86,8 @@ class Config
 
       [app_name, app_options_with_new_keys]
     end
+
+    ensure_current_config_app!(app) if app
   end
 
   def load_app_config
@@ -115,12 +117,13 @@ class Config
     {
       org: :cpln_org,
       location: :default_location,
-      prefix: :match_if_app_name_starts_with
+      prefix: :match_if_app_name_starts_with,
+      old_image_retention_days: :image_retention_days
     }
   end
 
   def warn_deprecated_options(app_options)
-    deprecated_option_keys = new_option_keys.filter { |old_key| app_options.key?(old_key) }
+    deprecated_option_keys = new_option_keys.select { |old_key| app_options.key?(old_key) }
     return if deprecated_option_keys.empty?
 
     deprecated_option_keys.each do |old_key, new_key|

data/lib/core/controlplane.rb

@@ -35,6 +35,13 @@ class Controlplane # rubocop:disable Metrics/ClassLength
 
   # image
 
+  def query_images(a_gvc = gvc, a_org = org, partial_gvc_match: nil)
+    partial_gvc_match = config.should_app_start_with?(a_gvc) if partial_gvc_match.nil?
+    gvc_op = partial_gvc_match ? "~" : "="
+
+    api.query_images(org: a_org, gvc: a_gvc, gvc_op_type: gvc_op)
+  end
+
   def image_build(image, dockerfile:, build_args: [], push: true)
     cmd = "docker build -t #{image} -f #{dockerfile}"
     build_args.each { |build_arg| cmd += " --build-arg #{build_arg}" }
@@ -44,15 +51,6 @@ class Controlplane # rubocop:disable Metrics/ClassLength
     image_push(image) if push
   end
 
-  def image_query(app_name = config.app, org_name = config.org)
-    # When `match_if_app_name_starts_with` is `true`, we query for images from any gvc containing the name,
-    # otherwise we query for images from a gvc with the exact name.
-    op = config.should_app_start_with?(app_name) ? "~" : "="
-
-    cmd = "cpln image query --org #{org_name} -o yaml --max -1 --prop repository#{op}#{app_name}"
-    perform_yaml(cmd)
-  end
-
   def image_delete(image)
     api.image_delete(org: org, image: image)
   end
@@ -132,11 +130,12 @@ class Controlplane # rubocop:disable Metrics/ClassLength
     raise "Can't find workload '#{workload}', please create it with 'cpl apply-template #{workload} -a #{config.app}'."
   end
 
-  def query_workloads(workload, partial_gvc_match: false, partial_workload_match: false)
+  def query_workloads(workload, a_gvc = gvc, a_org = org, partial_workload_match: false, partial_gvc_match: nil)
+    partial_gvc_match = config.should_app_start_with?(a_gvc) if partial_gvc_match.nil?
     gvc_op = partial_gvc_match ? "~" : "="
     workload_op = partial_workload_match ? "~" : "="
 
-    api.query_workloads(org: org, gvc: gvc, workload: workload, gvc_op_type: gvc_op, workload_op_type: workload_op)
+    api.query_workloads(org: a_org, gvc: a_gvc, workload: workload, gvc_op_type: gvc_op, workload_op_type: workload_op)
   end
 
   def workload_get_replicas(workload, location:)

data/lib/core/controlplane_api.rb

@@ -13,6 +13,18 @@ class ControlplaneApi
     api_json("/org/#{org}/gvc/#{gvc}", method: :delete)
   end
 
+  def query_images(org:, gvc:, gvc_op_type:)
+    terms = [
+      {
+        property: "repository",
+        op: gvc_op_type,
+        value: gvc
+      }
+    ]
+
+    query("/org/#{org}/image", terms)
+  end
+
   def image_delete(org:, image:)
     api_json("/org/#{org}/image/#{image}", method: :delete)
   end
@@ -34,26 +46,20 @@ class ControlplaneApi
   end
 
   def query_workloads(org:, gvc:, workload:, gvc_op_type:, workload_op_type:) # rubocop:disable Metrics/MethodLength
-    body = {
-      kind: "string",
-      spec: {
-        match: "all",
-        terms: [
-          {
-            rel: "gvc",
-            op: gvc_op_type,
-            value: gvc
-          },
-          {
-            property: "name",
-            op: workload_op_type,
-            value: workload
-          }
-        ]
+    terms = [
+      {
+        rel: "gvc",
+        op: gvc_op_type,
+        value: gvc
+      },
+      {
+        property: "name",
+        op: workload_op_type,
+        value: workload
       }
-    }
+    ]
 
-    api_json("/org/#{org}/workload/-query", method: :post, body: body)
+    query("/org/#{org}/workload", terms)
   end
 
   def workload_list(org:, gvc:)
@@ -90,6 +96,32 @@ class ControlplaneApi
 
   private
 
+  def fetch_query_pages(result)
+    loop do
+      next_page_url = result["links"].find { |link| link["rel"] == "next" }&.dig("href")
+      break unless next_page_url
+
+      next_page_result = api_json(next_page_url, method: :get)
+      result["items"] += next_page_result["items"]
+      result["links"] = next_page_result["links"]
+    end
+  end
+
+  def query(url, terms)
+    body = {
+      kind: "string",
+      spec: {
+        match: "all",
+        terms: terms
+      }
+    }
+
+    result = api_json("#{url}/-query", method: :post, body: body)
+    fetch_query_pages(result)
+
+    result
+  end
+
   # switch between cpln rest and api
   def api_json(...)
     ControlplaneApiDirect.new.call(...)

data/lib/core/controlplane_api_direct.rb

@@ -18,13 +18,13 @@ class ControlplaneApiDirect
   API_TOKEN_REGEX = /^[\w\-._]+$/.freeze
 
   def call(url, method:, host: :api, body: nil) # rubocop:disable Metrics/MethodLength
-    uri = URI("#{API_HOSTS[host]}#{url}")
+    uri = URI("#{api_host(host)}#{url}")
     request = API_METHODS[method].new(uri)
     request["Content-Type"] = "application/json"
     request["Authorization"] = api_token
     request.body = body.to_json if body
 
-    response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) { |http| http.request(request) }
+    response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") { |http| http.request(request) }
 
     case response
     when Net::HTTPOK
@@ -38,6 +38,15 @@ class ControlplaneApiDirect
     end
   end
 
+  def api_host(host)
+    case host
+    when :api
+      ENV.fetch("CPLN_ENDPOINT", API_HOSTS[host])
+    else
+      API_HOSTS[host]
+    end
+  end
+
   # rubocop:disable Style/ClassVars
   def api_token
     return @@api_token if defined?(@@api_token)

data/lib/cpl/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Cpl
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
   MIN_CPLN_VERSION = "0.0.71"
 end

data/lib/deprecated_commands.json

@@ -1,5 +1,6 @@
 {
   "build": "build-image",
+  "cleanup_old_images": "cleanup-images",
   "promote": "deploy-image",
   "promote_image": "deploy-image",
   "runner": "run:detached",

data/rakelib/create_release.rake

@@ -65,7 +65,7 @@ module Release
       puts "Pulling latest commits from remote repository"
 
       sh_in_dir(gem_root, "git pull --rebase")
-      raise "Failed in pulling latest changes from default remore repository." unless $CHILD_STATUS.success?
+      raise "Failed in pulling latest changes from default remote repository." unless $CHILD_STATUS.success?
     rescue Errno::ENOENT
       raise "Ensure you have Git and Bundler installed before continuing."
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpl
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Justin Gordon
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -234,7 +234,7 @@ files:
 - lib/command/apply_template.rb
 - lib/command/base.rb
 - lib/command/build_image.rb
-- lib/command/cleanup_old_images.rb
+- lib/command/cleanup_images.rb
 - lib/command/cleanup_stale_apps.rb
 - lib/command/config.rb
 - lib/command/copy_image_from_upstream.rb

data/lib/command/cleanup_old_images.rb

@@ -1,88 +0,0 @@
-# frozen_string_literal: true
-
-module Command
-  class CleanupOldImages < Base
-    NAME = "cleanup-old-images"
-    OPTIONS = [
-      app_option(required: true),
-      skip_confirm_option
-    ].freeze
-    DESCRIPTION = "Deletes all images for an app that are older than the specified amount of days"
-    LONG_DESCRIPTION = <<~DESC
-      - Deletes all images for an app that are older than the specified amount of days
-      - Specify the amount of days through `old_image_retention_days` in the `.controlplane/controlplane.yml` file
-      - Will ask for explicit user confirmation
-      - Does not affect the latest image, regardless of how old it is
-    DESC
-
-    def call
-      return progress.puts("No old images found.") if old_images.empty?
-
-      progress.puts("Old images:")
-      old_images.each do |image|
-        progress.puts("  - #{image[:name]} (#{Shell.color((image[:date]).to_s, :red)})")
-      end
-
-      return unless confirm_delete
-
-      progress.puts
-      delete_images
-    end
-
-    private
-
-    def app_prefix
-      config.should_app_start_with?(config.app) ? "#{config.app}-" : "#{config.app}:"
-    end
-
-    def remove_deployed_image(app, app_images)
-      return app_images unless cp.fetch_gvc(app)
-
-      # If app exists, remove latest image, because we don't want to delete the image that is currently deployed
-      latest_image_name = latest_image_from(app_images, app_name: app)
-      app_images.filter { |item| item["name"] != latest_image_name }
-    end
-
-    def old_images # rubocop:disable Metrics/MethodLength
-      @old_images ||=
-        begin
-          result_images = []
-
-          now = DateTime.now
-          old_image_retention_days = config[:old_image_retention_days]
-
-          images = cp.image_query["items"].filter { |item| item["name"].start_with?(app_prefix)	}
-          images_by_app = images.group_by { |item| item["repository"] }
-          images_by_app.each do |app, app_images|
-            app_images = remove_deployed_image(app, app_images)
-            app_images.each do |image|
-              created_date = DateTime.parse(image["created"])
-              diff_in_days = (now - created_date).to_i
-              next unless diff_in_days >= old_image_retention_days
-
-              result_images.push({
-                                   name: image["name"],
-                                   date: created_date
-                                 })
-            end
-          end
-
-          result_images
-        end
-    end
-
-    def confirm_delete
-      return true if config.options[:yes]
-
-      Shell.confirm("\nAre you sure you want to delete these #{old_images.length} images?")
-    end
-
-    def delete_images
-      old_images.each do |image|
-        step("Deleting image '#{image[:name]}'") do
-          cp.image_delete(image[:name])
-        end
-      end
-    end
-  end
-end