Add latest changes from gitlab-org/gitlab@master

changelogs/unreleased/13492-design-comments-width.yml

@@ -0,0 +1,5 @@
+---
+title: Smaller width for design comments layout, truncate image title
+merge_request: 17547
+author:
+type: fixed

changelogs/unreleased/22392-add-eks-clusters-to-usage-data.yml

@@ -0,0 +1,5 @@
+---
+title: Add EKS cluster count to usage data
+merge_request: 17059
+author:
+type: other

changelogs/unreleased/34855-dependency-list-is-not-up-to-date-frontend.yml

@@ -0,0 +1,5 @@
+---
+title: Add pipeline information to dependency list header
+merge_request: 19352
+author:
+type: added

doc/user/application_security/dependency_list/index.md

@@ -17,7 +17,7 @@ sidebar.
 
 ## Viewing dependencies
 
-![Dependency List](img/dependency_list_v12_3.png)
+![Dependency List](img/dependency_list_v12_4.png)
 
 Dependencies are displayed with the following information:
 

lib/gitlab/usage_data.rb

@@ -66,6 +66,7 @@ module Gitlab
             clusters_disabled: count(::Clusters::Cluster.disabled),
             project_clusters_disabled: count(::Clusters::Cluster.disabled.project_type),
             group_clusters_disabled: count(::Clusters::Cluster.disabled.group_type),
+            clusters_platforms_eks: count(::Clusters::Cluster.aws_installed.enabled),
             clusters_platforms_gke: count(::Clusters::Cluster.gcp_installed.enabled),
             clusters_platforms_user: count(::Clusters::Cluster.user_provided.enabled),
             clusters_applications_helm: count(::Clusters::Applications::Helm.available),

locale/gitlab.pot

@@ -5293,6 +5293,9 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
+msgid "Dependencies help page link"
+msgstr ""
+
 msgid "Dependencies|%d additional vulnerability not shown"
 msgid_plural "Dependencies|%d additional vulnerabilities not shown"
 msgstr[0] ""
@@ -5789,6 +5792,9 @@ msgstr ""
 msgid "Display name"
 msgstr ""
 
+msgid "Displays dependencies and known vulnerabilities, based on the %{linkStart}latest pipeline%{linkEnd} scan"
+msgstr ""
+
 msgid "Do not display offers from third parties within GitLab"
 msgstr ""
 

qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb

@@ -3,8 +3,7 @@
 require 'pathname'
 
 module QA
-  # Issue: https://gitlab.com/gitlab-org/gitlab/issues/35156
+  context 'Configure' do
-  context 'Configure', :quarantine do
     def login
       Runtime::Browser.visit(:gitlab, Page::Main::Login)
       Page::Main::Login.perform(&:sign_in_using_credentials)
@@ -56,7 +55,8 @@ module QA
       end
     end
 
-    describe 'Auto DevOps support', :orchestrated, :kubernetes do
+    # https://gitlab.com/gitlab-org/gitlab/issues/35156
+    describe 'Auto DevOps support', :orchestrated, :kubernetes, :quarantine do
       context 'when rbac is enabled' do
         before(:all) do
           @cluster = Service::KubernetesCluster.new.create!

spec/factories/clusters/platforms/kubernetes.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :cluster_platform_kubernetes, class: Clusters::Platforms::Kubernetes do
-    cluster
+    association :cluster, platform_type: :kubernetes, provider_type: :user
     namespace { nil }
     api_url { 'https://kubernetes.example.com' }
     token { 'a' * 40 }

spec/factories/clusters/providers/aws.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :cluster_provider_aws, class: Clusters::Providers::Aws do
-    cluster
+    association :cluster, platform_type: :kubernetes, provider_type: :aws
     created_by_user factory: :user
 
     role_arn { 'arn:aws:iam::123456789012:role/role-name' }

spec/factories/clusters/providers/gcp.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :cluster_provider_gcp, class: Clusters::Providers::Gcp do
-    cluster
+    association :cluster, platform_type: :kubernetes, provider_type: :gcp
     gcp_project_id { 'test-gcp-project' }
 
     trait :scheduled do

spec/lib/gitlab/usage_data_spec.rb

@@ -24,12 +24,19 @@ describe Gitlab::UsageData do
       create_list(:zoom_meeting, 2, project: projects[0], issue: projects[0].issues[1], issue_status: :removed)
       create(:zoom_meeting, project: projects[0], issue: projects[0].issues[2], issue_status: :added)
       create_list(:zoom_meeting, 2, project: projects[0], issue: projects[0].issues[2], issue_status: :removed)
-      gcp_cluster = create(:cluster, :provided_by_gcp)
+
-      create(:cluster, :provided_by_user)
+      # Enabled clusters
-      create(:cluster, :provided_by_user, :disabled)
+      gcp_cluster = create(:cluster_provider_gcp, :created).cluster
+      create(:cluster_provider_aws, :created)
+      create(:cluster_platform_kubernetes)
       create(:cluster, :group)
+
+      # Disabled clusters
+      create(:cluster, :disabled)
       create(:cluster, :group, :disabled)
       create(:cluster, :group, :disabled)
+
+      # Applications
       create(:clusters_applications_helm, :installed, cluster: gcp_cluster)
       create(:clusters_applications_ingress, :installed, cluster: gcp_cluster)
       create(:clusters_applications_cert_manager, :installed, cluster: gcp_cluster)
@@ -117,6 +124,7 @@ describe Gitlab::UsageData do
         clusters_disabled
         project_clusters_disabled
         group_clusters_disabled
+        clusters_platforms_eks
         clusters_platforms_gke
         clusters_platforms_user
         clusters_applications_helm
@@ -185,13 +193,14 @@ describe Gitlab::UsageData do
       expect(count_data[:issues_with_associated_zoom_link]).to eq(2)
       expect(count_data[:issues_using_zoom_quick_actions]).to eq(3)
 
-      expect(count_data[:clusters_enabled]).to eq(7)
+      expect(count_data[:clusters_enabled]).to eq(4)
-      expect(count_data[:project_clusters_enabled]).to eq(6)
+      expect(count_data[:project_clusters_enabled]).to eq(3)
       expect(count_data[:group_clusters_enabled]).to eq(1)
       expect(count_data[:clusters_disabled]).to eq(3)
       expect(count_data[:project_clusters_disabled]).to eq(1)
       expect(count_data[:group_clusters_disabled]).to eq(2)
       expect(count_data[:group_clusters_enabled]).to eq(1)
+      expect(count_data[:clusters_platforms_eks]).to eq(1)
       expect(count_data[:clusters_platforms_gke]).to eq(1)
       expect(count_data[:clusters_platforms_user]).to eq(1)
       expect(count_data[:clusters_applications_helm]).to eq(1)

spec/models/clusters/cluster_spec.rb

@@ -55,7 +55,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
     let!(:cluster) { create(:cluster, enabled: true) }
 
     before do
-      create(:cluster, enabled: false)
+      create(:cluster, :disabled)
     end
 
     it { is_expected.to contain_exactly(cluster) }
@@ -64,7 +64,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
   describe '.disabled' do
     subject { described_class.disabled }
 
-    let!(:cluster) { create(:cluster, enabled: false) }
+    let!(:cluster) { create(:cluster, :disabled) }
 
     before do
       create(:cluster, enabled: true)
@@ -76,10 +76,10 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
   describe '.user_provided' do
     subject { described_class.user_provided }
 
-    let!(:cluster) { create(:cluster, :provided_by_user) }
+    let!(:cluster) { create(:cluster_platform_kubernetes).cluster }
 
     before do
-      create(:cluster, :provided_by_gcp)
+      create(:cluster_provider_gcp, :created)
     end
 
     it { is_expected.to contain_exactly(cluster) }
@@ -88,7 +88,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
   describe '.gcp_provided' do
     subject { described_class.gcp_provided }
 
-    let!(:cluster) { create(:cluster, :provided_by_gcp) }
+    let!(:cluster) { create(:cluster_provider_gcp, :created).cluster }
 
     before do
       create(:cluster, :provided_by_user)
@@ -100,7 +100,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
   describe '.gcp_installed' do
     subject { described_class.gcp_installed }
 
-    let!(:cluster) { create(:cluster, :provided_by_gcp) }
+    let!(:cluster) { create(:cluster_provider_gcp, :created).cluster }
 
     before do
       create(:cluster, :providing_by_gcp)
@@ -112,7 +112,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
   describe '.aws_provided' do
     subject { described_class.aws_provided }
 
-    let!(:cluster) { create(:cluster, :provided_by_aws) }
+    let!(:cluster) { create(:cluster_provider_aws, :created).cluster }
 
     before do
       create(:cluster, :provided_by_user)
@@ -124,11 +124,11 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
   describe '.aws_installed' do
     subject { described_class.aws_installed }
 
-    let!(:cluster) { create(:cluster, :provided_by_aws) }
+    let!(:cluster) { create(:cluster_provider_aws, :created).cluster }
 
     before do
-      errored_cluster = create(:cluster, :provided_by_aws)
+      errored_provider = create(:cluster_provider_aws)
-      errored_cluster.provider.make_errored!("Error message")
+      errored_provider.make_errored!("Error message")
     end
 
     it { is_expected.to contain_exactly(cluster) }