mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	refactor: decouple context from migration structs (#33399)
Use context as much as possible. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		| @@ -62,9 +62,8 @@ func (c *CodeCommitDownloaderFactory) GitServiceType() structs.GitServiceType { | ||||
| 	return structs.CodeCommitService | ||||
| } | ||||
|  | ||||
| func NewCodeCommitDownloader(ctx context.Context, repoName, baseURL, accessKeyID, secretAccessKey, region string) *CodeCommitDownloader { | ||||
| func NewCodeCommitDownloader(_ context.Context, repoName, baseURL, accessKeyID, secretAccessKey, region string) *CodeCommitDownloader { | ||||
| 	downloader := CodeCommitDownloader{ | ||||
| 		ctx:      ctx, | ||||
| 		repoName: repoName, | ||||
| 		baseURL:  baseURL, | ||||
| 		codeCommitClient: codecommit.New(codecommit.Options{ | ||||
| @@ -79,21 +78,15 @@ func NewCodeCommitDownloader(ctx context.Context, repoName, baseURL, accessKeyID | ||||
| // CodeCommitDownloader implements a downloader for AWS CodeCommit | ||||
| type CodeCommitDownloader struct { | ||||
| 	base.NullDownloader | ||||
| 	ctx               context.Context | ||||
| 	codeCommitClient  *codecommit.Client | ||||
| 	repoName          string | ||||
| 	baseURL           string | ||||
| 	allPullRequestIDs []string | ||||
| } | ||||
|  | ||||
| // SetContext set context | ||||
| func (c *CodeCommitDownloader) SetContext(ctx context.Context) { | ||||
| 	c.ctx = ctx | ||||
| } | ||||
|  | ||||
| // GetRepoInfo returns a repository information | ||||
| func (c *CodeCommitDownloader) GetRepoInfo() (*base.Repository, error) { | ||||
| 	output, err := c.codeCommitClient.GetRepository(c.ctx, &codecommit.GetRepositoryInput{ | ||||
| func (c *CodeCommitDownloader) GetRepoInfo(ctx context.Context) (*base.Repository, error) { | ||||
| 	output, err := c.codeCommitClient.GetRepository(ctx, &codecommit.GetRepositoryInput{ | ||||
| 		RepositoryName: util.ToPointer(c.repoName), | ||||
| 	}) | ||||
| 	if err != nil { | ||||
| @@ -117,14 +110,14 @@ func (c *CodeCommitDownloader) GetRepoInfo() (*base.Repository, error) { | ||||
| } | ||||
|  | ||||
| // GetComments returns comments of an issue or PR | ||||
| func (c *CodeCommitDownloader) GetComments(commentable base.Commentable) ([]*base.Comment, bool, error) { | ||||
| func (c *CodeCommitDownloader) GetComments(ctx context.Context, commentable base.Commentable) ([]*base.Comment, bool, error) { | ||||
| 	var ( | ||||
| 		nextToken *string | ||||
| 		comments  []*base.Comment | ||||
| 	) | ||||
|  | ||||
| 	for { | ||||
| 		resp, err := c.codeCommitClient.GetCommentsForPullRequest(c.ctx, &codecommit.GetCommentsForPullRequestInput{ | ||||
| 		resp, err := c.codeCommitClient.GetCommentsForPullRequest(ctx, &codecommit.GetCommentsForPullRequestInput{ | ||||
| 			NextToken:     nextToken, | ||||
| 			PullRequestId: util.ToPointer(strconv.FormatInt(commentable.GetForeignIndex(), 10)), | ||||
| 		}) | ||||
| @@ -155,8 +148,8 @@ func (c *CodeCommitDownloader) GetComments(commentable base.Commentable) ([]*bas | ||||
| } | ||||
|  | ||||
| // GetPullRequests returns pull requests according page and perPage | ||||
| func (c *CodeCommitDownloader) GetPullRequests(page, perPage int) ([]*base.PullRequest, bool, error) { | ||||
| 	allPullRequestIDs, err := c.getAllPullRequestIDs() | ||||
| func (c *CodeCommitDownloader) GetPullRequests(ctx context.Context, page, perPage int) ([]*base.PullRequest, bool, error) { | ||||
| 	allPullRequestIDs, err := c.getAllPullRequestIDs(ctx) | ||||
| 	if err != nil { | ||||
| 		return nil, false, err | ||||
| 	} | ||||
| @@ -170,7 +163,7 @@ func (c *CodeCommitDownloader) GetPullRequests(page, perPage int) ([]*base.PullR | ||||
|  | ||||
| 	prs := make([]*base.PullRequest, 0, len(batch)) | ||||
| 	for _, id := range batch { | ||||
| 		output, err := c.codeCommitClient.GetPullRequest(c.ctx, &codecommit.GetPullRequestInput{ | ||||
| 		output, err := c.codeCommitClient.GetPullRequest(ctx, &codecommit.GetPullRequestInput{ | ||||
| 			PullRequestId: util.ToPointer(id), | ||||
| 		}) | ||||
| 		if err != nil { | ||||
| @@ -231,7 +224,7 @@ func (c *CodeCommitDownloader) FormatCloneURL(opts MigrateOptions, remoteAddr st | ||||
| 	return u.String(), nil | ||||
| } | ||||
|  | ||||
| func (c *CodeCommitDownloader) getAllPullRequestIDs() ([]string, error) { | ||||
| func (c *CodeCommitDownloader) getAllPullRequestIDs(ctx context.Context) ([]string, error) { | ||||
| 	if len(c.allPullRequestIDs) > 0 { | ||||
| 		return c.allPullRequestIDs, nil | ||||
| 	} | ||||
| @@ -242,7 +235,7 @@ func (c *CodeCommitDownloader) getAllPullRequestIDs() ([]string, error) { | ||||
| 	) | ||||
|  | ||||
| 	for { | ||||
| 		output, err := c.codeCommitClient.ListPullRequests(c.ctx, &codecommit.ListPullRequestsInput{ | ||||
| 		output, err := c.codeCommitClient.ListPullRequests(ctx, &codecommit.ListPullRequestsInput{ | ||||
| 			RepositoryName: util.ToPointer(c.repoName), | ||||
| 			NextToken:      nextToken, | ||||
| 		}) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user