|
|
|
@@ -31,9 +31,12 @@ class Ci::CloudAccountsController < Ci::BaseController |
|
|
|
ci_user = Ci::User.find_by(user_login: current_user.login) |
|
|
|
repo = Ci::Repo.where(repo_namespace: current_user.login, repo_name: params[:repo]).first |
|
|
|
begin |
|
|
|
Rails.logger.info "============activate ======== #{ci_user.user_login} -- #{repo.repo_name}" |
|
|
|
repo.activate!(ci_user.user_id) |
|
|
|
Rails.logger.info "==========activate start create hook ========" |
|
|
|
result = bind_hook!(current_user, @cloud_account, repo) |
|
|
|
@project.update_columns(:open_devops, true, gitea_webhook_id: result['id']) |
|
|
|
Rails.logger.info "=========activate create hook result #{result}" |
|
|
|
@project.update_columns(open_devops: true, gitea_webhook_id: result['id']) if result |
|
|
|
|
|
|
|
@cloud_account.update_column(:ci_user_id, ci_user.user_id) |
|
|
|
render_ok |
|
|
|
@@ -158,9 +161,10 @@ class Ci::CloudAccountsController < Ci::BaseController |
|
|
|
}, |
|
|
|
"type": "gitea" |
|
|
|
} |
|
|
|
Rails.logger.info "----------bind hook --------" |
|
|
|
result = Gitea::Hooks::CreateService.call(user.gitea_token, user.login, repo.repo_name, hook_params) |
|
|
|
regurn nil if result.status unless result.status == 201 |
|
|
|
|
|
|
|
regurn nil unless result.status == 201 |
|
|
|
Rails.logger.info "----------bind hook success--------" |
|
|
|
body = JSON.parse(result.body) |
|
|
|
@project.update_column(:gitea_webhook_id, body['id']) |
|
|
|
body |
|
|
|
|