Merge branch 'secure-files-read-only-feature-flag' into 'master'

Adding ci_secure_files_read_only Feature Flag

See merge request gitlab-org/gitlab!84089

config/feature_flags/ops/ci_secure_files_read_only.yml

+---
+name: ci_secure_files_read_only
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84089
+rollout_issue_url: 
+milestone: '14.10'
+type: ops
+group: group::incubation
+default_enabled: false
\ No newline at end of file

lib/api/ci/secure_files.rb

@@ -54,6 +54,7 @@ module API
 
         resource do
           before do
+            read_only_feature_flag_enabled?
             authorize! :admin_secure_files, user_project
           end
 
@@ -97,6 +98,10 @@ module API
         def feature_flag_enabled?
           service_unavailable! unless Feature.enabled?(:ci_secure_files, user_project, default_enabled: :yaml)
         end
+
+        def read_only_feature_flag_enabled?
+          service_unavailable! if Feature.enabled?(:ci_secure_files_read_only, user_project, type: :ops, default_enabled: :yaml)
+        end
       end
     end
   end

spec/requests/api/ci/secure_files_spec.rb

@@ -6,6 +6,7 @@ RSpec.describe API::Ci::SecureFiles do
   before do
     stub_ci_secure_file_object_storage
     stub_feature_flags(ci_secure_files: true)
+    stub_feature_flags(ci_secure_files_read_only: false)
   end
 
   let_it_be(:maintainer) { create(:user) }
@@ -16,6 +17,13 @@ RSpec.describe API::Ci::SecureFiles do
   let_it_be(:project) { create(:project, creator_id: maintainer.id) }
   let_it_be(:secure_file) { create(:ci_secure_file, project: project) }
 
+  let(:file_params) do
+    {
+      file: fixture_file_upload('spec/fixtures/ci_secure_files/upload-keystore.jks'),
+      name: 'upload-keystore.jks'
+    }
+  end
+
   before_all do
     project.add_maintainer(maintainer)
     project.add_developer(developer)
@@ -40,6 +48,43 @@ RSpec.describe API::Ci::SecureFiles do
       end
     end
 
+    context 'ci_secure_files_read_only feature flag' do
+      context 'when the flag is enabled' do
+        before do
+          stub_feature_flags(ci_secure_files_read_only: true)
+        end
+
+        it 'returns a 503 when attempting to upload a file' do
+          stub_feature_flags(ci_secure_files_read_only: true)
+
+          expect do
+            post api("/projects/#{project.id}/secure_files", maintainer), params: file_params
+          end.not_to change {project.secure_files.count}
+
+          expect(response).to have_gitlab_http_status(:service_unavailable)
+        end
+
+        it 'returns a 200 when downloading a file' do
+          stub_feature_flags(ci_secure_files_read_only: true)
+
+          get api("/projects/#{project.id}/secure_files", developer)
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response).to be_a(Array)
+        end
+      end
+
+      context 'when the flag is disabled' do
+        it 'returns a 201 when uploading a file when the ci_secure_files_read_only feature flag is disabled' do
+          expect do
+            post api("/projects/#{project.id}/secure_files", maintainer), params: file_params
+          end.to change {project.secure_files.count}.by(1)
+
+          expect(response).to have_gitlab_http_status(:created)
+        end
+      end
+    end
+
     context 'authenticated user with admin permissions' do
       it 'returns project secure files' do
         get api("/projects/#{project.id}/secure_files", maintainer)
@@ -204,14 +249,8 @@ RSpec.describe API::Ci::SecureFiles do
   describe 'POST /projects/:id/secure_files' do
     context 'authenticated user with admin permissions' do
       it 'creates a secure file' do
-        params = {
-          file: fixture_file_upload('spec/fixtures/ci_secure_files/upload-keystore.jks'),
-          name: 'upload-keystore.jks',
-          permissions: 'execute'
-        }
-
         expect do
-          post api("/projects/#{project.id}/secure_files", maintainer), params: params
+          post api("/projects/#{project.id}/secure_files", maintainer), params: file_params.merge(permissions: 'execute')
         end.to change {project.secure_files.count}.by(1)
 
         expect(response).to have_gitlab_http_status(:created)
@@ -229,26 +268,15 @@ RSpec.describe API::Ci::SecureFiles do
       end
 
       it 'creates a secure file with read_only permissions by default' do
-        params = {
-          file: fixture_file_upload('spec/fixtures/ci_secure_files/upload-keystore.jks'),
-          name: 'upload-keystore.jks'
-        }
-
         expect do
-          post api("/projects/#{project.id}/secure_files", maintainer), params: params
+          post api("/projects/#{project.id}/secure_files", maintainer), params: file_params
         end.to change {project.secure_files.count}.by(1)
 
         expect(json_response['permissions']).to eq('read_only')
       end
 
       it 'uploads and downloads a secure file' do
-        post_params = {
-          file: fixture_file_upload('spec/fixtures/ci_secure_files/upload-keystore.jks'),
-          name: 'upload-keystore.jks',
-          permissions: 'read_write'
-        }
-
-        post api("/projects/#{project.id}/secure_files", maintainer), params: post_params
+        post api("/projects/#{project.id}/secure_files", maintainer), params: file_params
 
         secure_file_id = json_response['id']
 
@@ -268,12 +296,8 @@ RSpec.describe API::Ci::SecureFiles do
       end
 
       it 'returns an error when no file is uploaded' do
-        post_params = {
-          name: 'upload-keystore.jks'
-        }
-
         expect do
-          post api("/projects/#{project.id}/secure_files", maintainer), params: post_params
+          post api("/projects/#{project.id}/secure_files", maintainer), params: { name: 'upload-keystore.jks' }
         end.not_to change { project.secure_files.count }
 
         expect(response).to have_gitlab_http_status(:bad_request)
@@ -281,12 +305,8 @@ RSpec.describe API::Ci::SecureFiles do
       end
 
       it 'returns an error when the file name is missing' do
-        post_params = {
-          file: fixture_file_upload('spec/fixtures/ci_secure_files/upload-keystore.jks')
-        }
-
         expect do
-          post api("/projects/#{project.id}/secure_files", maintainer), params: post_params
+          post api("/projects/#{project.id}/secure_files", maintainer), params: { file: fixture_file_upload('spec/fixtures/ci_secure_files/upload-keystore.jks') }
         end.not_to change { project.secure_files.count }
 
         expect(response).to have_gitlab_http_status(:bad_request)
@@ -308,14 +328,8 @@ RSpec.describe API::Ci::SecureFiles do
       end
 
       it 'returns an error when an unexpected permission is supplied' do
-        post_params = {
-          file: fixture_file_upload('spec/fixtures/ci_secure_files/upload-keystore.jks'),
-          name: 'upload-keystore.jks',
-          permissions: 'foo'
-        }
-
         expect do
-          post api("/projects/#{project.id}/secure_files", maintainer), params: post_params
+          post api("/projects/#{project.id}/secure_files", maintainer), params: file_params.merge(permissions: 'foo')
         end.not_to change { project.secure_files.count }
 
         expect(response).to have_gitlab_http_status(:bad_request)
@@ -329,13 +343,8 @@ RSpec.describe API::Ci::SecureFiles do
           allow(instance).to receive_message_chain(:errors, :messages).and_return(['Error 1', 'Error 2'])
         end
 
-        post_params = {
-          file: fixture_file_upload('spec/fixtures/ci_secure_files/upload-keystore.jks'),
-          name: 'upload-keystore.jks'
-        }
-
         expect do
-          post api("/projects/#{project.id}/secure_files", maintainer), params: post_params
+          post api("/projects/#{project.id}/secure_files", maintainer), params: file_params
         end.not_to change { project.secure_files.count }
 
         expect(response).to have_gitlab_http_status(:bad_request)
@@ -346,13 +355,8 @@ RSpec.describe API::Ci::SecureFiles do
           allow(instance).to receive_message_chain(:file, :size).and_return(6.megabytes.to_i)
         end
 
-        post_params = {
-          file: fixture_file_upload('spec/fixtures/ci_secure_files/upload-keystore.jks'),
-          name: 'upload-keystore.jks'
-        }
-
         expect do
-          post api("/projects/#{project.id}/secure_files", maintainer), params: post_params
+          post api("/projects/#{project.id}/secure_files", maintainer), params: file_params
         end.not_to change { project.secure_files.count }
 
         expect(response).to have_gitlab_http_status(:payload_too_large)