Skip to content

Commit 6dd523d

Browse files
Ash-expAsh-exp
authored
Merge branch 'develop' into fix-argocd-update-event
2 parents b478c9c + cf5cf97 commit 6dd523d

File tree

57 files changed

+4762
-186
lines changed

Some content is hidden

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

57 files changed

+4762
-186
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ require (
307307

308308
replace (
309309
github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
310-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250513072902-f8dc68360b7e
311-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250513072902-f8dc68360b7e
310+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250519051255-c306199e8103
311+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519051255-c306199e8103
312312
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
313313
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
314314
k8s.io/api => k8s.io/api v0.29.7

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -829,10 +829,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
829829
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
830830
github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
831831
github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
832-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250513072902-f8dc68360b7e h1:drzFWo268a6d1nG3vrmripZQew0GVQ0MbcGWN08BW2o=
833-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250513072902-f8dc68360b7e/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
834-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250513072902-f8dc68360b7e h1:oUUWj4//3Scw0lH+L37jch5u+CPMpYTaTVWZfuh5bi8=
835-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250513072902-f8dc68360b7e/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
832+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250519051255-c306199e8103 h1:e87xUalShG6p69AHBL/R5CXsnaKRFv2T3d9v8pe57ok=
833+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250519051255-c306199e8103/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
834+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519051255-c306199e8103 h1:BMO9hE60ZyFUpAOPv4KawSMrkQOXglQxwiMpFu9VCxs=
835+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519051255-c306199e8103/go.mod h1:CXQGEo+kZc7JPX5hn4jJf1msal9q/ExSdAYGkHNPnQw=
836836
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
837837
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
838838
github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs=

‎pkg/build/trigger/HandlerService.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1910,7 +1910,7 @@ func (impl *HandlerServiceImpl) DownloadCiWorkflowArtifacts(pipelineId int, buil
19101910
impl.ciWorkflowRepository.MigrateCiArtifactLocation(ciWorkflow.Id, key)
19111911
}
19121912
baseLogLocationPathConfig := impl.config.BaseLogLocationPath
1913-
blobStorageService := blob_storage.NewBlobStorageServiceImpl(nil)
1913+
blobStorageService := blob_storage.NewBlobStorageServiceImpl(impl.Logger)
19141914
destinationKey := filepath.Clean(filepath.Join(baseLogLocationPathConfig, item))
19151915
request := &blob_storage.BlobStorageRequest{
19161916
StorageType: impl.config.CloudProvider,

‎pkg/deployment/trigger/devtronApps/prePostWfAndLogsCode.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func (impl *HandlerServiceImpl) DownloadCdWorkflowArtifacts(buildId int) (*os.Fi
183183
impl.cdWorkflowRepository.MigrateCdArtifactLocation(wfr.Id, key)
184184
}
185185
baseLogLocationPathConfig := impl.config.BaseLogLocationPath
186-
blobStorageService := blob_storage.NewBlobStorageServiceImpl(nil)
186+
blobStorageService := blob_storage.NewBlobStorageServiceImpl(impl.logger)
187187
destinationKey := filepath.Clean(filepath.Join(baseLogLocationPathConfig, item))
188188
request := &blob_storage.BlobStorageRequest{
189189
StorageType: impl.config.CloudProvider,

‎pkg/pipeline/CiLogService.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (impl *CiLogServiceImpl) FetchLogs(baseLogLocationPathConfig string, logReq
8888
tempFile := baseLogLocationPathConfig
8989
tempFile = filepath.Clean(filepath.Join(tempFile, logRequest.PodName+".log"))
9090

91-
blobStorageService := blob_storage.NewBlobStorageServiceImpl(nil)
91+
blobStorageService := blob_storage.NewBlobStorageServiceImpl(impl.logger)
9292
request := &blob_storage.BlobStorageRequest{
9393
StorageType: logRequest.CloudProvider,
9494
SourceKey: logRequest.LogsFilePath,

‎scripts/sql/33303600_infra_provision.down.sql‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
BEGIN;
2+
-- Drop Table: chart_category
3+
DROP TABLE IF EXISTS "public"."chart_category_mapping";
4+
5+
-- Drop Sequence: id_seq_chart_category
6+
DROP SEQUENCE IF EXISTS id_seq_chart_category_mapping;
7+
8+
9+
-- Drop Table: chart_category
10+
DROP TABLE IF EXISTS "public"."chart_category";
11+
12+
-- Drop Sequence: id_seq_chart_category
13+
DROP SEQUENCE IF EXISTS id_seq_chart_category;
14+
15+
16+
DROP TABLE IF EXISTS "public"."infrastructure_installation";
17+
18+
DROP SEQUENCE IF EXISTS id_seq_infrastructure_installation;
19+
20+
DROP TABLE IF EXISTS "public"."infrastructure_installation_versions";
21+
22+
DROP SEQUENCE IF EXISTS id_seq_infrastructure_installation_versions;
23+
24+
COMMIT;

‎scripts/sql/33303600_infra_provision.up.sql‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
BEGIN;
2+
-- Sequence
3+
CREATE SEQUENCE IF NOT EXISTS id_seq_chart_category;
4+
5+
-- DROP TABLE IF EXISTS public.chart_category;
6+
7+
CREATE TABLE IF NOT EXISTS public.chart_category
8+
(
9+
id integer NOT NULL DEFAULT nextval('id_seq_chart_category'::regclass),
10+
name character varying(250) COLLATE pg_catalog."default" NOT NULL,
11+
description text COLLATE pg_catalog."default" NOT NULL,
12+
deleted boolean NOT NULL,
13+
created_on timestamp with time zone,
14+
created_by integer,
15+
updated_on timestamp with time zone,
16+
updated_by integer,
17+
CONSTRAINT chart_category_pkey PRIMARY KEY (id)
18+
);
19+
20+
21+
-- Sequence
22+
CREATE SEQUENCE IF NOT EXISTS id_seq_chart_category_mapping;
23+
24+
25+
-- DROP TABLE IF EXISTS public.chart_category_mapping;
26+
27+
CREATE TABLE IF NOT EXISTS public.chart_category_mapping
28+
(
29+
id integer NOT NULL DEFAULT nextval('id_seq_chart_category_mapping'::regclass),
30+
app_store_id integer,
31+
chart_category_id integer,
32+
deleted boolean NOT NULL,
33+
created_on timestamp with time zone,
34+
created_by integer,
35+
updated_on timestamp with time zone,
36+
updated_by integer,
37+
CONSTRAINT chart_category_mapping_pkey PRIMARY KEY (id),
38+
CONSTRAINT chart_category_mapping_app_store_id_fkey FOREIGN KEY (app_store_id)
39+
REFERENCES public.app_store (id) MATCH SIMPLE
40+
ON UPDATE NO ACTION
41+
ON DELETE NO ACTION,
42+
CONSTRAINT chart_category_mapping_chart_category_id_fkey FOREIGN KEY (chart_category_id)
43+
REFERENCES public.chart_category (id) MATCH SIMPLE
44+
ON UPDATE NO ACTION
45+
ON DELETE NO ACTION
46+
);
47+
48+
49+
50+
CREATE SEQUENCE IF NOT EXISTS id_seq_infrastructure_installation;
51+
52+
CREATE TABLE infrastructure_installation (
53+
id int4 NOT NULL DEFAULT nextval('id_seq_infrastructure_installation'::regclass),
54+
installation_type VARCHAR(255),
55+
installed_entity_type VARCHAR(64),
56+
installed_entity_id INT ,
57+
installation_name VARCHAR(128),
58+
"created_on" timestamptz,
59+
"created_by" integer,
60+
"updated_on" timestamptz,
61+
"updated_by" integer,
62+
"active" boolean,
63+
PRIMARY KEY ("id")
64+
);
65+
66+
CREATE SEQUENCE IF NOT EXISTS id_seq_infrastructure_installation_versions;
67+
68+
CREATE TABLE infrastructure_installation_versions (
69+
id int4 NOT NULL DEFAULT nextval('id_seq_infrastructure_installation_versions'::regclass),
70+
infrastructure_installation_id INT,
71+
installation_config TEXT,
72+
action INT ,
73+
apply_status VARCHAR(100),
74+
apply_status_message VARCHAR(200),
75+
"created_on" timestamptz,
76+
"created_by" integer,
77+
"updated_on" timestamptz,
78+
"updated_by" integer,
79+
"active" boolean,
80+
PRIMARY KEY ("id"),
81+
CONSTRAINT infrastructure_installation_id_fkey
82+
FOREIGN KEY("infrastructure_installation_id")
83+
REFERENCES"public"."infrastructure_installation" ("id")
84+
);
85+
86+
87+
COMMIT;

‎vendor/github.com/devtron-labs/common-lib/blob-storage/AwsS3Blob.go‎

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

‎vendor/github.com/devtron-labs/common-lib/blob-storage/BlobStorageService.go‎

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

0 commit comments

Comments
 (0)