From f438b94a38112601efde69423039c518ba2cd8ab Mon Sep 17 00:00:00 2001
From: kartik-579 <84493919+kartik-579@users.noreply.github.com>
Date: Wed, 11 Oct 2023 19:57:15 +0530
Subject: [PATCH] Oss sync (#526)

* chore: moved k8s library to common-lib and added scripts for adding sshTunnel config to clusters (#3848)

* added db scripts for cluster table

* updated script

* renamed script no

* changed sql script

* wip

* updated dependency

* wip

* bumped common-lib-version

* updated vendor

* vendor files

* updated sql script no.

* added insecureTls connection param in kubelink requests

* updated sql script no.

* added argoproj assets

* wip

* added argoproj files

* updated .gitignore

* updated sql script no

* updated sql script no

* shifted common-lib to major version import

* check for active ci_pipeline_material (#4072)

---------

Co-authored-by: Ashish-devtron <123808329+Ashish-devtron@users.noreply.github.com>
---
 internal/sql/repository/pipelineConfig/CiPipelineRepository.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/internal/sql/repository/pipelineConfig/CiPipelineRepository.go b/internal/sql/repository/pipelineConfig/CiPipelineRepository.go
index 2139d4349a3..e2a6c515294 100644
--- a/internal/sql/repository/pipelineConfig/CiPipelineRepository.go
+++ b/internal/sql/repository/pipelineConfig/CiPipelineRepository.go
@@ -295,6 +295,9 @@ func (impl CiPipelineRepositoryImpl) FindById(id int) (pipeline *CiPipeline, err
 	pipeline = &CiPipeline{Id: id}
 	err = impl.dbConnection.Model(pipeline).
 		Column("ci_pipeline.*", "App", "CiPipelineMaterials", "CiTemplate", "CiTemplate.DockerRegistry", "CiPipelineMaterials.GitMaterial").
+		Relation("CiPipelineMaterials", func(q *orm.Query) (query *orm.Query, err error) {
+			return q.Where("(ci_pipeline_material.active=true)"), nil
+		}).
 		Where("ci_pipeline.id= ?", id).
 		Where("ci_pipeline.deleted =? ", false).
 		Select()