Fix environment deployment platform filter method / EE

app/models/concerns/deployment_platform.rb

@@ -4,6 +4,7 @@ module DeploymentPlatform
   def deployment_platform(environment: nil)
     @deployment_platform ||= {}
 
+    return find_deployment_platform(environment)
     @deployment_platform[environment] ||= find_deployment_platform(environment)
   end
 

app/models/environment.rb

@@ -228,7 +228,7 @@ class Environment < ActiveRecord::Base
   end
 
   def deployment_platform
-    project.deployment_platform(environment: self)
+    project.deployment_platform(environment: self.name)
   end
 
   private

spec/models/environment_spec.rb

@@ -368,6 +368,29 @@ describe Environment do
     end
   end
 
+  describe '#deployment_platform' do
+    before do
+      stub_licensed_features(multiple_clusters: true)
+    end
+
+    context 'when there is a deployment platform for environment' do
+      let!(:cluster) do
+        create(:cluster, :provided_by_gcp,
+               projects: [project])
+      end
+
+      it 'finds a deployment platform' do
+        expect(environment.deployment_platform).to eq cluster.platform
+      end
+    end
+
+    context 'when there is no deployment platform for environment' do
+      it 'returns nil' do
+        expect(environment.deployment_platform).to be_nil
+      end
+    end
+  end
+
   describe '#terminals' do
     subject { environment.terminals }