floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_devops' of http://gitea.trustie.net/jasder/forgeplus into dev_devops

This commit is contained in:
sylor_huang@126.com 2020-07-15 17:35:21 +08:00
parent d2ef7ec5e4 8f96341679
commit df0fcdb5ce
10 changed files with 147 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/controllers/dev_ops/builds_controller.rb
View File

@ -3,9 +3,37 @@ class DevOps::BuildsController < ApplicationController
before_action :find_project
def index
cloud_account = @repo.dev_ops_cloud_account
result = DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.drone_url, @repo.user.login, @repo.identifier).builds
render json: result
end
def show
def detail
cloud_account = @repo.dev_ops_cloud_account
result = DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.drone_url, @repo.user.login, @repo.identifier, number: params[:number]).build
render json: result
end
def restart
cloud_account = @repo.dev_ops_cloud_account
result = DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.drone_url, @repo.user.login, @repo.identifier, number: params[:number]).restart
render json: result
end
def delete
cloud_account = @repo.dev_ops_cloud_account
result = DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.drone_url, @repo.user.login, @repo.identifier, number: params[:number]).stop
render json: result
end
def logs
cloud_account = @repo.dev_ops_cloud_account
result = DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.drone_url, @repo.user.login, @repo.identifier, build: params[:build], stage: params[:stage], step: sync_params[:step]).logs
render json: result
end
private

34
app/controllers/sync_forge_controller.rb
View File

@ -1,11 +1,11 @@
class SyncForgeController < ApplicationController
# before_action :check_token
def create
def create
ActiveRecord::Base.transaction do
params.permit!
sync_params = params[:sync_params]
project_user = User.where(login: sync_params[:owner_login])&.first
project_user = User.where(login: sync_params[:owner_login])&.first
#以前已同步的项目,那么肯定存在仓库
user_projects = Project.where(user_id: project_user.id)
@ -24,12 +24,12 @@ class SyncForgeController < ApplicationController
if has_project
SyncLog.sync_log("=================begin_to_update_project========")
# project = user_projects.where(id: sync_params[:id]), identifier: sync_params[:identifier])&.first ||
# project = user_projects.where(id: sync_params[:id]), identifier: sync_params[:identifier])&.first ||
check_sync_project(project, sync_params)
else #新建项目
SyncLog.sync_log("=================begin_to_create_new_project========")
project_params = {
repository_name: sync_params[:identifier],
user_id: project_user.id,
@ -44,7 +44,7 @@ class SyncForgeController < ApplicationController
new_project_score = ProjectScore.create(score_params)
SyncLog.sync_log("=================new_project_score:#{new_project_score.try(:id)}========")
end
SyncRepositoryJob.perform_later(sync_params[:owner_login], sync_params[:identifier], sync_params[:repository], get_sudomain) if sync_params[:repository].present?
check_new_project(project, sync_params)
else
@ -107,7 +107,7 @@ class SyncForgeController < ApplicationController
SyncLog.sync_log("=================sync_user_failed====#{e}")
end
private
private
def check_sync_project(project,sync_params)
begin
@ -117,8 +117,8 @@ class SyncForgeController < ApplicationController
end
SyncLog.sync_log("----begin_to_check_sync_project----project_id:#{project.id}---------------")
change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present? #更新project_score
change_project_issues(project, sync_params[:issues],project.id, gitea_main)
change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present? #更新project_score
change_project_issues(project, sync_params[:issues],project.id, gitea_main)
change_project_members(project, sync_params[:members],gitea_main)
change_project_versions(project, sync_params[:project_versions],gitea_main)
change_project_watchers(project, sync_params[:project_watchers],gitea_main)
@ -126,7 +126,7 @@ class SyncForgeController < ApplicationController
rescue => e
SyncLog.sync_log("=========check_sync_project_errors:#{e}===================")
end
end
def check_new_project(project,sync_params)
@ -159,7 +159,7 @@ class SyncForgeController < ApplicationController
parent_id: project.id
}
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
SyncLog.sync_log("***6. end_to_sync_parises---------------")
end
end
@ -181,7 +181,7 @@ class SyncForgeController < ApplicationController
end
end
pre_project_score.save! if change_num > 0 #如果 project_score有变化则更新
else
else
ProjectScore.create!(project_scores.merge(project_id: project.id))
end
SyncLog.sync_log("***1. end_to_sync_project_score---------------")
@ -217,7 +217,7 @@ class SyncForgeController < ApplicationController
}
end
end
SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present?
SyncLog.sync_log("***2. end_to_syncissues---------------")
rescue Exception => e
@ -238,7 +238,7 @@ class SyncForgeController < ApplicationController
parent_id: project.id
}
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
end
end
SyncLog.sync_log("***5. begin_to_sync_watchers---------------")
@ -258,7 +258,7 @@ class SyncForgeController < ApplicationController
}
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
end
SyncLog.sync_log("***4. end_to_sync_versions---------------")
end
end
@ -277,12 +277,12 @@ class SyncForgeController < ApplicationController
}
SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
end
SyncLog.sync_log("***3. end_to_sync_members---------------")
end
end
# def check_token
# def check_token
# sync_params = params[:sync_params]
# unless sync_params[:token] && sync_params[:token] == get_token
# render json: {message: "token_errors"}
@ -304,4 +304,4 @@ class SyncForgeController < ApplicationController
return gitea_main
end
end
end

6
app/jobs/sync_projects_job.rb
View File

@ -8,7 +8,7 @@ class SyncProjectsJob < ApplicationJob
SyncLog.sync_log("==========begin to sync #{sync_params[:type]} to forge============")
SyncLog.sync_log("==========sync_params:#{sync_params}============")
begin
begin
url = "#{gitea_main}/sync_forges" #trustie上的相关路由
uri = URI.parse(url)
http = Net::HTTP.new(uri.hostname, uri.port)
@ -112,7 +112,7 @@ class SyncProjectsJob < ApplicationJob
rescue => e
SyncLog.sync_log("=========***【#{target_type}】creat_had_erros:#{e}===================")
end
end
def create_journals(target_jsons, target_type,issue_id)
@ -171,4 +171,4 @@ class SyncProjectsJob < ApplicationJob
SyncLog.sync_log("***111222. end_to_create_target---------------")
end
end
end

41
app/libs/dev_ops/drone/api.rb
View File

@ -1,12 +1,12 @@
class DevOps::Drone::API < DevOps::Drone::Request
attr_reader :drone_token, :drone_url, :owner, :repo, :options
attr_reader :drone_token, :endpoint, :owner, :repo, :options
# drone_token:
# owner: repo's owner name or login
# repo: repo's identifier
def initialize(drone_token, drone_url, owner, repo, options={})
def initialize(drone_token, endpoint, owner, repo, options={})
@drone_token = drone_token
@drone_url = drone_url
@endpoint = endpoint
@owner = owner
@repo = repo
@options = options
@ -15,40 +15,59 @@ class DevOps::Drone::API < DevOps::Drone::Request
# Build List
# GET api/repos/{owner}/{name}/builds
# eq:
# DevOps::Drone::API
# DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.drone_url, @repo.user.login, @repo.identifier)
def builds
request(:get, drone_url, "api/repos/#{owner}/#{repo}/builds", drone_token: drone_token)
get(endpoint, "api/repos/#{owner}/#{repo}/builds", drone_token: drone_token)
end
# Build Info
# GET api/repos/{owner}/{name}/builds/{number}
# eq:
# DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.endpoint, project.owner.login, project.identifier, number: number).build
def build
request(:get, "api/repos/#{owner}/#{repo}/builds/#{number}", drone_token: drone_token)
get(endpoint, "api/repos/#{owner}/#{repo}/builds/#{options[:number]}", drone_token: drone_token)
end
# Update .trustie-pipeline.yml file
# PATCH api/repos/{owner}/{name}
# PATCH api/repos/{owner}/{name}\
# eq:
# DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.endpoint, project.owner.login, project.identifier, config_path: config_path).config_yml
def config_yml
request(:patch, "/api/repos/#{owner}/#{repo}", drone_token: drone_token, config_path: config_path)
patch(endpoint, "/api/repos/#{owner}/#{repo}", drone_token: drone_token, config_path: options[:config_path])
end
# Activate user's project with Drone CI
# POST api/repos/{owner}/{name}
# eq:
# DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.endpoint, project.owner.login, project.identifier).avtivate
def activate
request(:post, "/api/repos/#{owner}/#{repo}", drone_token: drone_token)
post(endpoint, "/api/repos/#{owner}/#{repo}", drone_token: drone_token)
end
# Build Restart
# POST api/repos/{owner}/{name}/builds/{number}
# Restart the specified build. Please note this api requires read and write access to the repository and the request parameter {build} is not the build id but the build number.
# eq:
# DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.drone_url, @repo.user.login, @repo.identifier, number: number).restart
def restart
request(:post, "/api/repos/#{owner}/#{repo}/builds/#{number}", drone_token: drone_token)
post(endpoint, "/api/repos/#{owner}/#{repo}/builds/#{options[:number]}", drone_token: drone_token)
end
# Build Stop
# DELETE api/repos/{owner}/{name}/builds/{number}
# Stop the specified build. Please note this api requires administrative privileges and the request parameter {build} is not the build id but the build number.
# eq:
# DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.drone_url, @repo.user.login, @repo.identifier, number: number).stop
def stop
request(:delete, "/api/repos/#{owner}/#{repo}/builds/#{number}", drone_token: drone_token)
delete(endpoint, "/api/repos/#{owner}/#{repo}/builds/#{options[:number]}", drone_token: drone_token)
end
# Build Logs
# GET /api/repos/{owner}/{repo}/builds/{build}/logs/{stage}/{step}
# Please note this api requires read access to the repository.
# eq:
# DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.drone_url, @repo.user.login, @repo.identifier, build: build, stage: stage, step: step).logs
def logs
get(endpoint, "/api/repos/#{owner}/#{repo}/builds/#{options[:build]}/logs/#{options[:stage]}/#{options[:step]}", drone_token: drone_token)
end
end

2
app/libs/dev_ops/drone/ci.rb
View File

@ -5,7 +5,7 @@ class DevOps::Drone::Ci
# username: drone server's account
# password: drone server's password
# eq:
# DevOps::Drone::Ci.new(@cloud_account.drone_ip, @cloud_account.account, @cloud_account.visible_secret).get_token
# DevOps::Drone::Ci.new(@cloud_account.drone_ip, @cloud_account.account, @cloud_account.visible_secret, current_user.login).get_token
def initialize(host, username, password, gitea_username)
@host = host
@username = username

147
app/libs/dev_ops/drone/request.rb
View File

@ -1,10 +1,4 @@
# @private
class DevOps::Drone::Request
# format :json
# headers 'Accept' => 'application/json'
# parser Proc.new { |body, _| parse(body) }
# Converts the response body to an ObjectifiedHash.
def self.parse(body)
body = decode(body)
@ -29,113 +23,70 @@
end
end
def get(path, options={})
set_httparty_config(options)
set_private_token_header(options)
validate self.class.get(path, options)
def get(endpoint, path, options={})
set_request_defaults(endpoint)
request(:get, endpoint, path, options)
end
def post(path, options={})
set_httparty_config(options)
set_private_token_header(options, path)
validate self.class.post(path, options)
def post(endpoint, path, options={})
set_request_defaults(endpoint)
request(:post, endpoint, path, options)
end
def put(path, options={})
set_httparty_config(options)
set_private_token_header(options)
validate self.class.put(path, options)
def put(endpoint, path, options={})
set_request_defaults(endpoint)
request(:put, endpoint, path, options)
end
def delete(path, options={})
set_httparty_config(options)
set_private_token_header(options)
validate self.class.delete(path, options)
end
# Checks the response code for common errors.
# Returns parsed response for successful requests.
def validate(response)
# case response.code
# when 400; raise Error::BadRequest.new error_message(response)
# when 401; raise Error::Unauthorized.new error_message(response)
# when 403; raise Error::Forbidden.new error_message(response)
# when 404; raise Error::NotFound.new error_message(response)
# when 405; raise Error::MethodNotAllowed.new error_message(response)
# when 406; raise Error::DataNotAccepted.new error_message(response)
# when 409; raise Error::Conflict.new error_message(response)
# when 500; raise Error::InternalServerError.new error_message(response)
# when 502; raise Error::BadGateway.new error_message(response)
# when 503; raise Error::ServiceUnavailable.new error_message(response)
# end
response.parsed_response
end
# Sets a base_uri and default_params for requests.
# @raise [Error::MissingCredentials] if endpoint not set.
def set_request_defaults(endpoint, private_token, sudo=nil)
raise Error::MissingCredentials.new("Please set an endpoint to API") unless endpoint
@private_token = private_token
self.class.base_uri endpoint
self.class.default_params :sudo => sudo
self.class.default_params.delete(:sudo) if sudo.nil?
end
def request(method, domain, url, **params)
Rails.logger.info("[drone] request: #{method} #{url} #{params.except(:secret).inspect}")
client = Faraday.new(url: domain)
response = client.public_send(method, url, params)
result = JSON.parse(response.body)
Rails.logger.info("[drone] response:#{response.status} #{result.inspect}")
if response.status != 200
raise DevOps::Drone::Error.parse(result)
end
if result['errcode'].present? && result['errcode'].to_i.nonzero?
raise DevOps::Drone::Error.parse(result)
end
result
def delete(endpoint, path, options={})
set_request_defaults(endpoint)
request(:delete, endpoint, path, options)
end
private
def conn(auth={})
token = auth[:token]
puts "[gitea] token: #{token}"
def request(method, endpoint, path, **params)
Rails.logger.info("[drone] request: #{method} #{path} #{params.except(:secret).inspect}")
@client ||= begin
Faraday.new(url: domain) do |req|
req.request :url_encoded
req.headers['Content-Type'] = 'application/json'
req.response :logger # 显示日志
req.adapter Faraday.default_adapter
req.authorization :Bearer, token
req.headers['Authorization']
end
client = Faraday.new(path: domain)
response = client.public_send(method, path, params)
result = JSON.parse(response.body)
Rails.logger.info("[drone] response:#{response.status} #{result.inspect}")
if response.status != 200
raise DevOps::Drone::Error.parse(result)
end
@client
if result['errcode'].present? && result['errcode'].to_i.nonzero?
raise DevOps::Drone::Error.parse(result)
end
result
end
# Sets a PRIVATE-TOKEN header for requests.
# @raise [Error::MissingCredentials] if private_token not set.
def set_private_token_header(options, path=nil)
unless path == '/session'
raise Error::MissingCredentials.new("Please set a private_token for user") unless @private_token
options[:headers] = {'PRIVATE-TOKEN' => @private_token}
end
# Sets a base_uri and default_params for requests.
# @raise [Error::MissingCredentials] if endpoint not set.
def set_request_defaults(endpoint, private_token, sudo=nil)
raise "Please set an endpoint to API" unless endpoint
end
# Set HTTParty configuration
# @see https://github.com/jnunemaker/httparty
def set_httparty_config(options)
if self.httparty
options.merge!(self.httparty)
end
# Checks the response code for common errors.
# Returns parsed response for successful requests.
def validate(response)
# case response.code
# when 400; raise Error::BadRequest.new error_message(response)
# when 401; raise Error::Unauthorized.new error_message(response)
# when 403; raise Error::Forbidden.new error_message(response)
# when 404; raise Error::NotFound.new error_message(response)
# when 405; raise Error::MethodNotAllowed.new error_message(response)
# when 406; raise Error::DataNotAccepted.new error_message(response)
# when 409; raise Error::Conflict.new error_message(response)
# when 500; raise Error::InternalServerError.new error_message(response)
# when 502; raise Error::BadGateway.new error_message(response)
# when 503; raise Error::ServiceUnavailable.new error_message(response)
# end
response.parsed_response
end
def error_message(response)

1
app/models/dev_ops/cloud_account.rb
View File

@ -1,6 +1,7 @@
class DevOps::CloudAccount < ApplicationRecord
belongs_to :project
belongs_to :user
belongs_to :repository
def drone_host
[drone_ip, ":80"].join

1
app/models/repository.rb
View File

@ -3,6 +3,7 @@ class Repository < ApplicationRecord
belongs_to :project, :touch => true
belongs_to :user
has_one :mirror, foreign_key: :repo_id
has_one :dev_ops_cloud_account, foreign_key: :repo_id
has_many :version_releases, dependent: :destroy
validates :identifier, presence: true

10
config/routes.rb
View File

@ -22,7 +22,15 @@ Rails.application.routes.draw do
get :common
end
end
resources :builds
resources :builds, only: :index do
collection do
get ':number', to: 'builds#detail', as: 'detail'
get ':number/logs/:stage/:step', to: 'builds#detail', as: 'logs'
post ':number', to: 'builds#restart', as: 'restart'
delete ':number', to: 'builds#delete', as: 'delete'
end
end
end
resources :sync_forge, only: [:create] do

7
db/migrate/20200715075831_add_repository_ref_to_dev_ops_cloud_account.rb Normal file
View File

@ -0,0 +1,7 @@
class AddRepositoryRefToDevOpsCloudAccount < ActiveRecord::Migration[5.2]
def change
add_column :dev_ops_cloud_accounts, :repo_id, :integer
add_index :dev_ops_cloud_accounts, :repo_id, name: 'dev_ops_cloud_accounts_repo_id_ix'
end
end