Skip to content

Commit f40a2e9

Browse files
ssulei7ssulei7
authored
Merge pull request #3 from mona-actions/ssulei7/initial-project-refactor
Cleanup - Initial Project Refactor
2 parents d260e69 + 5c38b06 commit f40a2e9

File tree

6 files changed

+234
-157
lines changed

6 files changed

+234
-157
lines changed

‎.github/workflows/build.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ jobs:
2525
with:
2626
go-version: 1.21
2727
- run: go get -v -t -d ./...
28-
- run: go build -v .
28+
- run: go build -v .
29+
- run: go test ./... --coverprofile=cover.out

‎cmd/root.go

+21-153
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,19 @@ Copyright © 2024 NAME HERE <EMAIL ADDRESS>
44
package cmd
55

66
import (
7-
"encoding/json"
8-
"fmt"
97
"log"
108
"os"
11-
"path/filepath"
12-
"strings"
139

10+
"github.com/mona-actions/gh-commit-remap/internal/commitremap"
1411
"github.com/spf13/cobra"
1512
)
1613

17-
// Struct to represent a single entry in the commit map
18-
type CommitMapEntry struct {
19-
Old string
20-
New string
14+
func init() {
15+
rootCmd.Flags().StringP("mapping-file", "c", "", "Path to the commit map file Example: /path/to/commit-map")
16+
rootCmd.MarkFlagRequired("mapping-file")
17+
18+
rootCmd.Flags().StringP("migration-archive", "m", "", "Path to the migration archive Example: /path/to/migration-archive.tar.gz")
19+
rootCmd.MarkFlagRequired("migration-archive")
2120
}
2221

2322
// rootCmd represents the base command when called without any subcommands
@@ -26,9 +25,20 @@ var rootCmd = &cobra.Command{
2625
Short: "remaps commit hashes in a GitHub archive",
2726
Long: `Is a CLI tool that can remap commits hashed
2827
after performing a history re-write when performing a migration For exam`,
29-
// Uncomment the following line if your bare application
30-
// has an action associated with it:
31-
Run: main,
28+
Run: func(cmd *cobra.Command, args []string) {
29+
mapPath, _ := cmd.Flags().GetString("mapping-file")
30+
commitMap, err := commitremap.ParseCommitMap(mapPath)
31+
if err != nil {
32+
log.Fatalf("Error parsing commit map: %v", err)
33+
}
34+
35+
// config to define the types of files to process
36+
types := []string{"pull_requests", "issues", "issue_events"}
37+
38+
archivePath, _ := cmd.Flags().GetString("migration-archive")
39+
40+
commitremap.ProcessFiles(archivePath, types, commitMap)
41+
},
3242
}
3343

3444
// Execute adds all child commands to the root command and sets flags appropriately.
@@ -39,145 +49,3 @@ func Execute() {
3949
os.Exit(1)
4050
}
4151
}
42-
43-
func init() {
44-
// Here you will define your flags and configuration settings.
45-
// Cobra supports persistent flags, which, if defined here,
46-
// will be global for your application.
47-
48-
// rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.gh-commit-remap.yaml)")
49-
50-
// Cobra also supports local flags, which will only run
51-
// when this action is called directly.
52-
rootCmd.Flags().StringP("mapping-file", "c", "", "Path to the commit map file Example: /path/to/commit-map")
53-
rootCmd.MarkFlagRequired("mapping-file")
54-
55-
rootCmd.Flags().StringP("migration-archive", "m", "", "Path to the migration archive Example: /path/to/migration-archive.tar.gz")
56-
rootCmd.MarkFlagRequired("migration-archive")
57-
}
58-
59-
func main(cmd *cobra.Command, args []string) {
60-
// leaving this for now to quickly test the code
61-
//mapPath := "test/TestRepo.git/filter-repo/commit-map"
62-
mapPath, _ := cmd.Flags().GetString("mapping-file")
63-
commitMap, err := parseCommitMap(mapPath)
64-
if err != nil {
65-
log.Fatalf("Error parsing commit map: %v", err)
66-
}
67-
68-
// config to define the types of files to process
69-
types := []string{"pull_requests", "issues"}
70-
71-
// leaving this for now to quickly test the code
72-
//archivePath := "test/3723ff5e-4b7e-11ef-9bf5-2aca377420b3"
73-
archivePath, _ := cmd.Flags().GetString("migration-archive")
74-
75-
processFiles(archivePath, types, commitMap)
76-
}
77-
78-
// Parses the file and returns a map of old commit hashes to new commit hashes
79-
func parseCommitMap(filePath string) (*[]CommitMapEntry, error) {
80-
commitMap := []CommitMapEntry{}
81-
82-
// Read the commit-map file
83-
content, err := os.ReadFile(filePath)
84-
if err != nil {
85-
return nil, err
86-
}
87-
// Split the file content into lines
88-
lines := strings.Split(string(content), "\n")
89-
90-
// Iterate over the lines and parse the old and new commit hashes
91-
for _, line := range lines {
92-
if strings.TrimSpace(line) == "" {
93-
continue
94-
}
95-
96-
fields := strings.Fields(line)
97-
if len(fields) != 2 {
98-
return nil, fmt.Errorf("invalid line: %s", line)
99-
}
100-
101-
commitMap = append(commitMap, CommitMapEntry{
102-
Old: fields[0],
103-
New: fields[1],
104-
})
105-
}
106-
return &commitMap, nil
107-
}
108-
109-
func replaceSHA(data interface{}, oldSHA string, newSHA string) {
110-
if data == nil {
111-
return
112-
}
113-
114-
switch v := data.(type) {
115-
case map[string]interface{}:
116-
for key, value := range v {
117-
if str, ok := value.(string); ok && str == oldSHA {
118-
v[key] = newSHA
119-
} else {
120-
replaceSHA(value, oldSHA, newSHA)
121-
}
122-
}
123-
case []interface{}:
124-
for i, value := range v {
125-
if str, ok := value.(string); ok && str == oldSHA {
126-
v[i] = newSHA
127-
} else {
128-
replaceSHA(value, oldSHA, newSHA)
129-
}
130-
}
131-
default:
132-
// Unsupported type, do nothing
133-
}
134-
}
135-
136-
func updateMetadataFile(filePath string, commitMap *[]CommitMapEntry) {
137-
// Read the JSON file
138-
data, err := os.ReadFile(filePath)
139-
if err != nil {
140-
log.Fatalf("Error reading data: %v", err)
141-
}
142-
143-
var dataMap interface{}
144-
err = json.Unmarshal(data, &dataMap)
145-
if err != nil {
146-
log.Fatalf("Error unmarshaling data: %v", err)
147-
}
148-
149-
// Iterate over the commit map and replace the old commit hashes with the new ones
150-
for _, commit := range *commitMap {
151-
replaceSHA(dataMap, commit.Old, commit.New)
152-
}
153-
154-
// Marshal the updated data to JSON and pretty print it
155-
updatedData, err := json.MarshalIndent(dataMap, "", " ")
156-
if err != nil {
157-
log.Fatalf("Error marshaling updated data: %v", err)
158-
}
159-
160-
// Overwrite the original file with the updated data
161-
err = os.WriteFile(filePath, updatedData, 0644)
162-
if err != nil {
163-
log.Fatalf("Error writing updated data: %v", err)
164-
}
165-
}
166-
167-
func processFiles(archiveLocation string, prefixes []string, commitMap *[]CommitMapEntry) {
168-
169-
for _, prefix := range prefixes {
170-
// Get a list of all files that match the pattern
171-
files, err := filepath.Glob(filepath.Join(archiveLocation, prefix+"_*.json"))
172-
if err != nil {
173-
log.Fatalf("Error getting files: %v", err)
174-
}
175-
176-
// Process each file
177-
for _, file := range files {
178-
log.Println("Processing file:", file)
179-
180-
updateMetadataFile(file, commitMap)
181-
}
182-
}
183-
}

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/kuhlman-labs/gh-commit-remap
1+
module github.com/mona-actions/gh-commit-remap
22

33
go 1.22.5
44

‎internal/commitremap/commitremap.go

+123
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
package commitremap
2+
3+
import (
4+
"encoding/json"
5+
"fmt"
6+
"log"
7+
"os"
8+
"path/filepath"
9+
"strings"
10+
)
11+
12+
// Struct to represent a single entry in the commit map
13+
type CommitMapEntry struct {
14+
Old string
15+
New string
16+
}
17+
18+
// Parses the file and returns a map of old commit hashes to new commit hashes
19+
func ParseCommitMap(filePath string) (*[]CommitMapEntry, error) {
20+
commitMap := []CommitMapEntry{}
21+
22+
// Read the commit-map file
23+
content, err := os.ReadFile(filePath)
24+
if err != nil {
25+
return nil, err
26+
}
27+
// Split the file content into lines
28+
lines := strings.Split(string(content), "\n")
29+
30+
// Iterate over the lines and parse the old and new commit hashes
31+
for _, line := range lines {
32+
if strings.TrimSpace(line) == "" {
33+
continue
34+
}
35+
36+
fields := strings.Fields(line)
37+
if len(fields) != 2 {
38+
return nil, fmt.Errorf("invalid line: %s", line)
39+
}
40+
41+
commitMap = append(commitMap, CommitMapEntry{
42+
Old: fields[0],
43+
New: fields[1],
44+
})
45+
}
46+
return &commitMap, nil
47+
}
48+
49+
func ProcessFiles(archiveLocation string, prefixes []string, commitMap *[]CommitMapEntry) {
50+
51+
for _, prefix := range prefixes {
52+
// Get a list of all files that match the pattern
53+
files, err := filepath.Glob(filepath.Join(archiveLocation, prefix+"_*.json"))
54+
if err != nil {
55+
log.Fatalf("Error getting files: %v", err)
56+
}
57+
58+
// Process each file
59+
for _, file := range files {
60+
log.Println("Processing file:", file)
61+
62+
updateMetadataFile(file, commitMap)
63+
}
64+
}
65+
}
66+
67+
func updateMetadataFile(filePath string, commitMap *[]CommitMapEntry) {
68+
// Read the JSON file
69+
data, err := os.ReadFile(filePath)
70+
if err != nil {
71+
log.Fatalf("Error reading data: %v", err)
72+
}
73+
74+
var dataMap interface{}
75+
err = json.Unmarshal(data, &dataMap)
76+
if err != nil {
77+
log.Fatalf("Error unmarshaling data: %v", err)
78+
}
79+
80+
// Iterate over the commit map and replace the old commit hashes with the new ones
81+
for _, commit := range *commitMap {
82+
replaceSHA(dataMap, commit.Old, commit.New)
83+
}
84+
85+
// Marshal the updated data to JSON and pretty print it
86+
updatedData, err := json.MarshalIndent(dataMap, "", " ")
87+
if err != nil {
88+
log.Fatalf("Error marshaling updated data: %v", err)
89+
}
90+
91+
// Overwrite the original file with the updated data
92+
err = os.WriteFile(filePath, updatedData, 0644)
93+
if err != nil {
94+
log.Fatalf("Error writing updated data: %v", err)
95+
}
96+
}
97+
98+
func replaceSHA(data interface{}, oldSHA string, newSHA string) {
99+
if data == nil {
100+
return
101+
}
102+
103+
switch v := data.(type) {
104+
case map[string]interface{}:
105+
for key, value := range v {
106+
if str, ok := value.(string); ok && str == oldSHA {
107+
v[key] = newSHA
108+
} else {
109+
replaceSHA(value, oldSHA, newSHA)
110+
}
111+
}
112+
case []interface{}:
113+
for i, value := range v {
114+
if str, ok := value.(string); ok && str == oldSHA {
115+
v[i] = newSHA
116+
} else {
117+
replaceSHA(value, oldSHA, newSHA)
118+
}
119+
}
120+
default:
121+
// Unsupported type, do nothing
122+
}
123+
}

0 commit comments

Comments
 (0)