Skip to content

Commit 25f588c

Browse files
committed
Merge remote-tracking branch 'origin/main' into enhance-ISS-2089
2 parents c7540e7 + e8f9252 commit 25f588c

29 files changed

Lines changed: 99 additions & 141 deletions

.task/checksum/generate-ent-smart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1+
<<<<<<< HEAD
12
12a499a9d2627b60f86880ac6dcfa3c5
3+
||||||| 109789778
4+
9ddc95703fdca960a16f0ff9e0ae8a8a
5+
=======
6+
e3a65eb133a48c5686bc504fc8b14337
7+
>>>>>>> origin/main
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1+
<<<<<<< HEAD
12
9610a9aaa9632d89d53c39de2f0c736c
3+
||||||| 109789778
4+
5b8c4777ca3d2612cd067c34dcb62c27
5+
=======
6+
74f65b890a94e2375f45b8625017e10c
7+
>>>>>>> origin/main
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1+
<<<<<<< HEAD
12
a4e9d4db1972df67e1929645514ad94
3+
||||||| 109789778
4+
a1067122a8131797d3ed2770e4d44383
5+
=======
6+
f820fbbf1ea0d0edca037f962e9e154b
7+
>>>>>>> origin/main

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@ the heart of the [Openlane](https://www.theopenlane.io) cloud service. [Sign up
2424
- Questionnaire creation, customization, and automation for easier internal and external interactions with your staff, auditors, and vendors
2525
- Notification customizations, channel definitions, comments and histories on all your objects
2626
- Easy to use documentation editors and storage for Policies and Procedures, or whatever documentation is needed
27+
- Vulnerability Management with integrations to GitHub, AWS Security Hub, and GCP Security Command Center
2728
.... and more!
2829

2930
### High-level Roadmap
3031

31-
- Trust Center and vanity domains - Now available!
3232
- Automated Evidence collection
3333
- Continuous GRC features
34-
- Vulnerability Management
3534
- Source code scanning
3635
- Internal training programs and tracking mechanisms
3736

cli/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/rs/zerolog v1.35.1
1818
github.com/samber/lo v1.53.0
1919
github.com/spf13/cobra v1.10.2
20-
github.com/theopenlane/core v1.20.4
20+
github.com/theopenlane/core v1.20.5
2121
github.com/theopenlane/core/common v1.0.21
2222
github.com/theopenlane/go-client v0.10.0
2323
github.com/theopenlane/httpsling v0.3.0

cli/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
184184
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
185185
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
186186
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
187-
github.com/theopenlane/core v1.20.4 h1:/Ck3J6MZSdWByGaBlt6Zrtz1h1Hle/jG9vUBQRfD+mI=
188-
github.com/theopenlane/core v1.20.4/go.mod h1:8RS0Tf0/Uy9xXDLWWur1+uT5jg/Nsug0c3sl28ZF9jo=
187+
github.com/theopenlane/core v1.20.5 h1:ftV3huHnf8v/AF4xPW0Rl0/SNL1olXPCwMl9FFVT0k8=
188+
github.com/theopenlane/core v1.20.5/go.mod h1:d0UuSSTbMoHROntrLX43va3zbKy/vvDbh+x2BleDPt8=
189189
github.com/theopenlane/core/common v1.0.21 h1:KWdGMCQT0WRdp4V/kvTUTnWu3cgE7ep9RFQeHIsK5AE=
190190
github.com/theopenlane/core/common v1.0.21/go.mod h1:waXdCoEZt/jaSmHa1e/U/of1AeauVg1WcaNg/usWAlg=
191191
github.com/theopenlane/echox v0.3.0 h1:uwOKEw+r1utGQoOR6dZQqAVuY5j8TcasqnTwO5+rMsA=

cmd/catalog/reconcile/main.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@ func createReconcilerWithDB(c *cli.Command) (*reconciler.Reconciler, error) {
196196
generated.EntitlementManager(stripeClient),
197197
}
198198

199-
dbClient, err := entdb.New(ctx, cfg.DB, jobOpts, entOpts...)
199+
clientOpts := []entdb.Option{}
200+
201+
dbClient, err := entdb.New(ctx, cfg.DB, jobOpts, clientOpts, entOpts...)
200202
if err != nil {
201203
return nil, fmt.Errorf("database client: %w", err)
202204
}

common/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/rs/zerolog v1.35.1
1212
github.com/stoewer/go-strcase v1.3.1
1313
github.com/stretchr/testify v1.11.1
14-
github.com/theopenlane/core v1.20.4
14+
github.com/theopenlane/core v1.20.5
1515
github.com/theopenlane/echox v0.3.0
1616
github.com/theopenlane/entx v0.27.1
1717
github.com/theopenlane/utils v0.7.0

common/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
138138
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
139139
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
140140
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
141-
github.com/theopenlane/core v1.20.4 h1:/Ck3J6MZSdWByGaBlt6Zrtz1h1Hle/jG9vUBQRfD+mI=
142-
github.com/theopenlane/core v1.20.4/go.mod h1:8RS0Tf0/Uy9xXDLWWur1+uT5jg/Nsug0c3sl28ZF9jo=
141+
github.com/theopenlane/core v1.20.5 h1:ftV3huHnf8v/AF4xPW0Rl0/SNL1olXPCwMl9FFVT0k8=
142+
github.com/theopenlane/core v1.20.5/go.mod h1:d0UuSSTbMoHROntrLX43va3zbKy/vvDbh+x2BleDPt8=
143143
github.com/theopenlane/echox v0.3.0 h1:uwOKEw+r1utGQoOR6dZQqAVuY5j8TcasqnTwO5+rMsA=
144144
github.com/theopenlane/echox v0.3.0/go.mod h1:yTrXnj7s3VNIg0FCvB7Dut2Elr+LqJKU/nruxx1E1cM=
145145
github.com/theopenlane/entx v0.27.1 h1:GBnLeaCVzS4gJCokr0Jxktz19ZYlsxcPOyx1b1Lpbmo=

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ require (
7474
github.com/microcosm-cc/bluemonday v1.0.27
7575
github.com/microsoft/kiota-authentication-azure-go v1.3.1
7676
github.com/microsoftgraph/msgraph-sdk-go v1.98.0
77-
github.com/nyaruka/phonenumbers v1.7.2
77+
github.com/nyaruka/phonenumbers v1.7.4
7878
github.com/oklog/ulid/v2 v2.1.1
7979
github.com/okta/okta-sdk-golang/v6 v6.1.6
8080
github.com/openfga/go-sdk v0.8.0

0 commit comments

Comments
 (0)