alex/LocalAGI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(github*): pass by correctly owner and repository

Browse Source 
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
This commit is contained in:
Ettore Di Giacinto
2025-04-17 22:56:51 +02:00
parent 784a4c7969
commit a33425c707
2 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
services/actions/githubprcreator.go
View File

@@ -18,38 +18,49 @@ type GithubPRCreator struct {
func NewGithubPRCreator(config map[string]string) *GithubPRCreator { func NewGithubPRCreator(config map[string]string) *GithubPRCreator {
client := github.NewClient(nil).WithAuthToken(config["token"]) client := github.NewClient(nil).WithAuthToken(config["token"])
defaultBranch := config["defaultBranch"]
if defaultBranch == "" {
defaultBranch = "main" // Default to "main" if not specified
}
return &GithubPRCreator{ return &GithubPRCreator{
client: client, client: client,
token: config["token"], token: config["token"],
repository: config["repository"], repository: config["repository"],
owner: config["owner"], owner: config["owner"],
customActionName: config["customActionName"], customActionName: config["customActionName"],
defaultBranch: config["defaultBranch"], defaultBranch: defaultBranch,
} }
} }
func (g *GithubPRCreator) createOrUpdateBranch(ctx context.Context, branchName string) error { func (g *GithubPRCreator) createOrUpdateBranch(ctx context.Context, branchName string, owner string, repository string) error {
// Get the latest commit SHA from the default branch // Get the latest commit SHA from the default branch
ref, _, err := g.client.Git.GetRef(ctx, g.owner, g.repository, "refs/heads/"+g.defaultBranch) ref, _, err := g.client.Git.GetRef(ctx, owner, repository, "refs/heads/"+g.defaultBranch)
if err != nil { if err != nil {
return fmt.Errorf("failed to get reference: %w", err) return fmt.Errorf("failed to get reference for default branch %s: %w", g.defaultBranch, err)
} }
// Try to get the branch if it exists // Try to get the branch if it exists
_, resp, err := g.client.Git.GetRef(ctx, g.owner, g.repository, "refs/heads/"+branchName) _, resp, err := g.client.Git.GetRef(ctx, owner, repository, "refs/heads/"+branchName)
if err != nil { if err != nil {
// If branch doesn't exist, create it if resp == nil {
if resp != nil && resp.StatusCode == 404 { return fmt.Errorf("failed to check branch existence: %w", err)
}
// If branch doesn't exist (404), create it
if resp.StatusCode == 404 {
newRef := &github.Reference{ newRef := &github.Reference{
Ref: github.String("refs/heads/" + branchName), Ref: github.String("refs/heads/" + branchName),
Object: &github.GitObject{SHA: ref.Object.SHA}, Object: &github.GitObject{SHA: ref.Object.SHA},
} }
_, _, err = g.client.Git.CreateRef(ctx, g.owner, g.repository, newRef) _, _, err = g.client.Git.CreateRef(ctx, owner, repository, newRef)
if err != nil { if err != nil {
return fmt.Errorf("failed to create branch: %w", err) return fmt.Errorf("failed to create branch: %w", err)
} }
return nil return nil
} }
// For other errors, return the error
return fmt.Errorf("failed to check branch existence: %w", err) return fmt.Errorf("failed to check branch existence: %w", err)
} }
@@ -58,7 +69,7 @@ func (g *GithubPRCreator) createOrUpdateBranch(ctx context.Context, branchName s
Ref: github.String("refs/heads/" + branchName), Ref: github.String("refs/heads/" + branchName),
Object: &github.GitObject{SHA: ref.Object.SHA}, Object: &github.GitObject{SHA: ref.Object.SHA},
} }
_, _, err = g.client.Git.UpdateRef(ctx, g.owner, g.repository, updateRef, true) _, _, err = g.client.Git.UpdateRef(ctx, owner, repository, updateRef, true)
if err != nil { if err != nil {
return fmt.Errorf("failed to update branch: %w", err) return fmt.Errorf("failed to update branch: %w", err)
} }
@@ -66,10 +77,10 @@ func (g *GithubPRCreator) createOrUpdateBranch(ctx context.Context, branchName s
return nil return nil
} }
func (g *GithubPRCreator) createOrUpdateFile(ctx context.Context, branch string, filePath string, content string, message string) error { func (g *GithubPRCreator) createOrUpdateFile(ctx context.Context, branch string, filePath string, content string, message string, owner string, repository string) error {
// Get the current file content if it exists // Get the current file content if it exists
var sha *string var sha *string
fileContent, _, _, err := g.client.Repositories.GetContents(ctx, g.owner, g.repository, filePath, &github.RepositoryContentGetOptions{ fileContent, _, _, err := g.client.Repositories.GetContents(ctx, owner, repository, filePath, &github.RepositoryContentGetOptions{
Ref: branch, Ref: branch,
}) })
if err == nil && fileContent != nil { if err == nil && fileContent != nil {
@@ -77,7 +88,7 @@ func (g *GithubPRCreator) createOrUpdateFile(ctx context.Context, branch string,
} }
// Create or update the file // Create or update the file
_, _, err = g.client.Repositories.CreateFile(ctx, g.owner, g.repository, filePath, &github.RepositoryContentFileOptions{ _, _, err = g.client.Repositories.CreateFile(ctx, owner, repository, filePath, &github.RepositoryContentFileOptions{
Message: &message, Message: &message,
Content: []byte(content), Content: []byte(content),
Branch: &branch, Branch: &branch,
@@ -118,14 +129,14 @@ func (g *GithubPRCreator) Run(ctx context.Context, params types.ActionParams) (t
} }
// Create or update branch // Create or update branch
err = g.createOrUpdateBranch(ctx, result.Branch) err = g.createOrUpdateBranch(ctx, result.Branch, result.Owner, result.Repository)
if err != nil { if err != nil {
return types.ActionResult{}, fmt.Errorf("failed to create/update branch: %w", err) return types.ActionResult{}, fmt.Errorf("failed to create/update branch: %w", err)
} }
// Create or update files // Create or update files
for _, file := range result.Files { for _, file := range result.Files {
err = g.createOrUpdateFile(ctx, result.Branch, file.Path, file.Content, fmt.Sprintf("Update %s", file.Path)) err = g.createOrUpdateFile(ctx, result.Branch, file.Path, file.Content, fmt.Sprintf("Update %s", file.Path), result.Owner, result.Repository)
if err != nil { if err != nil {
return types.ActionResult{}, fmt.Errorf("failed to update file %s: %w", file.Path, err) return types.ActionResult{}, fmt.Errorf("failed to update file %s: %w", file.Path, err)
} }

10
services/actions/githubrepositorygetallcontent.go
View File

@@ -28,11 +28,11 @@ func NewGithubRepositoryGetAllContent(config map[string]string) *GithubRepositor
} }
} }
func (g *GithubRepositoryGetAllContent) getContentRecursively(ctx context.Context, path string) (string, error) { func (g *GithubRepositoryGetAllContent) getContentRecursively(ctx context.Context, path string, owner string, repository string) (string, error) {
var result strings.Builder var result strings.Builder
// Get content at the current path // Get content at the current path
_, directoryContent, _, err := g.client.Repositories.GetContents(ctx, g.owner, g.repository, path, nil) _, directoryContent, _, err := g.client.Repositories.GetContents(ctx, owner, repository, path, nil)
if err != nil { if err != nil {
return "", fmt.Errorf("error getting content at path %s: %w", path, err) return "", fmt.Errorf("error getting content at path %s: %w", path, err)
} }
@@ -41,14 +41,14 @@ func (g *GithubRepositoryGetAllContent) getContentRecursively(ctx context.Contex
for _, item := range directoryContent { for _, item := range directoryContent {
if item.GetType() == "dir" { if item.GetType() == "dir" {
// Recursively get content for subdirectories // Recursively get content for subdirectories
subContent, err := g.getContentRecursively(ctx, item.GetPath()) subContent, err := g.getContentRecursively(ctx, item.GetPath(), owner, repository)
if err != nil { if err != nil {
return "", err return "", err
} }
result.WriteString(subContent) result.WriteString(subContent)
} else if item.GetType() == "file" { } else if item.GetType() == "file" {
// Get file content // Get file content
fileContent, _, _, err := g.client.Repositories.GetContents(ctx, g.owner, g.repository, item.GetPath(), nil) fileContent, _, _, err := g.client.Repositories.GetContents(ctx, owner, repository, item.GetPath(), nil)
if err != nil { if err != nil {
return "", fmt.Errorf("error getting file content for %s: %w", item.GetPath(), err) return "", fmt.Errorf("error getting file content for %s: %w", item.GetPath(), err)
} }
@@ -89,7 +89,7 @@ func (g *GithubRepositoryGetAllContent) Run(ctx context.Context, params types.Ac
result.Path = "." result.Path = "."
} }
content, err := g.getContentRecursively(ctx, result.Path) content, err := g.getContentRecursively(ctx, result.Path, result.Owner, result.Repository)
if err != nil { if err != nil {
return types.ActionResult{}, err return types.ActionResult{}, err
} }