This works

1 files changed, 30 insertions, 5 deletions

diff --git a/app/services/clusters/create_service.rb b/app/services/clusters/create_service.rb
index 5429bc21256..3f458e25c14 100644
--- a/app/services/clusters/create_service.rb
+++ b/app/services/clusters/create_service.rb
@@ -1,14 +1,39 @@
 module Clusters
   class CreateService < BaseService
-    def execute(access_token)
-      params['gcp_machine_type'] ||= GoogleApi::CloudPlatform::Client::DEFAULT_MACHINE_TYPE
+    attr_reader :access_token
 
-      cluster_params =
-        params.merge(user: current_user)
+    def execute(access_token)
+      @access_token = access_token
 
-      project.create_cluster(cluster_params).tap do |cluster|
+      create_cluster.tap do |cluster|
         ClusterProvisionWorker.perform_async(cluster.id) if cluster.persisted?
       end
     end
+
+    private
+
+    def create_cluster
+      cluster = nil
+
+      ActiveRecord::Base.transaction do
+        cluster = Clusters::Cluster.create!(cluster_params)
+        cluster.projects << project
+      end
+
+      cluster
+    rescue ActiveRecord::RecordInvalid => e
+      e.record
+    end
+
+    def cluster_params
+      return @cluster_params if defined?(@cluster_params)
+
+      params[:provider_gcp_attributes][:machine_type] ||=
+        GoogleApi::CloudPlatform::Client::DEFAULT_MACHINE_TYPE
+
+      params[:provider_gcp_attributes][:access_token] ||= access_token
+
+      @cluster_params = params.merge(user: current_user)
+    end
   end
 end