Rename App to Applications

4 files changed, 15 insertions, 17 deletions

diff --git a/app/workers/cluster_install_app_worker.rb b/app/workers/cluster_install_app_worker.rb
index 4993b2b7349..899aed904e4 100644
--- a/app/workers/cluster_install_app_worker.rb
+++ b/app/workers/cluster_install_app_worker.rb
@@ -1,11 +1,11 @@
 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
diff --git a/app/workers/cluster_wait_for_app_installation_worker.rb b/app/workers/cluster_wait_for_app_installation_worker.rb
index 7e480c42fd4..d5974c467c4 100644
--- a/app/workers/cluster_wait_for_app_installation_worker.rb
+++ b/app/workers/cluster_wait_for_app_installation_worker.rb
@@ -1,15 +1,15 @@
 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
diff --git a/app/workers/concerns/cluster_app.rb b/app/workers/concerns/cluster_app.rb
deleted file mode 100644
index 947cdaefcb7..00000000000
--- a/app/workers/concerns/cluster_app.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module ClusterApp
-  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
-    end
-  end
-end
diff --git a/app/workers/concerns/cluster_applications.rb b/app/workers/concerns/cluster_applications.rb
new file mode 100644
index 00000000000..24ecaa0b52f
--- /dev/null
+++ b/app/workers/concerns/cluster_applications.rb
@@ -0,0 +1,9 @@
+module ClusterApplications
+  extend ActiveSupport::Concern
+
+  included do
+    def find_application(app_name, id, &blk)
+      Clusters::Cluster::APPLICATIONS[app_name].find(id).try(&blk)
+    end
+  end
+end