cpl 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c304577e2c02b5778a463b82ec9a72792bd10b727687402d66a504d390673fae
-  data.tar.gz: dc28bb00740914362abba26bc61cee999f7ac2d955218dca0ea6dbeef58d465e
+  metadata.gz: 7601f22a541072ea22c5745496d77ee63409d8975903f14582e2681963e9e0ff
+  data.tar.gz: e3a189dbb1506571133924f9640bd144c6c1a7d1a7233096b9fbd13bef8b0a82
 SHA512:
-  metadata.gz: 4812e651d14114d8d7bccf893cf50107dc9ba24b35679d633fc36d37589dfbae9d93eb8e8dc172bc66e4feb6039d6ab7c2093c0f35b1a544acab01b55c722c68
-  data.tar.gz: 53013a61c2bcedc3ad10664f8d4a8874731013bb740abdb42fdac34dd82c3dc960b2643e9dea8227335040d2c2730eff6ed0cf47973d9344ddf5c5fc1bba7a99
+  metadata.gz: f0e2603b1e9d29e2f23deb2620edb94a51e13763a48985064facfd9ce2f9a61731267176766ad037e826430283c253300334e35514c9de60a5cda59a97c8b81a
+  data.tar.gz: 8c97ac2b7d5f349d90a41bf1acb8dea6e72d107cb275361792547ca9faa4b1bca66bc2566558a05fb336e1bee39d577c9c5cc0e3602971037cd2d44d5f975ed8

data/CHANGELOG.md

@@ -14,7 +14,11 @@ Changes since the last non-beta release.
 
 _Please add entries here for your pull requests that are not yet released._
 
-## [2.0.0.rc.1] - 2024-05-11
+### Fixed
+
+- Fixed issue where `cleanup-stale-apps` command fails to delete apps with volumesets. [PR 175](https://github.com/shakacode/heroku-to-control-plane/pull/175) by [Rafael Gomes](https://github.com/rafaelgomesxyz).
+
+## [2.0.0] - 2024-05-14
 
 ### BREAKING CHANGES
 
@@ -186,8 +190,8 @@ _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/v2.0.0.rc.1...HEAD
-[2.0.0.rc.1]: https://github.com/shakacode/heroku-to-control-plane/compare/v1.4.0...v2.0.0.rc.1
+[Unreleased]: https://github.com/shakacode/heroku-to-control-plane/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/shakacode/heroku-to-control-plane/compare/v1.4.0...v2.0.0
 [1.4.0]: https://github.com/shakacode/heroku-to-control-plane/compare/v1.3.0...v1.4.0
 [1.3.0]: https://github.com/shakacode/heroku-to-control-plane/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/shakacode/heroku-to-control-plane/compare/v1.1.2...v1.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cpl (2.0.0)
+    cpl (2.0.1)
       debug (~> 1.7.1)
       dotenv (~> 2.8.1)
       jwt (~> 2.8.1)

data/docs/commands.md

@@ -66,7 +66,8 @@ cpl cleanup-images -a $APP_NAME
 
 ### `cleanup-stale-apps`
 
-- Deletes the whole app (GVC with all workloads and all images) for all stale apps
+- Deletes the whole app (GVC with all workloads, all volumesets and all images) for all stale apps
+- Also unbinds the app from the secrets policy, as long as both the identity and the policy exist (and are bound)
 - Stale apps are identified based on the creation date of the latest image
 - Specify the amount of days after an app should be considered stale through `stale_app_image_deployed_days` in the `.controlplane/controlplane.yml` file
 - If `match_if_app_name_starts_with` is `true` in the `.controlplane/controlplane.yml` file, it will delete all stale apps that start with the name

data/lib/command/cleanup_stale_apps.rb

@@ -7,9 +7,10 @@ module Command
       app_option(required: true),
       skip_confirm_option
     ].freeze
-    DESCRIPTION = "Deletes the whole app (GVC with all workloads and all images) for all stale apps"
+    DESCRIPTION = "Deletes the whole app (GVC with all workloads, all volumesets and all images) for all stale apps"
     LONG_DESCRIPTION = <<~DESC
-      - Deletes the whole app (GVC with all workloads and all images) for all stale apps
+      - Deletes the whole app (GVC with all workloads, all volumesets and all images) for all stale apps
+      - Also unbinds the app from the secrets policy, as long as both the identity and the policy exist (and are bound)
       - Stale apps are identified based on the creation date of the latest image
       - Specify the amount of days after an app should be considered stale through `stale_app_image_deployed_days` in the `.controlplane/controlplane.yml` file
       - If `match_if_app_name_starts_with` is `true` in the `.controlplane/controlplane.yml` file, it will delete all stale apps that start with the name
@@ -28,8 +29,8 @@ module Command
 
       progress.puts
       stale_apps.each do |app|
-        delete_gvc(app)
-        delete_images(app)
+        delete_app(app[:name])
+        progress.puts
       end
     end
 
@@ -57,8 +58,7 @@ module Command
 
             apps.push({
                         name: app_name,
-                        date: created_date,
-                        images: images.map { |current_image| current_image["name"] }
+                        date: created_date
                       })
           end
 
@@ -72,18 +72,8 @@ module Command
       Shell.confirm("\nAre you sure you want to delete these #{stale_apps.length} apps?")
     end
 
-    def delete_gvc(app)
-      step("Deleting app '#{app[:name]}'") do
-        cp.gvc_delete(app[:name])
-      end
-    end
-
-    def delete_images(app)
-      app[:images].each do |image|
-        step("Deleting image '#{image}'") do
-          cp.image_delete(image)
-        end
-      end
+    def delete_app(app)
+      Cpl::Cli.start(["delete", "-a", app, "--yes"])
     end
   end
 end

data/lib/command/delete.rb

@@ -36,7 +36,9 @@ module Command
     private
 
     def delete_single_workload(workload)
-      return progress.puts("Workload '#{workload}' does not exist.") if cp.fetch_workload(workload).nil?
+      if cp.fetch_workload(workload).nil?
+        return progress.puts("Workload '#{workload}' does not exist in app '#{config.app}'.")
+      end
       return unless confirm_delete(workload)
 
       delete_workload(workload)
@@ -57,9 +59,9 @@ module Command
 
     def check_volumesets
       @volumesets = cp.fetch_volumesets["items"]
-      return progress.puts("No volumesets to delete.") unless @volumesets.any?
+      return progress.puts("No volumesets to delete from app '#{config.app}'.") unless @volumesets.any?
 
-      message = "The following volumesets will be deleted along with the app:"
+      message = "The following volumesets will be deleted along with the app '#{config.app}':"
       volumesets_list = @volumesets.map { |volumeset| "- #{volumeset['name']}" }.join("\n")
       progress.puts("#{Shell.color(message, :red)}\n#{volumesets_list}\n\n")
     end
@@ -67,9 +69,9 @@ module Command
     def check_images
       @images = cp.query_images["items"]
                   .select { |image| image["name"].start_with?("#{config.app}:") }
-      return progress.puts("No images to delete.") unless @images.any?
+      return progress.puts("No images to delete from app '#{config.app}'.") unless @images.any?
 
-      message = "The following images will be deleted along with the app:"
+      message = "The following images will be deleted along with the app '#{config.app}':"
       images_list = @images.map { |image| "- #{image['name']}" }.join("\n")
       progress.puts("#{Shell.color(message, :red)}\n#{images_list}\n\n")
     end
@@ -91,14 +93,14 @@ module Command
     end
 
     def delete_workload(workload)
-      step("Deleting workload '#{workload}'") do
+      step("Deleting workload '#{workload}' from app '#{config.app}'") do
         cp.delete_workload(workload)
       end
     end
 
     def delete_volumesets
       @volumesets.each do |volumeset|
-        step("Deleting volumeset '#{volumeset['name']}'") do
+        step("Deleting volumeset '#{volumeset['name']}' from app '#{config.app}'") do
           # If the volumeset is attached to a workload, we need to delete the workload first
           workload = volumeset.dig("status", "usedByWorkload")&.split("/")&.last
           cp.delete_workload(workload) if workload
@@ -110,7 +112,7 @@ module Command
 
     def delete_images
       @images.each do |image|
-        step("Deleting image '#{image['name']}'") do
+        step("Deleting image '#{image['name']}' from app '#{config.app}'") do
           cp.image_delete(image["name"])
         end
       end
@@ -127,7 +129,7 @@ module Command
       end
       return unless is_bound
 
-      step("Unbinding identity from policy") do
+      step("Unbinding identity from policy for app '#{config.app}'") do
         cp.unbind_identity_from_policy(app_identity_link, app_secrets_policy)
       end
     end

data/lib/cpl/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Cpl
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
   MIN_CPLN_VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpl
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Justin Gordon
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug