diff options
Diffstat (limited to 'lib/api/terraform/state.rb')
| -rw-r--r-- | lib/api/terraform/state.rb | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/lib/api/terraform/state.rb b/lib/api/terraform/state.rb index 184690f9979..8017a195f28 100644 --- a/lib/api/terraform/state.rb +++ b/lib/api/terraform/state.rb @@ -55,17 +55,6 @@ module API def remote_state_handler ::Terraform::RemoteStateHandler.new(user_project, current_user, name: params[:name], lock_id: params[:ID]) end - - def not_found_for_dots? - Feature.disabled?(:allow_dots_on_tf_state_names) && params[:name].include?(".") - end - - # Change the state name to behave like before, https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105674 - # has been introduced. This behavior can be controlled via `allow_dots_on_tf_state_names` FF. - # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106861 - def legacy_state_name! - params[:name] = params[:name].split('.').first - end end desc 'Get a Terraform state by its name' do @@ -83,8 +72,6 @@ module API end route_setting :authentication, basic_auth_personal_access_token: true, job_token_allowed: :basic_auth get do - legacy_state_name! if not_found_for_dots? - remote_state_handler.find_with_lock do |state| no_content! unless state.latest_file && state.latest_file.exists? @@ -109,7 +96,6 @@ module API route_setting :authentication, basic_auth_personal_access_token: true, job_token_allowed: :basic_auth post do authorize! :admin_terraform_state, user_project - legacy_state_name! if not_found_for_dots? data = request.body.read no_content! if data.empty? @@ -138,7 +124,6 @@ module API route_setting :authentication, basic_auth_personal_access_token: true, job_token_allowed: :basic_auth delete do authorize! :admin_terraform_state, user_project - legacy_state_name! if not_found_for_dots? remote_state_handler.find_with_lock do |state| ::Terraform::States::TriggerDestroyService.new(state, current_user: current_user).execute @@ -170,8 +155,6 @@ module API requires :Path, type: String, desc: 'Terraform path' end post '/lock' do - not_found! if not_found_for_dots? - authorize! :admin_terraform_state, user_project status_code = :ok @@ -215,8 +198,6 @@ module API optional :ID, type: String, limit: 255, desc: 'Terraform state lock ID' end delete '/lock' do - not_found! if not_found_for_dots? - authorize! :admin_terraform_state, user_project remote_state_handler.unlock! |