Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:reportportal/service-index into …
Browse files Browse the repository at this point in the history
…develop

# Conflicts:
#	go.mod
#	go.sum
  • Loading branch information
avarabyeu committed May 24, 2024
2 parents 22aca24 + e817bd4 commit 1391df3
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/sync-jira-versions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Add GitHub release version to Jira issues

on:
pull_request:
types: [opened, synchronize, reopened]

jobs:
call-jira-sync:
name: Call Jira versions update
uses: reportportal/.github/.github/workflows/update-jira-versions.yaml@main
with:
jira-server: ${{ vars.JIRA_SERVER }}
secrets: inherit
8 changes: 4 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,20 @@ func main() {
http.Redirect(w, rq, rpCfg.Path+"/ui/#notfound", http.StatusFound)
})

router.HandleFunc("/composite/info", func(w http.ResponseWriter, r *http.Request) {
router.HandleFunc(rpCfg.Path+"/composite/info", func(w http.ResponseWriter, r *http.Request) {
if err := server.WriteJSON(http.StatusOK, aggreg.AggregateInfo(), w); nil != err {
log.Error(err)
}
})
router.HandleFunc("/composite/health", func(w http.ResponseWriter, r *http.Request) {
router.HandleFunc(rpCfg.Path+"/composite/health", func(w http.ResponseWriter, r *http.Request) {
if err := server.WriteJSON(http.StatusOK, aggreg.AggregateHealth(), w); nil != err {
log.Error(err)
}
})
router.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
router.HandleFunc(rpCfg.Path+"/", func(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, rpCfg.Path+"/ui/", http.StatusFound)
})
router.HandleFunc("/ui", func(w http.ResponseWriter, r *http.Request) {
router.HandleFunc(rpCfg.Path+"/ui", func(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, rpCfg.Path+"/ui/", http.StatusFound)
})
})
Expand Down

0 comments on commit 1391df3

Please sign in to comment.