Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

2 files changed, 69 insertions, 1 deletions

diff --git a/lib/api/terraform/state.rb b/lib/api/terraform/state.rb
index 7063a3d08b5..4168cce21ef 100644
--- a/lib/api/terraform/state.rb
+++ b/lib/api/terraform/state.rb
@@ -4,7 +4,7 @@ require_dependency 'api/validations/validators/limit'
 
 module API
   module Terraform
-    class State < Grape::API::Instance
+    class State < ::API::Base
       include ::Gitlab::Utils::StrongMemoize
 
       default_format :json
diff --git a/lib/api/terraform/state_version.rb b/lib/api/terraform/state_version.rb
new file mode 100644
index 00000000000..b4a0efd7a2b
--- /dev/null
+++ b/lib/api/terraform/state_version.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module API
+  module Terraform
+    class StateVersion < ::API::Base
+      default_format :json
+
+      before do
+        authenticate!
+        authorize! :read_terraform_state, user_project
+      end
+
+      params do
+        requires :id, type: String, desc: 'The ID of a project'
+      end
+
+      resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
+        namespace ':id/terraform/state/:name/versions/:serial' do
+          params do
+            requires :name, type: String, desc: 'The name of a Terraform state'
+            requires :serial, type: Integer, desc: 'The version number of the state'
+          end
+
+          helpers do
+            def remote_state_handler
+              ::Terraform::RemoteStateHandler.new(user_project, current_user, name: params[:name])
+            end
+
+            def find_version(serial)
+              remote_state_handler.find_with_lock do |state|
+                version = state.versions.find_by_version(serial)
+
+                if version.present?
+                  yield version
+                else
+                  not_found!
+                end
+              end
+            end
+          end
+
+          desc 'Get a terraform state version'
+          route_setting :authentication, basic_auth_personal_access_token: true, job_token_allowed: :basic_auth
+          get do
+            find_version(params[:serial]) do |version|
+              env['api.format'] = :binary # Bypass json serialization
+              body version.file.read
+              status :ok
+            end
+          end
+
+          desc 'Delete a terraform state version'
+          route_setting :authentication, basic_auth_personal_access_token: true, job_token_allowed: :basic_auth
+          delete do
+            authorize! :admin_terraform_state, user_project
+
+            find_version(params[:serial]) do |version|
+              version.destroy!
+
+              body false
+              status :no_content
+            end
+          end
+        end
+      end
+    end
+  end
+end