Merge branch 'develop'

Author: moklidia

Gemfile.lock

@@ -104,14 +104,14 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ancestry (4.3.3)
       activerecord (>= 5.2.6)
     ast (2.4.2)
     awesome_print (1.9.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.863.0)
+    aws-partitions (1.867.0)
     aws-sdk-core (3.190.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)

core/app/controllers/uffizzi_core/api/cli/v1/projects/clusters_controller.rb

@@ -60,6 +60,14 @@ def show
     respond_with resource_cluster
   end
 
+  def sync
+    cluster_form = resource_cluster.becomes(UffizziCore::Api::Cli::V1::Cluster::SyncForm)
+    cluster_form.sync_status
+    cluster_form.save
+
+    respond_with cluster_form
+  end
+
   def destroy
     resource_cluster.disable!
 

core/app/forms/uffizzi_core/api/cli/v1/cluster/sync_form.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Cluster::SyncForm < UffizziCore::Cluster
+  include UffizziCore::ApplicationForm
+
+  permit :state
+
+  def sync_status
+    cluster_data = UffizziCore::ControllerService.show_cluster(self)
+
+    asleep_in_cluster = cluster_data.status.sleep
+    return unless deployed? || scaled_down?
+    return if actual_status?(asleep_in_cluster)
+
+    self.state = asleep_in_cluster ? UffizziCore::Cluster::STATE_SCALED_DOWN : UffizziCore::Cluster::STATE_DEPLOYED
+
+    self
+  end
+
+  private
+
+  def actual_status?(asleep_in_cluster)
+    (asleep_in_cluster && scaled_down?) || (!asleep_in_cluster && deployed?)
+  end
+end

core/app/policies/uffizzi_core/api/cli/v1/projects/clusters_policy.rb

@@ -21,6 +21,10 @@ def scale_up?
     context.user_access_module.admin_or_developer_access_to_project?(context.user, context.project)
   end
 
+  def sync?
+    context.user_access_module.admin_or_developer_access_to_project?(context.user, context.project)
+  end
+
   def destroy?
     context.user_access_module.admin_or_developer_access_to_project?(context.user, context.project)
   end

core/config/routes.rb

@@ -14,6 +14,7 @@
               member do
                 put :scale_down
                 put :scale_up
+                put :sync
               end
               scope module: :clusters do
                 resources :ingresses, only: ['index']

core/test/controllers/uffizzi_core/api/cli/v1/projects/clusters_controller_test.rb

@@ -253,6 +253,42 @@ class UffizziCore::Api::Cli::V1::Projects::ClustersControllerTest < ActionContro
     assert_requested(stubbed_cluster_request)
   end
 
+  test '#sync when the data is actual' do
+    sign_in(@admin)
+    cluster = create(:cluster, project: @project, deployed_by: @admin, name: 'test', state: UffizziCore::Cluster::STATE_DEPLOYED)
+
+    cluster_show_data = json_fixture('files/controller/cluster_awake.json')
+    stubbed_cluster_request = stub_get_cluster_request(cluster_show_data)
+
+    params = {
+      project_slug: @project.slug,
+      name: cluster.name,
+    }
+
+    put :sync, params: params, format: :json
+
+    assert_requested(stubbed_cluster_request)
+    assert(cluster.reload.deployed?)
+  end
+
+  test '#sync when the data needs to be updated' do
+    sign_in(@admin)
+    cluster = create(:cluster, project: @project, deployed_by: @admin, name: 'test', state: UffizziCore::Cluster::STATE_DEPLOYED)
+
+    cluster_show_data = json_fixture('files/controller/cluster_asleep.json')
+    stubbed_cluster_request = stub_get_cluster_request(cluster_show_data)
+
+    params = {
+      project_slug: @project.slug,
+      name: cluster.name,
+    }
+
+    put :sync, params: params, format: :json
+
+    assert_requested(stubbed_cluster_request)
+    assert(cluster.reload.scaled_down?)
+  end
+
   test '#destroy developer can destroy a cluster created by him' do
     sign_in(@developer)