Skip to content

Commit e140316

Browse files
Shivam-nagar23Shivam-nagar23
authored
feat: licensing changes (#6474)
* modules handling * example * sql files * common lib update
1 parent d0ddb67 commit e140316

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+8029
-2426
lines changed

‎client/telemetry/TelemetryEventClient.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ type TelemetryEventClientImpl struct {
7878
userAttributesRepository repository.UserAttributesRepository
7979
cloudProviderIdentifierService cloudProviderIdentifier.ProviderIdentifierService
8080
telemetryConfig TelemetryConfig
81+
globalEnvVariables *util.GlobalEnvVariables
8182
}
8283

8384
type TelemetryEventClient interface {
@@ -96,7 +97,8 @@ func NewTelemetryEventClientImpl(logger *zap.SugaredLogger, client *http.Client,
9697
serverDataStore *serverDataStore.ServerDataStore, userAuditService user2.UserAuditService,
9798
helmAppClient gRPC.HelmAppClient,
9899
cloudProviderIdentifierService cloudProviderIdentifier.ProviderIdentifierService, cronLogger *cron3.CronLoggerImpl,
99-
installedAppReadService installedAppReader.InstalledAppReadServiceEA) (*TelemetryEventClientImpl, error) {
100+
installedAppReadService installedAppReader.InstalledAppReadServiceEA,
101+
envVariables *util.EnvironmentVariables) (*TelemetryEventClientImpl, error) {
100102
cron := cron.New(
101103
cron.WithChain(cron.Recover(cronLogger)))
102104
cron.Start()
@@ -118,6 +120,7 @@ func NewTelemetryEventClientImpl(logger *zap.SugaredLogger, client *http.Client,
118120
installedAppReadService: installedAppReadService,
119121
cloudProviderIdentifierService: cloudProviderIdentifierService,
120122
telemetryConfig: TelemetryConfig{},
123+
globalEnvVariables: envVariables.GlobalEnvVariables,
121124
}
122125

123126
watcher.HeartbeatEventForTelemetry()
@@ -423,7 +426,7 @@ func (impl *TelemetryEventClientImpl) EnqueueGenericPostHogEvent(ucid string, ev
423426
impl.PosthogClient.Client = client
424427
}
425428
}
426-
if impl.PosthogClient.Client != nil {
429+
if impl.PosthogClient.Client != nil && !impl.globalEnvVariables.IsAirGapEnvironment {
427430
err := impl.PosthogClient.Client.Enqueue(posthog.Capture{
428431
DistinctId: ucid,
429432
Event: eventType,

‎cmd/external-app/wire.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ import (
9797
func InitializeApp() (*App, error) {
9898
wire.Build(
9999
user.SelfRegistrationWireSet,
100-
101100
sql.PgSqlWireSet,
102101
user.UserWireSet,
103102
sso.SsoConfigWireSet,

‎cmd/external-app/wire_gen.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎env_gen.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎env_gen.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,12 @@
191191
| GRAFANA_USERNAME | string |admin | | | false |
192192
| HIDE_IMAGE_TAGGING_HARD_DELETE | bool |false | | | false |
193193
| IGNORE_AUTOCOMPLETE_AUTH_CHECK | bool |false | | | false |
194+
| INSTALLED_MODULES | | | List of installed modules given in helm values/yaml are written in cm and used by devtron to know which modules are given | security.trivy,security.clair | false |
194195
| INSTALLER_CRD_NAMESPACE | string |devtroncd | | | false |
195196
| INSTALLER_CRD_OBJECT_GROUP_NAME | string |installer.devtron.ai | | | false |
196197
| INSTALLER_CRD_OBJECT_RESOURCE | string |installers | | | false |
197198
| INSTALLER_CRD_OBJECT_VERSION | string |v1alpha1 | | | false |
199+
| IS_AIR_GAP_ENVIRONMENT | bool |false | | | false |
198200
| JwtExpirationTime | int |120 | | | false |
199201
| K8s_CLIENT_MAX_IDLE_CONNS_PER_HOST | int |25 | | | false |
200202
| K8s_TCP_IDLE_CONN_TIMEOUT | int |300 | | | false |

‎go.mod‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ require (
4949
github.com/hashicorp/go-multierror v1.1.1
5050
github.com/hashicorp/hcl2 v0.0.0-20191002203319-fb75b3253c80
5151
github.com/invopop/jsonschema v0.7.0
52-
github.com/juju/errors v0.0.0-20200330140219-3fe23663418f
52+
github.com/juju/errors v1.0.0
5353
github.com/lib/pq v1.10.9
5454
github.com/microsoft/azure-devops-go-api/azuredevops v1.0.0-b5
5555
github.com/otiai10/copy v1.0.2
5656
github.com/patrickmn/go-cache v2.1.0+incompatible
5757
github.com/pkg/errors v0.9.1
58-
github.com/posthog/posthog-go v0.0.0-20210610161230-cd4408afb35a
58+
github.com/posthog/posthog-go v1.4.1
5959
github.com/prometheus/client_golang v1.18.0
6060
github.com/robfig/cron/v3 v3.0.1
6161
github.com/satori/go.uuid v1.2.0
@@ -81,7 +81,7 @@ require (
8181
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
8282
google.golang.org/grpc v1.59.0
8383
google.golang.org/protobuf v1.33.0
84-
gopkg.in/go-playground/validator.v9 v9.30.0
84+
gopkg.in/go-playground/validator.v9 v9.31.0
8585
gopkg.in/igm/sockjs-go.v3 v3.0.0
8686
gopkg.in/yaml.v2 v2.4.0
8787
helm.sh/helm/v3 v3.14.3
@@ -151,8 +151,8 @@ require (
151151
github.com/go-openapi/jsonpointer v0.20.2 // indirect
152152
github.com/go-openapi/jsonreference v0.20.4 // indirect
153153
github.com/go-openapi/swag v0.22.6 // indirect
154-
github.com/go-playground/locales v0.14.0 // indirect
155-
github.com/go-playground/universal-translator v0.18.0 // indirect
154+
github.com/go-playground/locales v0.14.1 // indirect
155+
github.com/go-playground/universal-translator v0.18.1 // indirect
156156
github.com/go-redis/cache/v9 v9.0.0 // indirect
157157
github.com/go-sql-driver/mysql v1.6.0 // indirect
158158
github.com/go-xorm/xorm v0.7.9 // indirect
@@ -187,11 +187,10 @@ require (
187187
github.com/jonboulle/clockwork v0.2.2 // indirect
188188
github.com/josharian/intern v1.0.0 // indirect
189189
github.com/json-iterator/go v1.1.12 // indirect
190-
github.com/juju/testing v0.0.0-20210324180055-18c50b0c2098 // indirect
191190
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
192191
github.com/kevinburke/ssh_config v1.2.0 // indirect
193192
github.com/klauspost/compress v1.16.7 // indirect
194-
github.com/leodido/go-urn v1.2.0 // indirect
193+
github.com/leodido/go-urn v1.4.0 // indirect
195194
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
196195
github.com/mailru/easyjson v0.7.7 // indirect
197196
github.com/mattn/go-ieproxy v0.0.1 // indirect
@@ -238,7 +237,6 @@ require (
238237
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
239238
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
240239
github.com/xlab/treeprint v1.2.0 // indirect
241-
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
242240
go.opencensus.io v0.24.0 // indirect
243241
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
244242
go.opentelemetry.io/otel/metric v1.21.0 // indirect
@@ -258,7 +256,6 @@ require (
258256
google.golang.org/appengine v1.6.8 // indirect
259257
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
260258
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
261-
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
262259
gopkg.in/inf.v0 v0.9.1 // indirect
263260
gopkg.in/warnings.v0 v0.1.2 // indirect
264261
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -291,8 +288,8 @@ require (
291288

292289
replace (
293290
github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
294-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250327100051-86261f25ea82
295-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250327100051-86261f25ea82
291+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250401095543-affde454fe43
292+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250401095543-affde454fe43
296293
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
297294
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
298295
k8s.io/api => k8s.io/api v0.29.7

0 commit comments

Comments
 (0)