Rename App to Applications

app/models/clusters/concerns.rb

-module Clusters
-  module Concerns
-  end
-end

app/services/clusters/base_helm_service.rb → app/services/clusters/applications/base_helm_service.rb

 module Clusters
+  module Applications
     class BaseHelmService
       attr_accessor :app
 
@@ -20,4 +21,5 @@ module Clusters
         @helm_api ||= Gitlab::Kubernetes::Helm.new(kubeclient)
       end
     end
+  end
 end

app/services/clusters/check_app_installation_progress_service.rb → app/services/clusters/applications/check_installation_progress_service.rb

 module Clusters
-  class CheckAppInstallationProgressService < BaseHelmService
+  module Applications
+    class CheckInstallationProgressService < BaseHelmService
       def execute
         return unless app.installing?
 
-      FetchAppInstallationStatusService.new(app).execute do |phase, log|
+        FetchInstallationStatusService.new(app).execute do |phase, log|
           case phase
           when 'Succeeded'
             if app.make_installed
-            FinalizeAppInstallationService.new(app).execute
+              FinalizeInstallationService.new(app).execute
             else
               app.make_errored!("Failed to update app record; #{app.errors}")
             end
           when 'Failed'
             app.make_errored!(log || 'Installation silently failed')
-          FinalizeAppInstallationService.new(app).execute
+            FinalizeInstallationService.new(app).execute
           else
             if Time.now.utc - app.updated_at.to_time.utc > ClusterWaitForAppInstallationWorker::TIMEOUT
               app.make_errored!('App installation timeouted')
@@ -25,4 +26,5 @@ module Clusters
         end
       end
     end
+  end
 end

app/services/clusters/fetch_app_installation_status_service.rb → app/services/clusters/applications/fetch_installation_status_service.rb

 module Clusters
-  class FetchAppInstallationStatusService < BaseHelmService
+  module Applications
+    class FetchInstallationStatusService < BaseHelmService
       def execute
         return unless app.installing?
 
@@ -10,4 +11,5 @@ module Clusters
         app.make_errored!("Kubernetes error: #{ke.message}") unless app.errored?
       end
     end
+  end
 end

app/services/clusters/finalize_app_installation_service.rb → app/services/clusters/applications/finalize_installation_service.rb

 module Clusters
-  class FinalizeAppInstallationService < BaseHelmService
+  module Applications
+    class FinalizeInstallationService < BaseHelmService
       def execute
         helm_api.delete_installation_pod!(app)
 
@@ -12,4 +13,5 @@ module Clusters
         app.installing? || app.scheduled?
       end
     end
+  end
 end

app/services/clusters/install_app_service.rb → app/services/clusters/applications/install_service.rb

 module Clusters
-  class InstallAppService < BaseHelmService
+  module Applications
+    class InstallService < BaseHelmService
       def execute
         return unless app.scheduled?
 
@@ -19,4 +20,5 @@ module Clusters
         end
       end
     end
+  end
 end

app/workers/cluster_install_app_worker.rb

 class ClusterInstallAppWorker
   include Sidekiq::Worker
   include ClusterQueue
-  include ClusterApp
+  include ClusterApplications
 
   def perform(app_name, app_id)
-    find_app(app_name, app_id) do |app|
-      Clusters::InstallAppService.new(app).execute
+    find_application(app_name, app_id) do |app|
+      Clusters::Applications::InstallService.new(app).execute
     end
   end
 end

app/workers/cluster_wait_for_app_installation_worker.rb

 class ClusterWaitForAppInstallationWorker
   include Sidekiq::Worker
   include ClusterQueue
-  include ClusterApp
+  include ClusterApplications
 
   INITIAL_INTERVAL = 30.seconds
   EAGER_INTERVAL = 10.seconds
   TIMEOUT = 20.minutes
 
   def perform(app_name, app_id)
-    find_app(app_name, app_id) do |app|
-      Clusters::CheckAppInstallationProgressService.new(app).execute
+    find_application(app_name, app_id) do |app|
+      Clusters::Applications::CheckInstallationProgressService.new(app).execute
     end
   end
 end

app/workers/concerns/cluster_app.rb → app/workers/concerns/cluster_applications.rb

-module ClusterApp
+module ClusterApplications
   extend ActiveSupport::Concern
 
   included do
-    def find_app(app_name, id)
-      Clusters::Cluster::APPLICATIONS[app_name].find(id).try do |app|
-        yield(app) if block_given?
-      end
+    def find_application(app_name, id, &blk)
+      Clusters::Cluster::APPLICATIONS[app_name].find(id).try(&blk)
     end
   end
 end