From 411ebafda8d491deb1bf73a40eaebc3115fa4c83 Mon Sep 17 00:00:00 2001
From: Allison Browne <abrowne@gitlab.com>
Date: Wed, 1 Feb 2023 16:43:38 +0000
Subject: [PATCH] Update Google CDN feature category
Updates the feature categories to reflect that the
google CDN is only used by build artifacts currently.
---
.../google_cloud/fetch_google_ip_list_service_spec.rb | 2 +-
spec/uploaders/object_storage/cdn/google_cdn_spec.rb | 5 ++++-
spec/uploaders/object_storage/cdn_spec.rb | 2 +-
.../workers/google_cloud/fetch_google_ip_list_worker_spec.rb | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/spec/services/google_cloud/fetch_google_ip_list_service_spec.rb b/spec/services/google_cloud/fetch_google_ip_list_service_spec.rb
index ef77958fa602..e5f06824b9fd 100644
--- a/spec/services/google_cloud/fetch_google_ip_list_service_spec.rb
+++ b/spec/services/google_cloud/fetch_google_ip_list_service_spec.rb
@@ -3,7 +3,7 @@
require 'spec_helper'
RSpec.describe GoogleCloud::FetchGoogleIpListService, :use_clean_rails_memory_store_caching,
-:clean_gitlab_redis_rate_limiting, feature_category: :continuous_integration do
+:clean_gitlab_redis_rate_limiting, feature_category: :build_artifacts do
include StubRequests
let(:google_cloud_ips) { File.read(Rails.root.join('spec/fixtures/cdn/google_cloud.json')) }
diff --git a/spec/uploaders/object_storage/cdn/google_cdn_spec.rb b/spec/uploaders/object_storage/cdn/google_cdn_spec.rb
index 96755b7292b4..184c664f6dca 100644
--- a/spec/uploaders/object_storage/cdn/google_cdn_spec.rb
+++ b/spec/uploaders/object_storage/cdn/google_cdn_spec.rb
@@ -3,7 +3,10 @@
require 'spec_helper'
RSpec.describe ObjectStorage::CDN::GoogleCDN,
- :use_clean_rails_memory_store_caching, :use_clean_rails_redis_caching, :sidekiq_inline do
+ :use_clean_rails_memory_store_caching,
+ :use_clean_rails_redis_caching,
+ :sidekiq_inline,
+ feature_category: :build_artifacts do # the google cdn is currently only used by build artifacts
include StubRequests
let(:key) { SecureRandom.hex }
diff --git a/spec/uploaders/object_storage/cdn_spec.rb b/spec/uploaders/object_storage/cdn_spec.rb
index 2a447921a199..a64e70008559 100644
--- a/spec/uploaders/object_storage/cdn_spec.rb
+++ b/spec/uploaders/object_storage/cdn_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe ObjectStorage::CDN do
+RSpec.describe ObjectStorage::CDN, feature_category: :build_artifacts do
let(:cdn_options) do
{
'object_store' => {
diff --git a/spec/workers/google_cloud/fetch_google_ip_list_worker_spec.rb b/spec/workers/google_cloud/fetch_google_ip_list_worker_spec.rb
index c0b32515d157..bdafc0764659 100644
--- a/spec/workers/google_cloud/fetch_google_ip_list_worker_spec.rb
+++ b/spec/workers/google_cloud/fetch_google_ip_list_worker_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe GoogleCloud::FetchGoogleIpListWorker do
+RSpec.describe GoogleCloud::FetchGoogleIpListWorker, feature_category: :build_artifacts do
describe '#perform' do
it 'returns success' do
allow_next_instance_of(GoogleCloud::FetchGoogleIpListService) do |service|
--
GitLab