Commit 80e04c3c authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'fix/gb/fix-deployment-platform-for-environment' into 'master'

Fix environment deployment platform filter method

See merge request gitlab-org/gitlab-ce!18216
parents 78894161 8fc9ff7f
......@@ -224,7 +224,7 @@ class Environment < ActiveRecord::Base
end
def deployment_platform
project.deployment_platform(environment: self)
project.deployment_platform(environment: self.name)
end
private
......
......@@ -79,7 +79,7 @@ module Gitlab
def common_query_context(environment, timeframe_start:, timeframe_end:)
base_query_context(timeframe_start, timeframe_end).merge({
ci_environment_slug: environment.slug,
kube_namespace: environment.project.deployment_platform&.actual_namespace || '',
kube_namespace: environment.deployment_platform&.actual_namespace || '',
environment_filter: %{container_name!="POD",environment="#{environment.slug}"}
})
end
......
......@@ -368,6 +368,32 @@ describe Environment do
end
end
describe '#deployment_platform' do
context 'when there is a deployment platform for environment' do
let!(:cluster) do
create(:cluster, :provided_by_gcp,
environment_scope: '*', 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
it 'checks deployment platforms associated with a project' do
expect(project).to receive(:deployment_platform)
.with(environment: environment.name)
environment.deployment_platform
end
end
describe '#terminals' do
subject { environment.terminals }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment