diff options
| -rw-r--r-- | changelogs/unreleased/13492-design-comments-width.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/22392-add-eks-clusters-to-usage-data.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/34855-dependency-list-is-not-up-to-date-frontend.yml | 5 | ||||
| -rw-r--r-- | doc/user/application_security/dependency_list/img/dependency_list_v12_4.png | bin | 0 -> 137591 bytes | |||
| -rw-r--r-- | doc/user/application_security/dependency_list/index.md | 2 | ||||
| -rw-r--r-- | lib/gitlab/usage_data.rb | 1 | ||||
| -rw-r--r-- | locale/gitlab.pot | 6 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb | 6 | ||||
| -rw-r--r-- | spec/factories/clusters/platforms/kubernetes.rb | 2 | ||||
| -rw-r--r-- | spec/factories/clusters/providers/aws.rb | 2 | ||||
| -rw-r--r-- | spec/factories/clusters/providers/gcp.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/usage_data_spec.rb | 19 | ||||
| -rw-r--r-- | spec/models/clusters/cluster_spec.rb | 20 |
13 files changed, 53 insertions, 22 deletions
diff --git a/changelogs/unreleased/13492-design-comments-width.yml b/changelogs/unreleased/13492-design-comments-width.yml new file mode 100644 index 00000000000..0929483a37d --- /dev/null +++ b/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 diff --git a/changelogs/unreleased/22392-add-eks-clusters-to-usage-data.yml b/changelogs/unreleased/22392-add-eks-clusters-to-usage-data.yml new file mode 100644 index 00000000000..cac10925020 --- /dev/null +++ b/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 diff --git a/changelogs/unreleased/34855-dependency-list-is-not-up-to-date-frontend.yml b/changelogs/unreleased/34855-dependency-list-is-not-up-to-date-frontend.yml new file mode 100644 index 00000000000..aa1858a1b98 --- /dev/null +++ b/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 diff --git a/doc/user/application_security/dependency_list/img/dependency_list_v12_4.png b/doc/user/application_security/dependency_list/img/dependency_list_v12_4.png Binary files differnew file mode 100644 index 00000000000..4687987b763 --- /dev/null +++ b/doc/user/application_security/dependency_list/img/dependency_list_v12_4.png diff --git a/doc/user/application_security/dependency_list/index.md b/doc/user/application_security/dependency_list/index.md index 8366e943ccc..2828d487153 100644 --- a/doc/user/application_security/dependency_list/index.md +++ b/doc/user/application_security/dependency_list/index.md @@ -17,7 +17,7 @@ sidebar. ## Viewing dependencies - + Dependencies are displayed with the following information: diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 76324b93799..30c9855507d 100644 --- a/lib/gitlab/usage_data.rb +++ b/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), diff --git a/locale/gitlab.pot b/locale/gitlab.pot index b8db9e69e33..023432c1b9c 100644 --- a/locale/gitlab.pot +++ b/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 "" diff --git a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb index 319fd510a18..e9a3b0f75e6 100644 --- a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb +++ b/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', :quarantine do + context 'Configure' 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! diff --git a/spec/factories/clusters/platforms/kubernetes.rb b/spec/factories/clusters/platforms/kubernetes.rb index 2757498e36b..dbcb838e9da 100644 --- a/spec/factories/clusters/platforms/kubernetes.rb +++ b/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 } diff --git a/spec/factories/clusters/providers/aws.rb b/spec/factories/clusters/providers/aws.rb index f4bc61455c5..dc18762607b 100644 --- a/spec/factories/clusters/providers/aws.rb +++ b/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' } diff --git a/spec/factories/clusters/providers/gcp.rb b/spec/factories/clusters/providers/gcp.rb index 83b65dc8087..216c4d4fa31 100644 --- a/spec/factories/clusters/providers/gcp.rb +++ b/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 diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb index 4b6c878b20d..b0886963a04 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/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) - create(:cluster, :provided_by_user, :disabled) + + # Enabled clusters + 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[:project_clusters_enabled]).to eq(6) + expect(count_data[:clusters_enabled]).to eq(4) + 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) diff --git a/spec/models/clusters/cluster_spec.rb b/spec/models/clusters/cluster_spec.rb index 47530025620..198a3dfd37a 100644 --- a/spec/models/clusters/cluster_spec.rb +++ b/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_cluster.provider.make_errored!("Error message") + errored_provider = create(:cluster_provider_aws) + errored_provider.make_errored!("Error message") end it { is_expected.to contain_exactly(cluster) } |
