This works

4 files changed, 55 insertions, 57 deletions

diff --git a/app/services/clusters/gcp/fetch_operation_service.rb b/app/services/clusters/gcp/fetch_operation_service.rb
index 013225efac4..a4cd3ca5c11 100644
--- a/app/services/clusters/gcp/fetch_operation_service.rb
+++ b/app/services/clusters/gcp/fetch_operation_service.rb
@@ -3,13 +3,13 @@ module Clusters
     class FetchOperationService
       def execute(provider)
         operation = provider.api_client.projects_zones_operations(
-          provider.project_id,
-          provider.cluster_zone,
+          provider.gcp_project_id,
+          provider.zone,
           provider.operation_id)
 
         yield(operation) if block_given?
       rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e
-        return provider.make_errored!("Failed to request to CloudPlatform; #{e.message}")
+        provider.make_errored!("Failed to request to CloudPlatform; #{e.message}")
       end
     end
   end
diff --git a/app/services/clusters/gcp/finalize_creation_service.rb b/app/services/clusters/gcp/finalize_creation_service.rb
index b536285b368..9f257bd0e9a 100644
--- a/app/services/clusters/gcp/finalize_creation_service.rb
+++ b/app/services/clusters/gcp/finalize_creation_service.rb
@@ -7,15 +7,14 @@ module Clusters
         @provider = provider
 
         configure_provider
-        configure_kubernetes_platform
-        request_kuberenetes_platform_token
+        configure_kubernetes
 
         ActiveRecord::Base.transaction do
-          kubernetes_platform.update!
+          kubernetes.save!
           provider.make_created!
         end
       rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e
-        return cluster.make_errored!("Failed to request to CloudPlatform; #{e.message}")
+        cluster.make_errored!("Failed to request to CloudPlatform; #{e.message}")
       rescue ActiveRecord::RecordInvalid => e
         cluster.make_errored!("Failed to configure GKE Cluster: #{e.message}")
       end
@@ -26,23 +25,20 @@ module Clusters
         provider.endpoint = gke_cluster.endpoint
       end
 
-      def configure_kubernetes_platform
-        kubernetes_platform = cluster.kubernetes_platform
-        kubernetes_platform.api_url = 'https://' + endpoint
-        kubernetes_platform.ca_cert = Base64.decode64(gke_cluster.master_auth.cluster_ca_certificate)
-        kubernetes_platform.username = gke_cluster.master_auth.username
-        kubernetes_platform.password = gke_cluster.master_auth.password
+      def configure_kubernetes
+        kubernetes.api_url = 'https://' + gke_cluster.endpoint
+        kubernetes.ca_cert = Base64.decode64(gke_cluster.master_auth.cluster_ca_certificate)
+        kubernetes.username = gke_cluster.master_auth.username
+        kubernetes.password = gke_cluster.master_auth.password
+        kubernetes.token = request_kuberenetes_token
       end
 
-      def request_kuberenetes_platform_token
-        kubernetes_platform.read_secrets.each do |secret|
+      def request_kuberenetes_token
+        kubernetes.read_secrets.each do |secret|
           name = secret.dig('metadata', 'name')
           if /default-token/ =~ name
             token_base64 = secret.dig('data', 'token')
-            if token_base64
-              kubernetes_platform.token = Base64.decode64(token_base64)
-              break
-            end
+            return Base64.decode64(token_base64) if token_base64
           end
         end
       end
@@ -50,16 +46,16 @@ module Clusters
       def gke_cluster
         @gke_cluster ||= provider.api_client.projects_zones_clusters_get(
           provider.gcp_project_id,
-          provider.gcp_cluster_zone,
-          provider.gcp_cluster_name)
+          provider.zone,
+          cluster.name)
       end
 
       def cluster
-        provider.cluster
+        @cluster ||= provider.cluster
       end
 
-      def kubernetes_platform
-        cluster.kubernetes_platform
+      def kubernetes
+        @kubernetes ||= cluster.platform_kubernetes
       end
     end
   end
diff --git a/app/services/clusters/gcp/provision_service.rb b/app/services/clusters/gcp/provision_service.rb
index 269705000ac..8ec81e22203 100644
--- a/app/services/clusters/gcp/provision_service.rb
+++ b/app/services/clusters/gcp/provision_service.rb
@@ -6,43 +6,41 @@ module Clusters
       def execute(provider)
         @provider = provider
 
-        unless operation.status == 'RUNNING' || operation.status == 'PENDING'
-          return provider.make_errored!("Operation status is unexpected; #{operation.status_message}")
+        get_operation_id do |operation_id|
+          if provider.make_creating(operation_id)
+            WaitForClusterCreationWorker.perform_in(
+              Clusters::Gcp::VerifyProvisionStatusService::INITIAL_INTERVAL,
+              provider.id)
+          else
+            provider.make_errored!("Failed to update provider record; #{provider.errors}")
+          end
         end
+      end
 
-        provider.operation_id = operation_id
+      private
 
-        unless provider.operation_id
-          return provider.make_errored!('Can not find operation_id from self_link')
-        end
+      def get_operation_id
+        operation = provider.api_client.projects_zones_clusters_create(
+          provider.gcp_project_id,
+          provider.zone,
+          provider.cluster.name,
+          provider.num_nodes,
+          machine_type: provider.machine_type)
 
-        if provider.make_creating
-          WaitForClusterCreationWorker.perform_in(
-            WaitForClusterCreationWorker::INITIAL_INTERVAL, provider.id)
-        else
-          return provider.make_errored!("Failed to update provider record; #{provider.errors}")
+        unless operation.status == 'PENDING' || operation.status == 'RUNNING'
+          return provider.make_errored!("Operation status is unexpected; #{operation.status_message}")
         end
-      rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e
-        return provider.make_errored!("Failed to request to CloudPlatform; #{e.message}")
-      end
 
-      private
+        operation_id = provider.api_client.parse_operation_id(operation.self_link)
 
-      def operation_id
-        api_client.parse_operation_id(operation.self_link)
-      end
+        unless operation_id
+          return provider.make_errored!('Can not find operation_id from self_link')
+        end
 
-      def operation
-        @operation ||= api_client.projects_zones_providers_create(
-          provider.project_id,
-          provider.provider_zone,
-          provider.provider_name,
-          provider.provider_size,
-          machine_type: provider.machine_type)
-      end
+        yield(operation_id)
 
-      def api_client
-        provider.api_client
+      rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e
+        provider.make_errored!("Failed to request to CloudPlatform; #{e.message}")
       end
     end
   end
diff --git a/app/services/clusters/gcp/verify_provision_status_service.rb b/app/services/clusters/gcp/verify_provision_status_service.rb
index 466ea986516..bc33756f27c 100644
--- a/app/services/clusters/gcp/verify_provision_status_service.rb
+++ b/app/services/clusters/gcp/verify_provision_status_service.rb
@@ -12,7 +12,7 @@ module Clusters
 
         request_operation do |operation|
           case operation.status
-          when 'RUNNING'
+          when 'PENDING', 'RUNNING'
             continue_creation(operation)
           when 'DONE'
             finalize_creation
@@ -25,11 +25,15 @@ module Clusters
       private
 
       def continue_creation(operation)
-        if TIMEOUT < Time.now.utc - operation.start_time.to_time.utc
-          return provider.make_errored!("Cluster creation time exceeds timeout; #{TIMEOUT}")
+        if elapsed_time_from_creation(operation) < TIMEOUT
+          WaitForClusterCreationWorker.perform_in(EAGER_INTERVAL, provider.cluster_id)
+        else
+          provider.make_errored!("Cluster creation time exceeds timeout; #{TIMEOUT}")
         end
+      end
 
-        WaitForClusterCreationWorker.perform_in(EAGER_INTERVAL, provider.cluster_id)
+      def elapsed_time_from_creation(operation)
+        Time.now.utc - operation.start_time.to_time.utc
       end
 
       def finalize_creation
@@ -37,7 +41,7 @@ module Clusters
       end
 
       def request_operation(&blk)
-        Clusters::FetchGcpOperationService.new.execute(provider, &blk)
+        Clusters::Gcp::FetchOperationService.new.execute(provider, &blk)
       end
     end
   end