@@ -116,18 +116,29 @@ public ValidationRequest validate( PromoteRequest request, ValidationResult resu
116116 {
117117 ValidationRuleSet set = validationsManager .getRuleSetMatching ( request .getTargetKey () );
118118
119- final ArtifactStore store = getRequestStore ( request , baseUrl );
120- final ValidationRequest req = new ValidationRequest ( request , set , validationTools , store );
119+ ArtifactStore source ;
120+ try
121+ {
122+ source = storeDataMgr .getArtifactStore ( request .getSource () );
123+ }
124+ catch ( IndyDataException e )
125+ {
126+ throw new PromotionValidationException (
127+ String .format ( "Failed to retrieve source ArtifactStore: %s for validation" , request .getSource () ),
128+ e );
129+ }
121130
122131 if ( set != null )
123132 {
124-
133+
125134 logger .debug ( "Running validation rule-set for promotion: {}" , set .getName () );
126135
127136 result .setRuleSet ( set .getName () );
128137 List <String > ruleNames = set .getRuleNames ();
129138 if ( ruleNames != null && !ruleNames .isEmpty () )
130139 {
140+ final ArtifactStore store = getRequestStore ( request , baseUrl );
141+ final ValidationRequest req = new ValidationRequest ( request , set , validationTools , store );
131142 try
132143 {
133144 DrainingExecutorCompletionService <PromotionValidationException > svc =
@@ -202,15 +213,19 @@ public ValidationRequest validate( PromoteRequest request, ValidationResult resu
202213 }
203214 }
204215 }
205-
216+ return req ;
217+ }
218+ else
219+ {
220+ logger .info ( "No validation rules are defined for: {}" , request .getTargetKey () );
221+ return new ValidationRequest ( request , set , validationTools , source );
206222 }
207223 }
208224 else
209225 {
210226 logger .info ( "No validation rule-sets are defined for: {}" , request .getTargetKey () );
227+ return new ValidationRequest ( request , set , validationTools , source );
211228 }
212-
213- return req ;
214229 }
215230
216231 @ Measure
0 commit comments