icecheng/freeleaps-ops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(argo): enhance ciOriginUrl construction in ArgoApplicationVersionUpdater to handle optional port in repository URL

Browse Source 
Signed-off-by: zhenyus <zhenyus@mathmast.com>
This commit is contained in:
zhenyus 2025-06-23 16:16:08 +08:00
parent decc7e90f9
commit 190c20cae0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
first-class-pipeline/src/com/freeleaps/devops/ArgoApplicationVersionUpdater.groovy
View File

@ -55,7 +55,11 @@ class ArgoApplicationVersionUpdater {
if (userSpecifiedArgoControlledRepo) { if (userSpecifiedArgoControlledRepo) {
// argoControlledRepo is a git url, so we need add username and password to the url // argoControlledRepo is a git url, so we need add username and password to the url
def argoControlledRepoUrlObj = new URL(component.argoControlledRepo) def argoControlledRepoUrlObj = new URL(component.argoControlledRepo)
ciOriginUrl = "${argoControlledRepoUrlObj.protocol}://${steps.env.OPS_GIT_USERNAME}:${steps.env.OPS_GIT_PASSWORD}@${argoControlledRepoUrlObj.host}${argoControlledRepoUrlObj.path}" if (argoControlledRepoUrlObj.port != null) {
ciOriginUrl = "${argoControlledRepoUrlObj.protocol}://${steps.env.OPS_GIT_USERNAME}:${steps.env.OPS_GIT_PASSWORD}@${argoControlledRepoUrlObj.host}:${argoControlledRepoUrlObj.port}${argoControlledRepoUrlObj.path}"
} else {
ciOriginUrl = "${argoControlledRepoUrlObj.protocol}://${steps.env.OPS_GIT_USERNAME}:${steps.env.OPS_GIT_PASSWORD}@${argoControlledRepoUrlObj.host}${argoControlledRepoUrlObj.path}"
}
} }
steps.sh """ steps.sh """
#!/bin/bash #!/bin/bash