Skip to content

Commit 9f234cd

Browse files
prkhrkatprkhrkat
authored
Merge branch 'main' into external-ci-test
2 parents f976ff3 + 656ea0b commit 9f234cd

File tree

13 files changed

+258
-89
lines changed

13 files changed

+258
-89
lines changed

‎client/argocdServer/k8sClient.go‎

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@ import (
2020
"bytes"
2121
"context"
2222
"encoding/json"
23+
"errors"
2324
"fmt"
2425
"github.com/devtron-labs/common-lib/utils/k8s"
26+
"github.com/devtron-labs/devtron/internal/util"
2527
"github.com/devtron-labs/devtron/pkg/cluster/repository"
2628
"go.uber.org/zap"
2729
"io/ioutil"
30+
k8sError "k8s.io/apimachinery/pkg/api/errors"
2831
"k8s.io/apimachinery/pkg/runtime"
2932
"k8s.io/apimachinery/pkg/runtime/schema"
3033
"k8s.io/apimachinery/pkg/runtime/serializer"
@@ -117,7 +120,7 @@ func (impl ArgoK8sClientImpl) CreateArgoApplication(ctx context.Context, namespa
117120
if err != nil {
118121
return fmt.Errorf("error creating argo cd app")
119122
}
120-
impl.logger.Infow("creating application", "req", application)
123+
impl.logger.Debugw("creating argo application resource", "application", application)
121124
res, err := client.
122125
Post().
123126
Resource("applications").
@@ -126,23 +129,48 @@ func (impl ArgoK8sClientImpl) CreateArgoApplication(ctx context.Context, namespa
126129
Do(ctx).Raw()
127130

128131
if err != nil {
129-
response := make(map[string]interface{})
130-
err := json.Unmarshal(res, &response)
131-
if err != nil {
132-
impl.logger.Errorw("unmarshal error on app update status", "err", err)
133-
return fmt.Errorf("error creating argo cd app")
134-
}
135-
message := "error creating argo cd app"
136-
if response != nil && response["message"] != nil {
137-
message = response["message"].(string)
138-
}
139-
return fmt.Errorf(message)
132+
impl.logger.Errorw("error in argo application resource creation", "namespace", namespace, "res", res, "err", err)
133+
return impl.handleArgoAppCreationError(res, err)
140134
}
141135

142-
impl.logger.Infow("argo app create res", "res", string(res), "err", err)
136+
impl.logger.Infow("argo app create successfully", "namespace", namespace, "res", string(res))
143137
return err
144138
}
145139

140+
func (impl ArgoK8sClientImpl) handleArgoAppCreationError(res []byte, err error) error {
141+
// default error set
142+
apiError := &util.ApiError{
143+
InternalMessage: "error creating argo cd app",
144+
UserMessage: "error creating argo cd app",
145+
}
146+
// error override for errors.StatusError
147+
if statusError := (&k8sError.StatusError{}); errors.As(err, &statusError) {
148+
apiError.HttpStatusCode = int(statusError.Status().Code)
149+
apiError.InternalMessage = statusError.Error()
150+
apiError.UserMessage = statusError.Error()
151+
}
152+
response := make(map[string]interface{})
153+
jsonErr := json.Unmarshal(res, &response)
154+
if jsonErr != nil {
155+
impl.logger.Errorw("unmarshal error on app update status", "err", jsonErr)
156+
return apiError
157+
}
158+
// error override if API response exists, as response errors are more readable
159+
if response != nil {
160+
if statusCode, ok := response["code"]; apiError.HttpStatusCode == 0 && ok {
161+
if statusCodeFloat, ok := statusCode.(float64); ok {
162+
apiError.HttpStatusCode = int(statusCodeFloat)
163+
}
164+
}
165+
if response["message"] != nil {
166+
errMsg := response["message"].(string)
167+
apiError.InternalMessage = errMsg
168+
apiError.UserMessage = errMsg
169+
}
170+
}
171+
return apiError
172+
}
173+
146174
func (impl ArgoK8sClientImpl) GetArgoApplication(namespace string, appName string, cluster *repository.Cluster) (map[string]interface{}, error) {
147175

148176
config, err := rest.InClusterConfig()

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/davecgh/go-spew v1.1.1
2323
github.com/deckarep/golang-set v1.8.0
2424
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1
25-
github.com/devtron-labs/common-lib v0.0.23
25+
github.com/devtron-labs/common-lib v0.0.24
2626
github.com/devtron-labs/go-bitbucket v0.9.60-beta
2727
github.com/devtron-labs/protos v0.0.3-0.20240527113333-08a3be5ec6c1
2828
github.com/evanphx/json-patch v5.7.0+incompatible

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
197197
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
198198
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1 h1:qdkpTAo2Kr0ZicZIVXfNwsGSshpc9OB9j9RzmKYdIwY=
199199
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1/go.mod h1:IkKPPEfgLCMR29he5yv2OCC6iM2R7K5/0AA3k8b9XNc=
200-
github.com/devtron-labs/common-lib v0.0.23 h1:3n9VgJALanjHrb/t0nSaLbLJcJa7sdsdyFf2leE+cN0=
201-
github.com/devtron-labs/common-lib v0.0.23/go.mod h1:UZGPt1ep9Tnd9Ak2sibGSiLr7p3ijO2/JLT+h+pqBuU=
200+
github.com/devtron-labs/common-lib v0.0.24 h1:9Tb1diOnyFFrKJ+RSdzvnBUIQsUhPVaOcyQemU5q2oo=
201+
github.com/devtron-labs/common-lib v0.0.24/go.mod h1:UZGPt1ep9Tnd9Ak2sibGSiLr7p3ijO2/JLT+h+pqBuU=
202202
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
203203
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
204204
github.com/devtron-labs/protos v0.0.3-0.20240527113333-08a3be5ec6c1 h1:R6qVeFaayqstBSu4w+ipWQqJyMKDqBVV3a11qoA2IaM=

‎internal/errors/bean.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ func (r *ClientStatusCode) IsDeadlineExceededCode() bool {
4242
return r.Code == codes.DeadlineExceeded
4343
}
4444

45+
func (r *ClientStatusCode) IsUnavailableCode() bool {
46+
return r.Code == codes.Unavailable
47+
}
48+
4549
func (r *ClientStatusCode) IsCanceledCode() bool {
4650
return r.Code == codes.Canceled
4751
}

‎internal/middleware/instrument.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ var currentRequestGauge = promauto.NewGaugeVec(prometheus.GaugeOpts{
100100
Help: "no of request being served currently",
101101
}, []string{"path", "method"})
102102

103-
var AcdGetResourceCounter = promauto.NewCounterVec(prometheus.CounterOpts{
104-
Name: "acd_get_resource_counter",
105-
}, []string{"appId", "envId", "acdAppName"})
106-
107103
var CdTriggerCounter = promauto.NewCounterVec(prometheus.CounterOpts{
108104
Name: "cd_trigger_counter",
109105
}, []string{"appName", "envName"})

‎pkg/clusterTerminalAccess/UserTerminalAccessService.go‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -366,13 +366,6 @@ func (impl *UserTerminalAccessServiceImpl) DisconnectTerminalSession(ctx context
366366
return err
367367
}
368368

369-
func getErrorDetailedMessage(err error) string {
370-
if errStatus, ok := err.(*k8sErrors.StatusError); ok {
371-
return errStatus.Status().Message
372-
}
373-
return ""
374-
}
375-
376369
func (impl *UserTerminalAccessServiceImpl) StopTerminalSession(ctx context.Context, userTerminalAccessId int) {
377370
impl.Logger.Infow("terminal stop request received for user", "userTerminalAccessId", userTerminalAccessId)
378371
impl.TerminalAccessDataArrayMutex.Lock()
@@ -529,7 +522,7 @@ func (impl *UserTerminalAccessServiceImpl) SyncPodStatus() {
529522
err = impl.DeleteTerminalPod(context.Background(), terminalAccessData.ClusterId, terminalAccessData.PodName, namespace)
530523
if err != nil {
531524
if k8s.IsResourceNotFoundErr(err) {
532-
errorDetailedMessage := getErrorDetailedMessage(err)
525+
errorDetailedMessage := k8s.GetClientErrorMessage(err)
533526
terminalPodStatusString = fmt.Sprintf("%s/%s", string(models.TerminalPodTerminated), errorDetailedMessage)
534527
} else {
535528
continue
@@ -841,7 +834,7 @@ func (impl *UserTerminalAccessServiceImpl) getPodManifest(ctx context.Context, c
841834
response, err := impl.K8sCommonService.GetResource(ctx, request)
842835
if err != nil {
843836
if k8s.IsResourceNotFoundErr(err) {
844-
errorDetailedMessage := getErrorDetailedMessage(err)
837+
errorDetailedMessage := k8s.GetClientErrorMessage(err)
845838
terminalPodStatusString := fmt.Sprintf("%s/%s", string(models.TerminalPodTerminated), errorDetailedMessage)
846839
return nil, errors.New(terminalPodStatusString)
847840
} else {

0 commit comments

Comments
 (0)