From da975941d13188324266a50d3f8c0292690ee437 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 18 Jan 2022 15:14:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../google_cloud/service_accounts_controller.rb | 25 +++++++--------------- .../packages/infrastructure_registry_controller.rb | 2 +- 2 files changed, 9 insertions(+), 18 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/projects/google_cloud/service_accounts_controller.rb b/app/controllers/projects/google_cloud/service_accounts_controller.rb index 31ef1463056..b5f2b658235 100644 --- a/app/controllers/projects/google_cloud/service_accounts_controller.rb +++ b/app/controllers/projects/google_cloud/service_accounts_controller.rb @@ -24,24 +24,15 @@ class Projects::GoogleCloud::ServiceAccountsController < Projects::GoogleCloud:: end def create - google_api_client = GoogleApi::CloudPlatform::Client.new(token_in_session, nil) - service_accounts_service = GoogleCloud::ServiceAccountsService.new(project) - gcp_project = params[:gcp_project] - environment = params[:environment] - generated_name = "GitLab :: #{@project.name} :: #{environment}" - generated_desc = "GitLab generated service account for project '#{@project.name}' and environment '#{environment}'" - - service_account = google_api_client.create_service_account(gcp_project, generated_name, generated_desc) - service_account_key = google_api_client.create_service_account_key(gcp_project, service_account.unique_id) - - service_accounts_service.add_for_project( - environment, - service_account.project_id, - service_account.to_json, - service_account_key.to_json - ) + response = GoogleCloud::CreateServiceAccountsService.new( + project, + current_user, + google_oauth2_token: token_in_session, + gcp_project_id: params[:gcp_project], + environment_name: params[:environment] + ).execute - redirect_to project_google_cloud_index_path(project), notice: _('Service account generated successfully') + redirect_to project_google_cloud_index_path(project), notice: response.message rescue Google::Apis::ClientError, Google::Apis::ServerError, Google::Apis::AuthorizationError => error handle_gcp_error(error, project) end diff --git a/app/controllers/projects/packages/infrastructure_registry_controller.rb b/app/controllers/projects/packages/infrastructure_registry_controller.rb index 4af2894590b..c02a0a56e03 100644 --- a/app/controllers/projects/packages/infrastructure_registry_controller.rb +++ b/app/controllers/projects/packages/infrastructure_registry_controller.rb @@ -9,7 +9,7 @@ module Projects def show @package = project.packages.find(params[:id]) - @package_files = if Feature.enabled?(:packages_installable_package_files) + @package_files = if Feature.enabled?(:packages_installable_package_files, default_enabled: :yaml) @package.installable_package_files.recent else @package.package_files.recent -- cgit v1.2.3