Skip to content

feat: add gRPC client for git-sensor #3085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Apr 18, 2023
Merged

feat: add gRPC client for git-sensor #3085

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
cb38302
add grpc client
vishal-dt Mar 5, 2023
3743755
add flag for using grpc for git sensor
vishal-dt Mar 6, 2023
ff96b39
append http for rest client if not present
vishal-dt Mar 7, 2023
608f184
remove commented code
vishal-dt Mar 7, 2023
13dc1b4
upgrade protos dependency
vishal-dt Mar 7, 2023
7d4b735
Merge branch 'main' of https://github.com/devtron-labs/devtron into f…
vishal-dt Mar 7, 2023
a7f967b
add unit test
vishal-dt Mar 7, 2023
2e8fd9e
add unit test and remove api client mock
vishal-dt Mar 7, 2023
9e8d408
renamed git sensor client protocol env variable
vishal-dt Mar 9, 2023
1f320e6
add grpc prometheus unary interceptor
vishal-dt Mar 10, 2023
c9e7002
Merge branch 'main' of https://github.com/devtron-labs/devtron into f…
vishal-dt Mar 13, 2023
7fddce6
refactor for review comments
vishal-dt Mar 13, 2023
f46936c
refactor
vishal-dt Mar 13, 2023
b1a108a
fix pointer issue
vishal-dt Mar 14, 2023
f226083
Merge branch 'main' of https://github.com/devtron-labs/devtron into f…
vishal-dt Mar 22, 2023
e9443d2
mod tidy
vishal-dt Mar 22, 2023
3ae12c2
Merge branch 'main' of https://github.com/devtron-labs/devtron into f…
vishal-dt Mar 28, 2023
0fa7c1f
Merge branch 'main' of https://github.com/devtron-labs/devtron into f…
vishal-dt Apr 11, 2023
1fca6fe
Merge branch 'main' of https://github.com/devtron-labs/devtron into f…
vishal-dt Apr 12, 2023
6350710
Merge branch 'main' of https://github.com/devtron-labs/devtron into f…
vishal-dt Apr 13, 2023
c3ae6d5
Merge branch 'main' of https://github.com/devtron-labs/devtron into f…
vishal-dt Apr 14, 2023
d6ea0bb
Merge branch 'main' of https://github.com/devtron-labs/devtron into f…
vishal-dt Apr 17, 2023
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
9 changes: 5 additions & 4 deletions Wire.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,11 @@ func InitializeApp() (*App, error) {
webhookHelm.WebhookHelmWireSet,
terminal.TerminalWireSet,
// -------wireset end ----------
gitSensor.GetGitSensorConfig,
gitSensor.NewGitSensorSession,
wire.Bind(new(gitSensor.GitSensorClient), new(*gitSensor.GitSensorClientImpl)),
//--------
//-------
gitSensor.GetConfig,
gitSensor.NewGitSensorClient,
wire.Bind(new(gitSensor.Client), new(*gitSensor.ClientImpl)),
//-------
helper.NewAppListingRepositoryQueryBuilder,
//sql.GetConfig,
eClient.GetEventClientConfig,
Expand Down
4 changes: 2 additions & 2 deletions api/restHandler/BulkUpdateRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ type BulkUpdateRestHandlerImpl struct {
validator *validator.Validate
teamService team.TeamService
enforcer casbin.Enforcer
gitSensorClient gitSensor.GitSensorClient
gitSensorClient gitSensor.Client
pipelineRepository pipelineConfig.PipelineRepository
appWorkflowService appWorkflow.AppWorkflowService
enforcerUtil rbac.EnforcerUtil
Expand All @@ -81,7 +81,7 @@ func NewBulkUpdateRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, logg
enforcer casbin.Enforcer,
ciHandler pipeline.CiHandler,
validator *validator.Validate,
gitSensorClient gitSensor.GitSensorClient,
gitSensorClient gitSensor.Client,
ciPipelineRepository pipelineConfig.CiPipelineRepository, pipelineRepository pipelineConfig.PipelineRepository,
enforcerUtil rbac.EnforcerUtil, envService request.EnvironmentService,
gitRegistryConfig pipeline.GitRegistryConfig, dockerRegistryConfig pipeline.DockerRegistryConfig,
Expand Down
11 changes: 6 additions & 5 deletions api/restHandler/GitHostRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package restHandler

import (
"context"
"encoding/json"
"github.com/devtron-labs/devtron/api/restHandler/common"
"github.com/devtron-labs/devtron/client/gitSensor"
Expand Down Expand Up @@ -47,13 +48,13 @@ type GitHostRestHandlerImpl struct {
userAuthService user.UserService
validator *validator.Validate
enforcer casbin.Enforcer
gitSensorClient gitSensor.GitSensorClient
gitSensorClient gitSensor.Client
gitProviderConfig pipeline.GitRegistryConfig
}

func NewGitHostRestHandlerImpl(logger *zap.SugaredLogger,
gitHostConfig pipeline.GitHostConfig, userAuthService user.UserService,
validator *validator.Validate, enforcer casbin.Enforcer, gitSensorClient gitSensor.GitSensorClient, gitProviderConfig pipeline.GitRegistryConfig) *GitHostRestHandlerImpl {
validator *validator.Validate, enforcer casbin.Enforcer, gitSensorClient gitSensor.Client, gitProviderConfig pipeline.GitRegistryConfig) *GitHostRestHandlerImpl {
return &GitHostRestHandlerImpl{
logger: logger,
gitHostConfig: gitHostConfig,
Expand Down Expand Up @@ -192,7 +193,7 @@ func (impl GitHostRestHandlerImpl) GetAllWebhookEventConfig(w http.ResponseWrite
GitHostId: id,
}

res, err := impl.gitSensorClient.GetAllWebhookEventConfigForHost(webhookEventRequest)
res, err := impl.gitSensorClient.GetAllWebhookEventConfigForHost(context.Background(), webhookEventRequest)

if err != nil {
impl.logger.Errorw("service err, GetAllWebhookEventConfig", "err", err)
Expand Down Expand Up @@ -226,7 +227,7 @@ func (impl GitHostRestHandlerImpl) GetWebhookEventConfig(w http.ResponseWriter,
EventId: eventId,
}

res, err := impl.gitSensorClient.GetWebhookEventConfig(webhookEventRequest)
res, err := impl.gitSensorClient.GetWebhookEventConfig(context.Background(), webhookEventRequest)

if err != nil {
impl.logger.Errorw("service err, GetWebhookEventConfig", "err", err)
Expand Down Expand Up @@ -276,7 +277,7 @@ func (impl GitHostRestHandlerImpl) GetWebhookDataMetaConfig(w http.ResponseWrite
webhookEventRequest := &gitSensor.WebhookEventConfigRequest{
GitHostId: gitHostId,
}
webhookEvents, err := impl.gitSensorClient.GetAllWebhookEventConfigForHost(webhookEventRequest)
webhookEvents, err := impl.gitSensorClient.GetAllWebhookEventConfigForHost(context.Background(), webhookEventRequest)
if err != nil {
impl.logger.Errorw("service err, GetAllWebhookEventConfig", "err", err)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
Expand Down
13 changes: 7 additions & 6 deletions api/restHandler/WebhookDataRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package restHandler

import (
"context"
"github.com/devtron-labs/devtron/api/restHandler/common"
"github.com/devtron-labs/devtron/client/gitSensor"
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
Expand All @@ -42,20 +43,20 @@ type WebhookDataRestHandlerImpl struct {
ciPipelineMaterialRepository pipelineConfig.CiPipelineMaterialRepository
enforcerUtil rbac.EnforcerUtil
enforcer casbin.Enforcer
gitSensorClient gitSensor.GitSensorClient
gitSensorClient gitSensor.Client
webhookEventDataConfig pipeline.WebhookEventDataConfig
}

func NewWebhookDataRestHandlerImpl(logger *zap.SugaredLogger, userAuthService user.UserService,
ciPipelineMaterialRepository pipelineConfig.CiPipelineMaterialRepository, enforcerUtil rbac.EnforcerUtil, enforcer casbin.Enforcer,
gitSensorClient gitSensor.GitSensorClient, webhookEventDataConfig pipeline.WebhookEventDataConfig) *WebhookDataRestHandlerImpl {
gitSensorGrpcClient gitSensor.Client, webhookEventDataConfig pipeline.WebhookEventDataConfig) *WebhookDataRestHandlerImpl {
return &WebhookDataRestHandlerImpl{
logger: logger,
userAuthService: userAuthService,
ciPipelineMaterialRepository: ciPipelineMaterialRepository,
enforcerUtil: enforcerUtil,
enforcer: enforcer,
gitSensorClient: gitSensorClient,
gitSensorClient: gitSensorGrpcClient,
webhookEventDataConfig: webhookEventDataConfig,
}
}
Expand Down Expand Up @@ -118,7 +119,7 @@ func (impl WebhookDataRestHandlerImpl) GetWebhookPayloadDataForPipelineMaterialI
EventTimeSortOrder: eventTimeSortOrder,
}

response, err := impl.gitSensorClient.GetWebhookPayloadDataForPipelineMaterialId(webhookPayloadDataRequest)
response, err := impl.gitSensorClient.GetWebhookPayloadDataForPipelineMaterialId(context.Background(), webhookPayloadDataRequest)
if err != nil {
impl.logger.Errorw("service err, GetWebhookPayloadDataForPipelineMaterialId", "err", err)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
Expand Down Expand Up @@ -175,7 +176,7 @@ func (impl WebhookDataRestHandlerImpl) GetWebhookPayloadFilterDataForPipelineMat
ParsedDataId: parsedDataId,
}

response, err := impl.gitSensorClient.GetWebhookPayloadFilterDataForPipelineMaterialId(webhookPayloadFilterDataRequest)
response, err := impl.gitSensorClient.GetWebhookPayloadFilterDataForPipelineMaterialId(context.Background(), webhookPayloadFilterDataRequest)
if err != nil {
impl.logger.Errorw("service err, GetWebhookPayloadFilterDataForPipelineMaterialId", "err", err)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
Expand All @@ -184,7 +185,7 @@ func (impl WebhookDataRestHandlerImpl) GetWebhookPayloadFilterDataForPipelineMat

// set payload json
if response != nil && response.PayloadId != 0 {
webhookEventData, err := impl.webhookEventDataConfig.GetById(response.PayloadId)
webhookEventData, err := impl.webhookEventDataConfig.GetById(int(response.PayloadId))
if err != nil {
impl.logger.Errorw("error in getting webhook payload data", "err", err)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
Expand Down
4 changes: 2 additions & 2 deletions api/restHandler/app/BuildPipelineRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,7 +1141,7 @@ func (handler PipelineConfigRestHandlerImpl) FetchChanges(w http.ResponseWriter,
changeRequest := &gitSensor.FetchScmChangesRequest{
PipelineMaterialId: ciMaterialId,
}
changes, err := handler.gitSensorClient.FetchChanges(changeRequest)
changes, err := handler.gitSensorClient.FetchChanges(context.Background(), changeRequest)
if err != nil {
handler.Logger.Errorw("service err, FetchChanges", "err", err, "ciMaterialId", ciMaterialId, "pipelineId", pipelineId)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
Expand Down Expand Up @@ -1187,7 +1187,7 @@ func (handler PipelineConfigRestHandlerImpl) GetCommitMetadataForPipelineMateria
PipelineMaterialId: ciPipelineMaterialId,
GitHash: gitHash,
}
commit, err := handler.gitSensorClient.GetCommitMetadataForPipelineMaterial(commitMetadataRequest)
commit, err := handler.gitSensorClient.GetCommitMetadataForPipelineMaterial(context.Background(), commitMetadataRequest)
if err != nil {
handler.Logger.Errorw("error while fetching commit metadata for pipeline material", "commitMetadataRequest", commitMetadataRequest, "err", err)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
Expand Down
6 changes: 3 additions & 3 deletions api/restHandler/app/PipelineConfigRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"context"
"encoding/json"
"fmt"
"github.com/devtron-labs/devtron/client/gitSensor"
"github.com/devtron-labs/devtron/pkg/chart"
"github.com/devtron-labs/devtron/util/argo"
"io"
Expand All @@ -34,7 +35,6 @@ import (

bean2 "github.com/devtron-labs/devtron/api/bean"
"github.com/devtron-labs/devtron/client/argocdServer/application"
"github.com/devtron-labs/devtron/client/gitSensor"
"github.com/devtron-labs/devtron/internal/sql/repository"
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
"github.com/devtron-labs/devtron/internal/sql/repository/security"
Expand Down Expand Up @@ -103,7 +103,7 @@ type PipelineConfigRestHandlerImpl struct {
validator *validator.Validate
teamService team.TeamService
enforcer casbin.Enforcer
gitSensorClient gitSensor.GitSensorClient
gitSensorClient gitSensor.Client
pipelineRepository pipelineConfig.PipelineRepository
appWorkflowService appWorkflow.AppWorkflowService
enforcerUtil rbac.EnforcerUtil
Expand All @@ -129,7 +129,7 @@ func NewPipelineRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, Logger
enforcer casbin.Enforcer,
ciHandler pipeline.CiHandler,
validator *validator.Validate,
gitSensorClient gitSensor.GitSensorClient,
gitSensorClient gitSensor.Client,
ciPipelineRepository pipelineConfig.CiPipelineRepository, pipelineRepository pipelineConfig.PipelineRepository,
enforcerUtil rbac.EnforcerUtil, envService request.EnvironmentService,
gitRegistryConfig pipeline.GitRegistryConfig, dockerRegistryConfig pipeline.DockerRegistryConfig,
Expand Down
Loading