Skip to content

Commit 58faeb3

Browse files
hysyeahhysyeah
authored
fix: add some log (#56)
1 parent bab41a3 commit 58faeb3

File tree

15 files changed

+149
-56
lines changed

15 files changed

+149
-56
lines changed

‎pkg/api/server/handlers_api.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ func (h *handlers) bindContainer(ctx *fiber.Ctx) error {
233233
}
234234

235235
if err == nil {
236+
klog.Errorf("devcontainer %s already exists", devContainer.Name)
236237
return ctx.JSON(fiber.Map{
237238
"code": http.StatusBadRequest,
238239
"message": fmt.Sprintf("devcontainer %s already exists", devContainer.Name),
@@ -442,6 +443,7 @@ func (h *handlers) listAppContainersInChart(ctx *fiber.Ctx) error {
442443

443444
manifest, err := helm.DryRun(ctx.Context(), h.kubeConfig, testNamespace, appName, getAppPath(username, app), values)
444445
if err != nil {
446+
klog.Errorf("failed to dry run %v", err)
445447
return ctx.JSON(fiber.Map{
446448
"code": http.StatusBadRequest,
447449
"message": fmt.Sprintf("Dry run failed: %v", err),
@@ -450,6 +452,7 @@ func (h *handlers) listAppContainersInChart(ctx *fiber.Ctx) error {
450452

451453
resources, err := helm.DecodeManifest(manifest)
452454
if err != nil {
455+
klog.Errorf("failed to decode manifest %v", err)
453456
return ctx.JSON(fiber.Map{
454457
"code": http.StatusBadRequest,
455458
"message": fmt.Sprintf("Decode manifest failed: %v", err),
@@ -768,6 +771,7 @@ func (h *handlers) updateDevContainer(ctx *fiber.Ctx) error {
768771
app := make(map[string]string)
769772
err := ctx.BodyParser(&app)
770773
if err != nil {
774+
klog.Errorf("failed to parse body %v", err)
771775
return ctx.JSON(fiber.Map{
772776
"code": http.StatusBadRequest,
773777
"message": fmt.Sprintf("Parse body failed: %v", err),
@@ -784,6 +788,7 @@ func (h *handlers) updateDevContainer(ctx *fiber.Ctx) error {
784788

785789
err = h.db.DB.Model(&model.DevContainers{}).Where("name = ?", name).Update("name", newName).Error
786790
if err != nil {
791+
klog.Errorf("failed to update dev container name=%s, err=%v", name, err)
787792
return ctx.JSON(fiber.Map{
788793
"code": http.StatusBadRequest,
789794
"message": fmt.Sprintf("Update dev conainter failed: %v", err),
@@ -873,16 +878,19 @@ func GetAppContainersInChart(owner, app string) ([]*helm.ContainerInfo, error) {
873878
values["domain"] = entries
874879
kubeConfig, err := ctrl.GetConfig()
875880
if err != nil {
881+
klog.Errorf("failed to get kube config %v", err)
876882
return nil, err
877883
}
878884

879885
manifest, err := helm.DryRun(context.TODO(), kubeConfig, testNamespace, appName, getAppPath(owner, app), values)
880886
if err != nil {
887+
klog.Errorf("failed to parse manifest %v", err)
881888
return nil, err
882889
}
883890

884891
resources, err := helm.DecodeManifest(manifest)
885892
if err != nil {
893+
klog.Errorf("failed to decode manifest %v", err)
886894
return nil, err
887895
}
888896
op := db.NewDbOperator()

‎pkg/api/server/handlers_cmd.go‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ func (h *handlers) installDevApp(ctx *fiber.Ctx) error {
238238

239239
token := ctx.Locals("auth_token").(string)
240240

241-
242241
name, ok := app["name"]
243242
if !ok {
244243
klog.Error("app name is empty, ", app)
@@ -257,6 +256,7 @@ func (h *handlers) installDevApp(ctx *fiber.Ctx) error {
257256
}()
258257
err = UpdateDevAppState(username, name, deploying)
259258
if err != nil {
259+
klog.Errorf("failed to update dev app state name=%s,err=%v", name, err)
260260
return ctx.JSON(fiber.Map{
261261
"code": http.StatusBadRequest,
262262
"message": fmt.Sprintf("update app state err %v", err),
@@ -269,7 +269,7 @@ func (h *handlers) installDevApp(ctx *fiber.Ctx) error {
269269

270270
err = command.Lint().WithDir(BaseDir).Run(context.TODO(), username, name)
271271
if err != nil {
272-
272+
klog.Errorf("failed to lint app=%s, err=%v", name, err)
273273
return ctx.JSON(fiber.Map{
274274
"code": http.StatusBadRequest,
275275
"message": err.Error(),
@@ -299,6 +299,7 @@ func (h *handlers) installDevApp(ctx *fiber.Ctx) error {
299299
klog.Info("preinstall, create a labeled namespace for webhook")
300300
_, err = container.CreateOrUpdateDevNamespace(ctx.Context(), h.kubeConfig, username, devName)
301301
if err != nil {
302+
klog.Errorf("failed to check namespace %v", err)
302303
return ctx.JSON(fiber.Map{
303304
"code": http.StatusBadRequest,
304305
"message": fmt.Sprintf("Check namespace failed: %v", err),
@@ -329,6 +330,7 @@ func (h *handlers) installDevApp(ctx *fiber.Ctx) error {
329330

330331
err = UpdateDevAppState(username, name, deployed)
331332
if err != nil {
333+
klog.Errorf("failed to update app=%s state to deployed %v", name, err)
332334
return ctx.JSON(fiber.Map{
333335
"code": http.StatusBadRequest,
334336
"message": fmt.Sprintf("update app state to deployed err %v", err),
@@ -354,6 +356,7 @@ func (h *handlers) downloadDevAppChart(ctx *fiber.Ctx) error {
354356

355357
buf, err := command.PackageChart().WithDir(BaseDir).Run(app)
356358
if err != nil {
359+
klog.Errorf("failed to package app=%s chart %v", app, err)
357360
return ctx.JSON(fiber.Map{
358361
"code": http.StatusBadRequest,
359362
"message": fmt.Sprintf("Package chart Failed: %v", err),
@@ -515,6 +518,7 @@ func (h *handlers) deleteDevApp(ctx *fiber.Ctx) error {
515518

516519
err = command.DeleteChart().WithDir(BaseDir).Run(name)
517520
if err != nil {
521+
klog.Errorf("failed to delete chart %s, err=%v", name, err)
518522
return ctx.JSON(fiber.Map{
519523
"code": http.StatusBadRequest,
520524
"message": fmt.Sprintf("Delete Chart Failed: %v", err),
@@ -610,6 +614,7 @@ func (h *handlers) lintDevAppChart(ctx *fiber.Ctx) error {
610614

611615
err := command.Lint().WithDir(BaseDir).Run(ctx.Context(), username, app)
612616
if err != nil {
617+
klog.Errorf("failed to lint app %s, err=%v", app, err)
613618
return ctx.JSON(fiber.Map{
614619
"code": http.StatusBadRequest,
615620
"message": fmt.Sprintf("Lint Failed: %v", err),
@@ -643,6 +648,7 @@ func (h *handlers) uninstall(ctx *fiber.Ctx) error {
643648
devName := name + "-dev"
644649
res, err := uninstall(devName, token)
645650
if err != nil {
651+
klog.Errorf("failed to uninstall %s, err=%v", devName, err)
646652
return ctx.JSON(fiber.Map{
647653
"code": http.StatusBadRequest,
648654
"message": fmt.Sprintf("Uninstall Failed: %v", err),
@@ -684,6 +690,7 @@ func (h *handlers) createAppByArchive(ctx *fiber.Ctx) error {
684690
uniqueId := strings.ReplaceAll(uuid.NewString(), "-", "")
685691
err = UnArchive(filepath.Join("/tmp", file.Filename), filepath.Join("/tmp", uniqueId))
686692
if err != nil {
693+
klog.Errorf("failed to unarchive file %s, err=%v", filepath.Join("/tmp", file.Filename), err)
687694
return ctx.JSON(fiber.Map{
688695
"code": http.StatusBadRequest,
689696
"message": fmt.Sprintf("UnArchive failed: %v", err),
@@ -692,6 +699,7 @@ func (h *handlers) createAppByArchive(ctx *fiber.Ctx) error {
692699

693700
cfg, err := readCfgFromFile(username, filepath.Join("/tmp", uniqueId))
694701
if err != nil {
702+
klog.Errorf("failed to read cfg from file %v", err)
695703
return ctx.JSON(fiber.Map{
696704
"code": http.StatusBadRequest,
697705
"message": fmt.Sprintf("Read cfg frome file failed: %v", err),
@@ -706,6 +714,7 @@ func (h *handlers) createAppByArchive(ctx *fiber.Ctx) error {
706714

707715
err = command.Lint().WithDir(filepath.Dir(chartDir)).Run(context.TODO(), username, filepath.Base(chartDir))
708716
if err != nil {
717+
klog.Errorf("lint failed %v", err)
709718
return ctx.JSON(fiber.Map{
710719
"code": http.StatusBadRequest,
711720
"message": fmt.Sprintf("Lint failed: %v", err),
@@ -753,6 +762,7 @@ func (h *handlers) createAppByArchive(ctx *fiber.Ctx) error {
753762
}
754763
appID, err = InsertDevApp(&appData)
755764
if err != nil {
765+
klog.Errorf("failed to insert app %s,err=%v", cfg.Metadata.Name, err)
756766
return ctx.JSON(fiber.Map{
757767
"code": http.StatusBadRequest,
758768
"message": fmt.Sprintf("Insert app failed: %v", err),
@@ -767,6 +777,7 @@ func (h *handlers) createAppByArchive(ctx *fiber.Ctx) error {
767777
if err != nil {
768778
klog.Error(e)
769779
}
780+
klog.Errorf("failed to copy app dir %v", err)
770781
return ctx.JSON(fiber.Map{
771782
"code": http.StatusBadRequest,
772783
"message": fmt.Sprintf("Copy app withdir failed: %v", err),
@@ -1035,6 +1046,7 @@ func (h *handlers) fillApp(ctx *fiber.Ctx) error {
10351046
}
10361047
appId, err := UpdateDevApp(username, cfg.Name, updates)
10371048
if err != nil {
1049+
klog.Errorf("failed to update dev app %s, err=%v", cfg.Name, err)
10381050
return ctx.JSON(fiber.Map{
10391051
"code": http.StatusBadRequest,
10401052
"message": fmt.Sprintf("update app err %v", err),
@@ -1077,6 +1089,7 @@ func (h *handlers) fillAppWithExample(ctx *fiber.Ctx) error {
10771089
var app App
10781090
err := ctx.BodyParser(&app)
10791091
if err != nil {
1092+
klog.Errorf("failed to parse body %v", err)
10801093
return ctx.JSON(fiber.Map{
10811094
"code": http.StatusBadRequest,
10821095
"message": fmt.Sprintf("Bad Request: %v", err),
@@ -1104,6 +1117,7 @@ func (h *handlers) fillAppWithExample(ctx *fiber.Ctx) error {
11041117

11051118
appId, err := UpdateDevApp(username, name, updates)
11061119
if err != nil {
1120+
klog.Errorf("failed to update app %s, err=%v", name, err)
11071121
return ctx.JSON(fiber.Map{
11081122
"code": http.StatusBadRequest,
11091123
"message": fmt.Sprintf("update app err %v", err),
@@ -1169,6 +1183,7 @@ func (h *handlers) fillAppWithDevContainer(ctx *fiber.Ctx) error {
11691183

11701184
appId, err := UpdateDevApp(username, name, updates)
11711185
if err != nil {
1186+
klog.Errorf("failed to update dev app %w,err=%v", name, err)
11721187
return ctx.JSON(fiber.Map{
11731188
"code": http.StatusBadRequest,
11741189
"message": fmt.Sprintf("update app err %v", err),
@@ -1177,6 +1192,7 @@ func (h *handlers) fillAppWithDevContainer(ctx *fiber.Ctx) error {
11771192

11781193
containers, err := GetAppContainersInChart(username, name)
11791194
if err != nil || len(containers) == 0 {
1195+
klog.Errorf("failed to get app containers in chart err=%v, len(containers)=%d", err, len(containers))
11801196
return ctx.JSON(fiber.Map{
11811197
"code": http.StatusBadRequest,
11821198
"message": fmt.Sprintf("get bind containers err %v", err),
@@ -1194,6 +1210,7 @@ func (h *handlers) fillAppWithDevContainer(ctx *fiber.Ctx) error {
11941210
}
11951211
err = BindContainer(bindData)
11961212
if err != nil {
1213+
klog.Errorf("failed to bind container app=%s,err=%v", name, err)
11971214
e := h.db.DB.Where("app_id = ?", appId).Delete(&model.DevAppContainers{}).Error
11981215
if e != nil && !errors.Is(e, gorm.ErrRecordNotFound) {
11991216
klog.Errorf("delete devAppContainer app_id=%d err %v", appId, e)

‎pkg/api/server/handlers_files.go‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ func (h *handlers) saveFile(ctx *fiber.Ctx) error {
6464
appName := pathParts[0]
6565
file, err := WriteFileAndLint(ctx.Context(), username, path, appName, bytes.NewReader(content), command.Lint().WithDir(BaseDir).Run)
6666
if err != nil {
67+
klog.Errorf("failed to write app=%s file path=%s", appName, path)
6768
return ctx.JSON(fiber.Map{
6869
"code": http.StatusBadRequest,
6970
"message": err.Error(),
@@ -81,40 +82,46 @@ func WriteFileAndLint(ctx context.Context, owner, originFilePath, name string, c
8182
if !exists {
8283
err := os.MkdirAll("/charts/tmp", 0755)
8384
if err != nil {
85+
klog.Errorf("failed to mkdir dir=%s,err=%v", "/charts/tmp", err)
8486
return nil, err
8587
}
8688
}
8789

8890
tempFile, err := os.CreateTemp("/charts/tmp", "bak-*"+filepath.Base(originFilePath))
8991
if err != nil {
92+
klog.Infof("failed to crate temp file %v", err)
9093
return nil, fmt.Errorf("create bak temp file failed %v", tempFile)
9194
}
9295

93-
bakContent, err := os.ReadFile(filepath.Join(BaseDir, originFilePath))
96+
bakContent, err := os.ReadFile(filepath.Join(BaseDir, owner, originFilePath))
9497
if err != nil {
98+
klog.Errorf("failed to read origin file path=%s,err=%v", originFilePath, err)
9599
return nil, fmt.Errorf("read origin file %s failed %v", originFilePath, err)
96100
}
97101

98102
_, err = tempFile.Write(bakContent)
99103
if err != nil {
104+
klog.Errorf("failed to write bak content to temp file %v", err)
100105
return nil, err
101106
}
102107

103108
file, err := files.WriteFile(afero.NewBasePathFs(afero.NewOsFs(), BaseDir), originFilePath, content)
104109
if err != nil {
110+
klog.Infof("failed to write file path=%s, err=%v", originFilePath, err)
105111
return nil, err
106112
}
107113

108114
if err = lintFunc(ctx, owner, name); err != nil {
109115
if restoreErr := os.Rename(tempFile.Name(), filepath.Join(BaseDir, owner, originFilePath)); restoreErr != nil {
116+
klog.Errorf("failed to lint and restore, path=%s,err=%v", filepath.Join(BaseDir, owner, originFilePath), restoreErr)
110117
return nil, fmt.Errorf("lint failed: %v, and restore bak failed: %v", err, restoreErr)
111118
}
112119
return nil, fmt.Errorf("lint failed: %v", err)
113120
}
114121
if _, err = os.Stat(tempFile.Name()); err == nil {
115122
e := os.Remove(tempFile.Name())
116123
if e != nil {
117-
klog.Infof("remove temp file failed %v", e)
124+
klog.Infof("remove temp file path=%s failed %v", tempFile.Name(), e)
118125
}
119126
}
120127

@@ -129,6 +136,7 @@ func (h *handlers) resourcePostHandler(ctx *fiber.Ctx) error {
129136
klog.Infof("resourcePostHandler mkdir: %s", filepath.Join(BaseDir, path))
130137
err := os.MkdirAll(filepath.Join(BaseDir, path), 0755)
131138
if err != nil {
139+
klog.Errorf("failed to mkdir dir=%s, err=%v", filepath.Join(BaseDir, path), err)
132140
return ctx.JSON(fiber.Map{
133141
"code": errToStatus(err),
134142
"message": err.Error(),
@@ -151,7 +159,7 @@ func (h *handlers) resourcePostHandler(ctx *fiber.Ctx) error {
151159
}
152160
file, err := files.WriteFile(afero.NewBasePathFs(afero.NewOsFs(), BaseDir), path, bytes.NewReader(ctx.Body()))
153161
if err != nil {
154-
klog.Error("write file error, ", err, ", ", path)
162+
klog.Infof("failed to write file path=%s, err=%v", path, err)
155163
return ctx.JSON(fiber.Map{
156164
"code": http.StatusBadRequest,
157165
"message": fmt.Sprintf("Write file failed: %v path: %s", err, path),
@@ -180,6 +188,7 @@ func (h *handlers) resourceDeleteHandler(ctx *fiber.Ctx) error {
180188
}
181189
err = os.RemoveAll(filepath.Join(BaseDir, path))
182190
if err != nil {
191+
klog.Errorf("failed to remove dir=%s, err=%v", filepath.Join(BaseDir, path), err)
183192
return ctx.JSON(fiber.Map{
184193
"code": http.StatusBadRequest,
185194
"message": fmt.Sprintf("Delete file failed: %v", err),

‎pkg/development/command/chartmuseum.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package command
22

33
import (
4+
"errors"
45
"fmt"
6+
"k8s.io/klog/v2"
57
"net/http"
68
"time"
79

@@ -16,12 +18,15 @@ func getChartVersions(owner, name string) (helm_repo.ChartVersions, error) {
1618
url := fmt.Sprintf("http://127.0.0.1:8888/%s/api/charts/%s", owner, name)
1719
resp, err := client.R().Get(url)
1820
if err != nil {
21+
klog.Errorf("failed to send request to url=%s,err=%v", url, err)
1922
return chartVersions, err
2023
}
2124
if resp.StatusCode() != http.StatusOK {
25+
klog.Errorf("get chart versions from chartmuseum return unexpected status code %d,err=%v", resp.StatusCode(), resp.String())
2226
return chartVersions, fmt.Errorf("get chart versions from chartmuseum return unexpected status code, %d", resp.StatusCode())
2327
}
2428
if err = yaml.Unmarshal(resp.Body(), &chartVersions); err != nil {
29+
klog.Errorf("failed to unmarshal body to chartVersions %v", err)
2530
return chartVersions, err
2631
}
2732
return chartVersions, nil
@@ -32,10 +37,13 @@ func deleteChartVersion(owner, name, version string) error {
3237
url := fmt.Sprintf("http://127.0.0.1:8888/%s/api/charts/%s/%s", owner, name, version)
3338
resp, err := client.R().Delete(url)
3439
if err != nil {
40+
klog.Errorf("failed to send request to url=%s,err=%v", url, err)
3541
return err
3642
}
3743
if resp.StatusCode() != http.StatusOK {
38-
return fmt.Errorf("delete chart %s, version %s from chartmuseum return unexpected status code", name, version)
44+
msg := fmt.Sprintf("failed to delete chart %s, version %s from chart repo return unexpected status code %v,err=%v", name, version, resp.StatusCode(), resp.String())
45+
klog.Error(msg)
46+
return errors.New(msg)
3947
}
4048
return nil
4149
}

‎pkg/development/command/command_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
func TestCreateApp(t *testing.T) {
13-
err := CreateApp().WithDir("/tmp").Run(context.Background(), &CreateConfig{Name: "testdev"})
13+
err := CreateApp().WithDir("/tmp").Run(context.Background(), &CreateConfig{Name: "testdev"}, "")
1414
if err != nil {
1515
klog.Error(err)
1616
t.Fail()
@@ -20,7 +20,7 @@ func TestCreateApp(t *testing.T) {
2020
}
2121

2222
func TestInstall(t *testing.T) {
23-
_, err := Install().Run(context.Background(), "newapp", "test", "0.0.1")
23+
_, err := Install().Run(context.Background(), "newapp", "test", "", "0.0.1")
2424
if err != nil {
2525
klog.Error(err)
2626
t.Fail()
@@ -30,7 +30,7 @@ func TestInstall(t *testing.T) {
3030
}
3131

3232
func TestUpdateRepo(t *testing.T) {
33-
_, err := UpdateRepo().WithDir("/tmp").Run(context.Background(), "newapp", false)
33+
_, err := UpdateRepo().WithDir("/tmp").Run(context.Background(), "newapp", "app", false)
3434
if err != nil {
3535
klog.Error(err)
3636
t.Fail()

0 commit comments

Comments
 (0)