merge develop here

Author: prakash100198

cmd/external-app/wire_gen.go

@@ -212,7 +212,7 @@ require (
 	github.com/nats-io/nats.go v1.28.0 // indirect
 	github.com/nats-io/nkeys v0.4.6 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
@@ -282,6 +282,8 @@ require (
 	xorm.io/xorm v1.0.3 // indirect
 )
 
+require github.com/docker/distribution v2.8.2+incompatible
+
 require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 
 replace (

go.mod

@@ -807,6 +807,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=
 github.com/docker/cli v24.0.6+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
+github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=

go.sum

@@ -244,6 +244,7 @@ func ConvertConfigDataToPipelineConfigData(r *bean.ConfigData) *pipelineConfigBe
 		DefaultExternalSecret: ConvertExternalSecretToPipelineExternalSecret(r.DefaultExternalSecret),
 		RoleARN:               r.RoleARN,
 		SubPath:               r.SubPath,
+		ESOSubPath:            r.ESOSubPath,
 		FilePermission:        r.FilePermission,
 		Overridden:            r.Overridden,
 	}
@@ -253,7 +254,7 @@ func ConvertESOSecretDataToPipelineESOSecretData(r bean.ESOSecretData) pipelineC
 	return pipelineConfigBean.ESOSecretData{
 		SecretStore:     r.SecretStore,
 		SecretStoreRef:  r.SecretStoreRef,
-		EsoData:         ConvertEsoDataToPipelineEsoData(r.EsoData),
+		ESOData:         ConvertEsoDataToPipelineEsoData(r.ESOData),
 		RefreshInterval: r.RefreshInterval,
 	}
 }
@@ -304,6 +305,7 @@ func ConvertPipelineConfigDataToConfigData(r *pipelineConfigBean.ConfigData) *be
 		DefaultExternalSecret: ConvertPipelineExternalSecretToExternalSecret(r.DefaultExternalSecret),
 		RoleARN:               r.RoleARN,
 		SubPath:               r.SubPath,
+		ESOSubPath:            r.ESOSubPath,
 		FilePermission:        r.FilePermission,
 		Overridden:            r.Overridden,
 	}
@@ -313,7 +315,7 @@ func ConvertPipelineESOSecretDataToESOSecretData(r pipelineConfigBean.ESOSecretD
 	return bean.ESOSecretData{
 		SecretStore:     r.SecretStore,
 		SecretStoreRef:  r.SecretStoreRef,
-		EsoData:         ConvertPipelineEsoDataToEsoData(r.EsoData),
+		ESOData:         ConvertPipelineEsoDataToEsoData(r.ESOData),
 		RefreshInterval: r.RefreshInterval,
 	}
 }