1 files changed, 108 insertions, 29 deletions

diff --git a/qa/qa/tools/delete_subgroups.rb b/qa/qa/tools/delete_subgroups.rb
index 355bd6bf10d..edf2f0ff5f0 100644
--- a/qa/qa/tools/delete_subgroups.rb
+++ b/qa/qa/tools/delete_subgroups.rb
@@ -1,70 +1,149 @@
 # frozen_string_literal: true
 
 # This script deletes all subgroups of a group specified by ENV['TOP_LEVEL_GROUP_NAME']
+#
 # Required environment variables: GITLAB_QA_ACCESS_TOKEN and GITLAB_ADDRESS
-# Optional environment variable: TOP_LEVEL_GROUP_NAME (defaults to 'gitlab-qa-sandbox-group')
+# Optional environment variable: TOP_LEVEL_GROUP_NAME (defaults to 'gitlab-qa-sandbox-group-<current weekday #>')
+
+# Optional environment variable: PERMANENTLY_DELETE (defaults to false)
+# Set PERMANENTLY_DELETE to true if you would like to permanently delete subgroups on an environment with
+# deletion protection enabled. Otherwise, subgroups will remain available during the retention period specified
+# in admin settings. On environments with deletion protection disabled, subgroups will always be permanently deleted.
+#
 # Run `rake delete_subgroups`
 
 module QA
   module Tools
     class DeleteSubgroups
       include Support::API
+      include Ci::Helpers
 
       def initialize
         raise ArgumentError, "Please provide GITLAB_ADDRESS" unless ENV['GITLAB_ADDRESS']
         raise ArgumentError, "Please provide GITLAB_QA_ACCESS_TOKEN" unless ENV['GITLAB_QA_ACCESS_TOKEN']
 
         @api_client = Runtime::API::Client.new(ENV['GITLAB_ADDRESS'], personal_access_token: ENV['GITLAB_QA_ACCESS_TOKEN'])
+        @failed_deletion_attempts = []
       end
 
       def run
-        $stdout.puts 'Fetching subgroups for deletion...'
+        group_id = fetch_group_id
+        return logger.info('Top level group not found') if group_id.nil?
 
-        sub_group_ids = fetch_subgroup_ids
-        $stdout.puts "\nNumber of Sub Groups not already marked for deletion: #{sub_group_ids.length}"
+        subgroups = fetch_subgroups(group_id)
+        return logger.info('No subgroups available') if subgroups.empty?
 
-        delete_subgroups(sub_group_ids) unless sub_group_ids.empty?
-        $stdout.puts "\nDone"
-      end
+        subgroups_marked_for_deletion = mark_for_deletion(subgroups)
 
-      private
+        if ENV['PERMANENTLY_DELETE'] && !subgroups_marked_for_deletion.empty?
+          delete_permanently(subgroups_marked_for_deletion)
+        end
 
-      def delete_subgroups(sub_group_ids)
-        $stdout.puts "Deleting #{sub_group_ids.length} subgroups..."
-        sub_group_ids.each do |subgroup_id|
-          request_url = Runtime::API::Request.new(@api_client, "/groups/#{subgroup_id}").url
-          path = parse_body(get(request_url))[:full_path]
-          $stdout.puts "\nDeleting subgroup #{path}..."
+        print_failed_deletion_attempts
 
-          delete_response = delete(request_url)
-          dot_or_f = delete_response.code == 202 ? "\e[32m.\e[0m" : "\e[31mF - #{delete_response}\e[0m"
-          print dot_or_f
-        end
+        logger.info('Done')
       end
 
+      private
+
       def fetch_group_id
+        logger.info("Fetching top level group id...\n")
+
         group_name = ENV['TOP_LEVEL_GROUP_NAME'] || "gitlab-qa-sandbox-group-#{Time.now.wday + 1}"
         group_search_response = get Runtime::API::Request.new(@api_client, "/groups/#{group_name}" ).url
-        JSON.parse(group_search_response.body)["id"]
+        JSON.parse(group_search_response.body)['id']
       end
 
-      def fetch_subgroup_ids
-        group_id = fetch_group_id
-        sub_groups_ids = []
+      def fetch_subgroups(group_id)
+        logger.info("Fetching subgroups...")
+
+        api_path = "/groups/#{group_id}/subgroups"
         page_no = '1'
+        subgroups = []
 
-        # When we reach the last page, the x-next-page header is a blank string
         while page_no.present?
-          $stdout.print '.'
+          subgroups_response = get Runtime::API::Request.new(@api_client, api_path, page: page_no, per_page: '100').url
+          subgroups.concat(JSON.parse(subgroups_response.body))
+
+          page_no = subgroups_response.headers[:x_next_page].to_s
+        end
+
+        subgroups
+      end
+
+      def subgroup_request(subgroup, **options)
+        Runtime::API::Request.new(@api_client, "/groups/#{subgroup['id']}", **options).url
+      end
+
+      def process_response_and_subgroup(response, subgroup, opts = {})
+        if response.code == 202
+          logger.info("Success\n")
+          opts[:save_successes_to] << subgroup if opts[:save_successes_to]
+        else
+          logger.error("Failed - #{response}\n")
+          @failed_deletion_attempts << { path: subgroup['full_path'], response: response }
+        end
+      end
+
+      def mark_for_deletion(subgroups)
+        subgroups_marked_for_deletion = []
+
+        logger.info("Marking #{subgroups.length} subgroups for deletion...\n")
+
+        subgroups.each do |subgroup|
+          path = subgroup['full_path']
+
+          if subgroup['marked_for_deletion_on'].nil?
+            logger.info("Marking subgroup #{path} for deletion...")
+            response = delete(subgroup_request(subgroup))
 
-          sub_groups_response = get Runtime::API::Request.new(@api_client, "/groups/#{group_id}/subgroups", page: page_no, per_page: '100').url
-          sub_groups_ids.concat(JSON.parse(sub_groups_response.body)
-            .reject { |subgroup| !subgroup["marked_for_deletion_on"].nil? }.map { |subgroup| subgroup['id'] })
+            process_response_and_subgroup(response, subgroup, save_successes_to: subgroups_marked_for_deletion)
+          else
+            logger.info("Subgroup #{path} already marked for deletion\n")
+            subgroups_marked_for_deletion << subgroup
+          end
+        end
+
+        subgroups_marked_for_deletion
+      end
 
-          page_no = sub_groups_response.headers[:x_next_page].to_s
+      def subgroup_exists?(subgroup)
+        response = get(subgroup_request(subgroup))
+
+        if response.code == 404
+          logger.info("Subgroup #{subgroup['full_path']} is no longer available\n")
+          false
+        else
+          true
         end
+      end
 
-        sub_groups_ids.uniq
+      def delete_permanently(subgroups)
+        logger.info("Permanently deleting #{subgroups.length} subgroups...\n")
+
+        subgroups.each do |subgroup|
+          path = subgroup['full_path']
+
+          next unless subgroup_exists?(subgroup)
+
+          logger.info("Permanently deleting subgroup #{path}...")
+          delete_subgroup_response = delete(subgroup_request(subgroup, { permanently_remove: true, full_path: path }))
+
+          process_response_and_subgroup(delete_subgroup_response, subgroup)
+        end
+      end
+
+      def print_failed_deletion_attempts
+        if @failed_deletion_attempts.empty?
+          logger.info('No failed deletion attempts to report!')
+        else
+          logger.info("There were #{@failed_deletion_attempts.length} failed deletion attempts:\n")
+
+          @failed_deletion_attempts.each do |attempt|
+            logger.info("Subgroup: #{attempt[:path]}")
+            logger.error("Response: #{attempt[:response]}\n")
+          end
+        end
       end
     end
   end