Skip to content

Commit 9cd6e8a

Browse files
authored
feat: more verbose errors (#36)
* feat: more verbose errors * feat: more verbose errors * feat: more verbose errors * feat: more verbose errors * feat: more verbose errors * feat: more verbose errors
1 parent ec9a5b8 commit 9cd6e8a

File tree

3 files changed

+28
-6
lines changed

3 files changed

+28
-6
lines changed

.github/workflows/pull_request_docker.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: Validate dockerfile
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111

1212
- uses: dorny/paths-filter@v2
1313
id: filter
@@ -24,7 +24,7 @@ jobs:
2424
name: Validate build-tools
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828

2929
- uses: dorny/paths-filter@v2
3030
id: filter
@@ -41,7 +41,7 @@ jobs:
4141
name: Validate test-server
4242
runs-on: ubuntu-latest
4343
steps:
44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4545

4646
- uses: dorny/paths-filter@v2
4747
id: filter
@@ -58,7 +58,7 @@ jobs:
5858
name: Validate dev-container
5959
runs-on: ubuntu-latest
6060
steps:
61-
- uses: actions/checkout@v3
61+
- uses: actions/checkout@v4
6262

6363
- uses: dorny/paths-filter@v2
6464
id: filter

.github/workflows/pull_request_tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Static Checks
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616
- name: Configure python
1717
uses: actions/[email protected]
1818
with:
@@ -37,7 +37,7 @@ jobs:
3737
git-server:
3838
image: ghcr.io/docplanner/helm-repo-updater/git-repo-server:develop
3939
steps:
40-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v3
4141

4242
- name: Build app
4343
run: make build

internal/app/updater/commit.go

+22
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ func commitGitChanges(appName string, gitW git.Worktree, commitMessage string, g
7878
},
7979
})
8080
if err != nil {
81+
logCtx.Errorf(err.Error())
82+
8183
return nil, err
8284
}
8385
return &commit, nil
@@ -93,6 +95,8 @@ func pushGitChanges(appName string, objC object.Commit, gitR *git.Repository, gi
9395
Auth: gitAuth,
9496
})
9597
if err != nil {
98+
logCtx.Errorf(err.Error())
99+
96100
return err
97101
}
98102

@@ -110,6 +114,8 @@ func commitAndPushGitChanges(cfg HelmUpdaterConfig, commitMessage string, gitW g
110114
logCtx.Infof("Adding file %s to git for commit changes", targetFile)
111115
_, err := gitW.Add(targetFile)
112116
if err != nil {
117+
logCtx.Errorf(err.Error())
118+
113119
return err
114120
}
115121

@@ -120,12 +126,16 @@ func commitAndPushGitChanges(cfg HelmUpdaterConfig, commitMessage string, gitW g
120126

121127
gitR, err := git.PlainOpen(tempRoot)
122128
if err != nil {
129+
logCtx.Errorf(err.Error())
130+
123131
return err
124132
}
125133

126134
logCtx.Debugf("Obtaining current HEAD to verify added changes")
127135
obj, err := gitR.CommitObject(*commit)
128136
if err != nil {
137+
logCtx.Errorf(err.Error())
138+
129139
return err
130140
}
131141
err = pushGitChanges(cfg.AppName, *obj, gitR, gitAuth)
@@ -288,26 +298,36 @@ func commitChangesGit(cfg HelmUpdaterConfig, write changeWriter) (*[]ChangeEntry
288298
logCtx := log.WithContext().AddField("application", cfg.AppName)
289299
creds, err := cfg.GitCredentials.NewGitCreds(cfg.GitConf.RepoURL, cfg.GitCredentials.Password)
290300
if err != nil {
301+
logCtx.Errorf(err.Error())
302+
291303
return nil, fmt.Errorf("could not get creds for repo '%s': %v", cfg.AppName, err)
292304
}
293305

294306
tempRoot, err := createTempFileInDirectory(fmt.Sprintf("git-%s", cfg.AppName), cfg.AppName, cfg.GitConf.RepoURL)
295307
if err != nil {
308+
logCtx.Errorf(err.Error())
309+
296310
return nil, err
297311
}
298312

299313
gitW, err := cloneGitRepositoryInBranch(cfg.AppName, cfg.GitConf.RepoURL, creds, *tempRoot, cfg.GitConf.Branch)
300314
if err != nil {
315+
logCtx.Errorf(err.Error())
316+
301317
return nil, err
302318
}
303319

304320
// write changes to files
305321
if apps, err = write(cfg, *tempRoot, *gitW); err != nil {
322+
logCtx.Errorf(err.Error())
323+
306324
return nil, err
307325
}
308326

309327
commitMessage, err := configureCommitMessage(cfg.AppName, apps, cfg.GitConf.Message)
310328
if err != nil {
329+
logCtx.Errorf(err.Error())
330+
311331
return nil, err
312332
}
313333

@@ -318,6 +338,8 @@ func commitChangesGit(cfg HelmUpdaterConfig, write changeWriter) (*[]ChangeEntry
318338

319339
err = commitAndPushGitChanges(cfg, *commitMessage, *gitW, *tempRoot, creds)
320340
if err != nil {
341+
logCtx.Errorf(err.Error())
342+
321343
return nil, err
322344
}
323345

0 commit comments

Comments
 (0)