@@ -50,13 +50,9 @@ func ValidateJobV2(c echo.Context) error {
5050 logger .Info ("validate task config" )
5151 // decrypt mysql password
5252 if jobConfig .IsMysqlPasswordEncrypted {
53- jobConfig . SrcTaskConfig . MysqlConnectionConfig . MysqlPassword , err = handler . DecryptMysqlPassword (jobConfig .SrcTaskConfig . MysqlConnectionConfig . MysqlPassword , g . RsaPrivateKey )
53+ err := decryptPwd (jobConfig .SrcTaskConfig , jobConfig . DestTaskConfig )
5454 if nil != err {
55- return c .JSON (http .StatusInternalServerError , models .BuildBaseResp (fmt .Errorf ("decrypt src mysql password failed: %v" , err )))
56- }
57- jobConfig .DestTaskConfig .MysqlConnectionConfig .MysqlPassword , err = handler .DecryptMysqlPassword (jobConfig .DestTaskConfig .MysqlConnectionConfig .MysqlPassword , g .RsaPrivateKey )
58- if nil != err {
59- return c .JSON (http .StatusInternalServerError , models .BuildBaseResp (fmt .Errorf ("decrypt src mysql password failed: %v" , err )))
55+ return c .JSON (http .StatusInternalServerError , models .BuildBaseResp (err ))
6056 }
6157 }
6258
@@ -91,6 +87,19 @@ func apiJobConfigToNomadJobJson(apiJobConfig *models.ValidateJobReqV2) (resJson
9187 return resJson , nil
9288}
9389
90+ func decryptPwd (apiSrcTask * models.MysqlSrcTaskConfig , apiDestTask * models.MysqlDestTaskConfig ) (err error ) {
91+ // decrypt mysql password
92+ apiSrcTask .MysqlConnectionConfig .MysqlPassword , err = handler .DecryptMysqlPassword (apiSrcTask .MysqlConnectionConfig .MysqlPassword , g .RsaPrivateKey )
93+ if nil != err {
94+ return fmt .Errorf ("decrypt src mysql password failed: %v" , err )
95+ }
96+ apiDestTask .MysqlConnectionConfig .MysqlPassword , err = handler .DecryptMysqlPassword (apiDestTask .MysqlConnectionConfig .MysqlPassword , g .RsaPrivateKey )
97+ if nil != err {
98+ return fmt .Errorf ("decrypt src mysql password failed: %v" , err )
99+ }
100+ return
101+ }
102+
94103func validateTaskConfig (apiSrcTask * models.MysqlSrcTaskConfig , apiDestTask * models.MysqlDestTaskConfig ) ([]* models.MysqlTaskValidationReport , error ) {
95104 taskValidationRes := []* models.MysqlTaskValidationReport {}
96105 // validate src task
0 commit comments