Add latest changes from gitlab-org/gitlab@master

spec/lib/gitlab/import_export/all_models.yml

@@ -190,6 +190,7 @@ ci_pipelines:
 - job_artifacts
 - vulnerabilities_occurrence_pipelines
 - vulnerability_findings
+- pipeline_config
 pipeline_variables:
 - pipeline
 stages:

spec/lib/gitlab/kubernetes/kube_client_spec.rb

@@ -136,6 +136,20 @@ describe Gitlab::Kubernetes::KubeClient do
     end
   end
+  describe '#istio_client' do
+    subject { client.istio_client }
+
+    it_behaves_like 'a Kubeclient'
+
+    it 'has the Istio API group endpoint' do
+      expect(subject.api_endpoint.to_s).to match(%r{\/apis\/networking.istio.io\Z})
+    end
+
+    it 'has the api_version' do
+      expect(subject.instance_variable_get(:@api_version)).to eq('v1alpha3')
+    end
+  end
+
   describe '#knative_client' do
     subject { client.knative_client }
@@ -233,6 +247,29 @@ describe Gitlab::Kubernetes::KubeClient do
     end
   end
+  describe 'istio API group' do
+    let(:istio_client) { client.istio_client }
+
+    [
+      :create_gateway,
+      :get_gateway,
+      :update_gateway
+    ].each do |method|
+      describe "##{method}" do
+        include_examples 'redirection not allowed', method
+        include_examples 'dns rebinding not allowed', method
+
+        it 'delegates to the istio client' do
+          expect(client).to delegate_method(method).to(:istio_client)
+        end
+
+        it 'responds to the method' do
+          expect(client).to respond_to method
+        end
+      end
+    end
+  end
+
   describe 'non-entity methods' do
     it 'does not proxy for non-entity methods' do
       expect(client).not_to respond_to :proxy_url

spec/models/ci/build_spec.rb

@@ -2248,24 +2248,14 @@ describe Ci::Build do
     end
   end
-  describe '#has_expiring_archive_artifacts?' do
+  describe '#has_expiring_artifacts?' do
     context 'when artifacts have expiration date set' do
       before do
         build.update(artifacts_expire_at: 1.day.from_now)
       end
-      context 'and job artifacts file exists' do
-        let!(:archive) { create(:ci_job_artifact, :archive, job: build) }
-
-        it 'has expiring artifacts' do
-          expect(build).to have_expiring_archive_artifacts
-        end
-      end
-
-      context 'and job artifacts file does not exist' do
-        it 'does not have expiring artifacts' do
-          expect(build).not_to have_expiring_archive_artifacts
-        end
+      it 'has expiring artifacts' do
+        expect(build).to have_expiring_artifacts
       end
     end
@@ -2275,7 +2265,7 @@ describe Ci::Build do
       end
       it 'does not have expiring artifacts' do
-        expect(build).not_to have_expiring_archive_artifacts
+        expect(build).not_to have_expiring_artifacts
       end
     end
   end

spec/models/ci/pipeline_config_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::PipelineConfig, type: :model do
+  it { is_expected.to belong_to(:pipeline) }
+
+  it { is_expected.to validate_presence_of(:pipeline) }
+  it { is_expected.to validate_presence_of(:content) }
+end

spec/models/ci/pipeline_spec.rb

@@ -35,6 +35,7 @@ describe Ci::Pipeline, :mailer do
   it { is_expected.to have_one(:source_pipeline) }
   it { is_expected.to have_one(:triggered_by_pipeline) }
   it { is_expected.to have_one(:source_job) }
+  it { is_expected.to have_one(:pipeline_config) }
   it { is_expected.to validate_presence_of(:sha) }
   it { is_expected.to validate_presence_of(:status) }

spec/serializers/build_artifact_entity_spec.rb

@@ -4,8 +4,6 @@ require 'spec_helper'
 describe BuildArtifactEntity do
   let(:job) { create(:ci_build, name: 'test:job', artifacts_expire_at: 1.hour.from_now) }
-  let!(:archive) { create(:ci_job_artifact, :archive, job: job) }
-  let!(:metadata) { create(:ci_job_artifact, :metadata, job: job) }
   let(:entity) do
     described_class.new(job, request: double)

spec/serializers/build_details_entity_spec.rb

@@ -176,27 +176,5 @@ describe BuildDetailsEntity do
         expect(subject[:reports].first[:file_type]).to eq('codequality')
       end
     end
-
-    context 'when the build has no archive type artifacts' do
-      let!(:report) { create(:ci_job_artifact, :codequality, job: build) }
-
-      it 'does not expose any artifact actions path' do
-        expect(subject[:artifact].keys).not_to include(:download_path, :browse_path, :keep_path)
-      end
-    end
-
-    context 'when the build has archive type artifacts' do
-      let!(:report) { create(:ci_job_artifact, :codequality, job: build) }
-      let!(:archive) { create(:ci_job_artifact, :archive, job: build) }
-      let!(:metadata) { create(:ci_job_artifact, :metadata, job: build) }
-
-      before do
-        build.update(artifacts_expire_at: 7.days.from_now)
-      end
-
-      it 'exposes artifact details' do
-        expect(subject[:artifact].keys).to include(:download_path, :browse_path, :keep_path, :expire_at, :expired)
-      end
-    end
   end
 end

spec/services/prometheus/adapter_service_spec.rb

@@ -3,13 +3,12 @@
 require 'spec_helper'
 describe Prometheus::AdapterService do
-  let(:project) { create(:project) }
-  subject { described_class.new(project) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:cluster, reload: true) { create(:cluster, :provided_by_user, environment_scope: '*', projects: [project]) }
+  subject { described_class.new(project, cluster) }
   describe '#prometheus_adapter' do
-    let(:cluster) { create(:cluster, :provided_by_user, environment_scope: '*', projects: [project]) }
-
     context 'prometheus service can execute queries' do
       let(:prometheus_service) { double(:prometheus_service, can_query?: true) }

spec/support/helpers/kubernetes_helpers.rb

@@ -33,6 +33,14 @@ module KubernetesHelpers
       .to_return(kube_response(kube_v1_rbac_authorization_discovery_body))
   end
+  def stub_kubeclient_discover_istio(api_url)
+    stub_kubeclient_discover_base(api_url)
+
+    WebMock
+      .stub_request(:get, api_url + '/apis/networking.istio.io/v1alpha3')
+      .to_return(kube_response(kube_istio_discovery_body))
+  end
+
   def stub_kubeclient_discover(api_url)
     stub_kubeclient_discover_base(api_url)
@@ -244,6 +252,16 @@ module KubernetesHelpers
       .to_return(kube_response({}))
   end
+  def stub_kubeclient_get_gateway(api_url, name, namespace: 'default')
+    WebMock.stub_request(:get, api_url + "/apis/networking.istio.io/v1alpha3/namespaces/#{namespace}/gateways/#{name}")
+      .to_return(kube_response(kube_istio_gateway_body(name, namespace)))
+  end
+
+  def stub_kubeclient_put_gateway(api_url, name, namespace: 'default')
+    WebMock.stub_request(:put, api_url + "/apis/networking.istio.io/v1alpha3/namespaces/#{namespace}/gateways/#{name}")
+      .to_return(kube_response({}))
+  end
+
   def kube_v1_secret_body(**options)
     {
       "kind" => "SecretList",
@@ -311,6 +329,115 @@ module KubernetesHelpers
     }
   end
+  def kube_istio_discovery_body
+    {
+      "kind" => "APIResourceList",
+      "apiVersion" => "v1",
+      "groupVersion" => "networking.istio.io/v1alpha3",
+      "resources" => [
+        {
+          "name" => "gateways",
+          "singularName" => "gateway",
+          "namespaced" => true,
+          "kind" => "Gateway",
+          "verbs" => %w[delete deletecollection get list patch create update watch],
+          "shortNames" => %w[gw],
+          "categories" => %w[istio-io networking-istio-io]
+        },
+        {
+          "name" => "serviceentries",
+          "singularName" => "serviceentry",
+          "namespaced" => true,
+          "kind" => "ServiceEntry",
+          "verbs" => %w[delete deletecollection get list patch create update watch],
+          "shortNames" => %w[se],
+          "categories" => %w[istio-io networking-istio-io]
+        },
+        {
+          "name" => "destinationrules",
+          "singularName" => "destinationrule",
+          "namespaced" => true,
+          "kind" => "DestinationRule",
+          "verbs" => %w[delete deletecollection get list patch create update watch],
+          "shortNames" => %w[dr],
+          "categories" => %w[istio-io networking-istio-io]
+        },
+        {
+          "name" => "envoyfilters",
+          "singularName" => "envoyfilter",
+          "namespaced" => true,
+          "kind" => "EnvoyFilter",
+          "verbs" => %w[delete deletecollection get list patch create update watch],
+          "categories" => %w[istio-io networking-istio-io]
+        },
+        {
+          "name" => "sidecars",
+          "singularName" => "sidecar",
+          "namespaced" => true,
+          "kind" => "Sidecar",
+          "verbs" => %w[delete deletecollection get list patch create update watch],
+          "categories" => %w[istio-io networking-istio-io]
+        },
+        {
+          "name" => "virtualservices",
+          "singularName" => "virtualservice",
+          "namespaced" => true,
+          "kind" => "VirtualService",
+          "verbs" => %w[delete deletecollection get list patch create update watch],
+          "shortNames" => %w[vs],
+          "categories" => %w[istio-io networking-istio-io]
+        }
+      ]
+    }
+  end
+
+  def kube_istio_gateway_body(name, namespace)
+    {
+      "apiVersion" => "networking.istio.io/v1alpha3",
+      "kind" => "Gateway",
+      "metadata" => {
+        "generation" => 1,
+        "labels" => {
+          "networking.knative.dev/ingress-provider" => "istio",
+          "serving.knative.dev/release" => "v0.7.0"
+        },
+        "name" => name,
+        "namespace" => namespace,
+        "selfLink" => "/apis/networking.istio.io/v1alpha3/namespaces/#{namespace}/gateways/#{name}"
+      },
+      "spec" => {
+        "selector" => {
+          "istio" => "ingressgateway"
+        },
+        "servers" => [
+          {
+            "hosts" => [
+              "*"
+            ],
+            "port" => {
+              "name" => "http",
+              "number" => 80,
+              "protocol" => "HTTP"
+            }
+          },
+          {
+            "hosts" => [
+              "*"
+            ],
+            "port" => {
+              "name" => "https",
+              "number" => 443,
+              "protocol" => "HTTPS"
+            },
+            "tls" => {
+              "mode" => "PASSTHROUGH"
+            }
+          }
+        ]
+      }
+    }
+  end
+
   def kube_v1alpha1_serving_knative_discovery_body
     {
       "kind" => "APIResourceList",