Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions client/events/EventBuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ import (
"context"
"fmt"
bean2 "github.com/devtron-labs/devtron/api/bean"
repository2 "github.com/devtron-labs/devtron/internal/sql/repository"
"github.com/devtron-labs/devtron/internal/sql/repository/chartConfig"
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
"github.com/devtron-labs/devtron/pkg/bean"
"github.com/devtron-labs/devtron/pkg/user/repository"
"github.com/devtron-labs/devtron/util/event"
"github.com/go-pg/pg"
"github.com/satori/go.uuid"
"go.uber.org/zap"
"strings"
Expand All @@ -48,13 +50,14 @@ type EventSimpleFactoryImpl struct {
ciPipelineRepository pipelineConfig.CiPipelineRepository
pipelineRepository pipelineConfig.PipelineRepository
userRepository repository.UserRepository
ciArtifactRepository repository2.CiArtifactRepository
}

func NewEventSimpleFactoryImpl(logger *zap.SugaredLogger, cdWorkflowRepository pipelineConfig.CdWorkflowRepository,
pipelineOverrideRepository chartConfig.PipelineOverrideRepository, ciWorkflowRepository pipelineConfig.CiWorkflowRepository,
ciPipelineMaterialRepository pipelineConfig.CiPipelineMaterialRepository,
ciPipelineRepository pipelineConfig.CiPipelineRepository, pipelineRepository pipelineConfig.PipelineRepository,
userRepository repository.UserRepository) *EventSimpleFactoryImpl {
userRepository repository.UserRepository, ciArtifactRepository repository2.CiArtifactRepository) *EventSimpleFactoryImpl {
return &EventSimpleFactoryImpl{
logger: logger,
cdWorkflowRepository: cdWorkflowRepository,
Expand All @@ -64,6 +67,7 @@ func NewEventSimpleFactoryImpl(logger *zap.SugaredLogger, cdWorkflowRepository p
ciPipelineRepository: ciPipelineRepository,
pipelineRepository: pipelineRepository,
userRepository: userRepository,
ciArtifactRepository: ciArtifactRepository,
}
}

Expand Down Expand Up @@ -222,11 +226,24 @@ func (impl *EventSimpleFactoryImpl) getCiMaterialInfo(ciPipelineId int, ciArtifa
materialTriggerInfo.CiMaterials = ciMaterialsArr
}
if ciArtifactId > 0 {
ciWf, err := impl.ciWorkflowRepository.FindLastTriggeredWorkflowByArtifactId(ciArtifactId)
ciArtifact, err := impl.ciArtifactRepository.Get(ciArtifactId)
if err != nil {
impl.logger.Errorw("error fetching artifact data", "err", err)
return nil, err
}
materialTriggerInfo.GitTriggers = ciWf.GitTriggers

// handling linked ci pipeline
if ciArtifact.ParentCiArtifact > 0 && ciArtifact.WorkflowId == nil {
ciArtifactId = ciArtifact.ParentCiArtifact
}
ciWf, err := impl.ciWorkflowRepository.FindLastTriggeredWorkflowByArtifactId(ciArtifactId)
if err != nil && err != pg.ErrNoRows {
impl.logger.Errorw("error fetching ci workflow data by artifact", "err", err)
return nil, err
}
if ciWf != nil {
materialTriggerInfo.GitTriggers = ciWf.GitTriggers
}
}
return materialTriggerInfo, nil
}
16 changes: 8 additions & 8 deletions client/telemetry/TelemetryEventClient.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,18 +226,18 @@ func (impl *TelemetryEventClientImpl) SummaryDetailsForTelemetry() (cluster []cl
ClusterName: clusterDetail.ClusterName,
}
req.Clusters = append(req.Clusters, config)

applicatonStream, err := impl.helmAppClient.ListApplication(context.Background(), req)

applicationStream, err := impl.helmAppClient.ListApplication(context.Background(), req)
if err == nil {

clusterList, _ := applicatonStream.Recv()

if !clusterList.Errored {
clusterList, err1 := applicationStream.Recv()
if err1 != nil {
impl.logger.Errorw("error in list helm applications streams recv", "err", err)
}
if err1 != nil && clusterList != nil && !clusterList.Errored {
ExternalHelmAppClusterCount[clusterList.ClusterId] = len(clusterList.DeployedAppDetail)
}
} else {
impl.logger.Errorw("error while fetching list application from kubelink", "err", err)
}

}

//getting userData from emailId
Expand Down
5 changes: 2 additions & 3 deletions cmd/external-app/wire_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions wire_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.