Skip to content

Commit 637ae54

Browse files
tls verification enabled flag
1 parent 436ef11 commit 637ae54

File tree

7 files changed

+541
-524
lines changed

7 files changed

+541
-524
lines changed

api/GrpcHandler.go

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,19 @@ func (impl *GrpcHandlerImpl) SaveGitProvider(ctx context.Context, req *pb.GitPro
7272

7373
// mapping req
7474
gitProvider := &sql.GitProvider{
75-
Id: int(req.Id),
76-
Name: req.Name,
77-
Url: req.Url,
78-
UserName: req.UserName,
79-
Password: req.Password,
80-
AccessToken: req.AccessToken,
81-
SshPrivateKey: req.SshPrivateKey,
82-
AuthMode: sql.AuthMode(req.AuthMode),
83-
Active: req.Active,
84-
CaCert: req.CaCert,
85-
TlsCert: req.TlsCert,
86-
TlsKey: req.TlsKey,
75+
Id: int(req.Id),
76+
Name: req.Name,
77+
Url: req.Url,
78+
UserName: req.UserName,
79+
Password: req.Password,
80+
AccessToken: req.AccessToken,
81+
SshPrivateKey: req.SshPrivateKey,
82+
AuthMode: sql.AuthMode(req.AuthMode),
83+
Active: req.Active,
84+
CaCert: req.CaCert,
85+
TlsCert: req.TlsCert,
86+
TlsKey: req.TlsKey,
87+
TlsVerificationEnabled: req.TlsVerificationEnabled,
8788
}
8889

8990
_, err := impl.repositoryManager.SaveGitProvider(gitProvider)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.20
55
require (
66
github.com/caarlos0/env v3.5.0+incompatible
77
github.com/devtron-labs/common-lib v0.0.18-0.20240520062828-c6c38c3f135e
8-
github.com/devtron-labs/protos v0.0.3-0.20240614064039-c8647dc19a48
8+
github.com/devtron-labs/protos v0.0.3-0.20240614110103-8d05fec622b3
99
github.com/gammazero/workerpool v0.0.0-20200206003619-019d125201ab
1010
github.com/go-git/go-git/v5 v5.11.0
1111
github.com/go-pg/pg v6.15.1+incompatible

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ github.com/devtron-labs/common-lib v0.0.18-0.20240520062828-c6c38c3f135e h1:feRK
3131
github.com/devtron-labs/common-lib v0.0.18-0.20240520062828-c6c38c3f135e/go.mod h1:deAcJ5IjUjM6ozZQLJEgPWDUA0mKa632LBsKx8uM9TE=
3232
github.com/devtron-labs/protos v0.0.3-0.20240614064039-c8647dc19a48 h1:xblnoJzpoqE1Nf4LwLgY7mSXpA5YD4MocFsFGOjrEN4=
3333
github.com/devtron-labs/protos v0.0.3-0.20240614064039-c8647dc19a48/go.mod h1:ypUknVph8Ph4dxSlrFoouf7wLedQxHku2LQwgRrdgS4=
34+
github.com/devtron-labs/protos v0.0.3-0.20240614110103-8d05fec622b3 h1:XsTpQA2ewZWkDv5JorddKqKpJakGptfYDytGx5UZxk0=
35+
github.com/devtron-labs/protos v0.0.3-0.20240614110103-8d05fec622b3/go.mod h1:ypUknVph8Ph4dxSlrFoouf7wLedQxHku2LQwgRrdgS4=
3436
github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU=
3537
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
3638
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=

internals/sql/GitProviderRepository.go

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,20 @@ const (
2828
)
2929

3030
type GitProvider struct {
31-
tableName struct{} `sql:"git_provider"`
32-
Id int `sql:"id,pk"`
33-
Name string `sql:"name,notnull"`
34-
Url string `sql:"url,notnull"`
35-
UserName string `sql:"user_name"`
36-
Password string `sql:"password"`
37-
SshPrivateKey string `sql:"ssh_private_key"`
38-
AccessToken string `sql:"access_token"`
39-
AuthMode AuthMode `sql:"auth_mode,notnull"`
40-
Active bool `sql:"active,notnull"`
41-
TlsCert string `sql:"tls_cert"`
42-
TlsKey string `sql:"tls_key"`
43-
CaCert string `sql:"ca_cert"`
31+
tableName struct{} `sql:"git_provider"`
32+
Id int `sql:"id,pk"`
33+
Name string `sql:"name,notnull"`
34+
Url string `sql:"url,notnull"`
35+
UserName string `sql:"user_name"`
36+
Password string `sql:"password"`
37+
SshPrivateKey string `sql:"ssh_private_key"`
38+
AccessToken string `sql:"access_token"`
39+
AuthMode AuthMode `sql:"auth_mode,notnull"`
40+
Active bool `sql:"active,notnull"`
41+
TlsCert string `sql:"tls_cert"`
42+
TlsKey string `sql:"tls_key"`
43+
CaCert string `sql:"ca_cert"`
44+
TlsVerificationEnabled bool `sql:"enable_tls_verification"`
4445
//models.AuditLog
4546
}
4647

0 commit comments

Comments
 (0)