Skip to content

Bugfix/2329 workspace and http backend #2357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .dredd/hooks/capabilities.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"strings"

"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/db"
trans "github.com/snikch/goodman/transaction"
)

Expand Down
12 changes: 6 additions & 6 deletions .dredd/hooks/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"os"
"time"

"github.com/ansible-semaphore/semaphore/db"
"github.com/ansible-semaphore/semaphore/db/bolt"
"github.com/ansible-semaphore/semaphore/db/factory"
"github.com/ansible-semaphore/semaphore/db/sql"
"github.com/ansible-semaphore/semaphore/pkg/random"
"github.com/ansible-semaphore/semaphore/util"
"github.com/go-gorp/gorp/v3"
"github.com/semaphoreui/semaphore/db"
"github.com/semaphoreui/semaphore/db/bolt"
"github.com/semaphoreui/semaphore/db/factory"
"github.com/semaphoreui/semaphore/db/sql"
"github.com/semaphoreui/semaphore/pkg/random"
"github.com/semaphoreui/semaphore/util"
"github.com/snikch/goodman/transaction"
)

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ When creating a pull-request you should:

1) Set up GOPATH, GOBIN and Workspace.
```
mkdir -p $GOPATH/src/github.com/ansible-semaphore && cd $GOPATH/src/github.com/ansible-semaphore
mkdir -p $GOPATH/src/github.com/semaphoreui && cd $GOPATH/src/github.com/semaphoreui
```

2) Clone semaphore (with submodules)

```
git clone --recursive [email protected]:ansible-semaphore/semaphore.git && cd semaphore
git clone --recursive [email protected]:semaphoreui/semaphore.git && cd semaphore
```

3) Install dev dependencies
Expand Down
6 changes: 3 additions & 3 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ tasks:
desc: Installs nodejs requirements
dir: web
cmds:
- npm install
- npm install --no-optional

build:
desc: Build a full set of release binaries and packages
Expand All @@ -68,7 +68,7 @@ tasks:
sh: git log --pretty=format:'%h' -n 1
VERSION: "{{ if eq .GITHUB_REF_TYPE \"tag\" }}{{ .GITHUB_REF_NAME }}{{ else }}{{ .TAG }}{{ end }}"
DATE: "{{ now | unixEpoch }}"
IMPORT: "github.com/ansible-semaphore/semaphore"
IMPORT: "github.com/semaphoreui/semaphore"

build:fe:
desc: Build VueJS project
Expand Down Expand Up @@ -105,7 +105,7 @@ tasks:
sh: git log --pretty=format:'%h' -n 1
VERSION: "{{ if eq .GITHUB_REF_TYPE \"tag\" }}{{ .GITHUB_REF_NAME }}{{ else }}{{ .TAG }}{{ end }}"
DATE: "{{ now | unixEpoch }}"
IMPORT: "github.com/ansible-semaphore/semaphore"
IMPORT: "github.com/semaphoreui/semaphore"

lint:
cmds:
Expand Down
6 changes: 3 additions & 3 deletions api/apps.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/ansible-semaphore/semaphore/util"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/semaphoreui/semaphore/util"
"github.com/gorilla/context"
"net/http"
"reflect"
Expand Down
6 changes: 3 additions & 3 deletions api/auth.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package api

import (
"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/ansible-semaphore/semaphore/util"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/semaphoreui/semaphore/util"
"github.com/gorilla/context"
log "github.com/sirupsen/logrus"
"net/http"
Expand Down
4 changes: 2 additions & 2 deletions api/events.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package api

import (
"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"net/http"

"github.com/gorilla/context"
Expand Down
2 changes: 1 addition & 1 deletion api/helpers/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package helpers
import (
"net/http"

"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/db"
"github.com/gorilla/context"
)

Expand Down
2 changes: 1 addition & 1 deletion api/helpers/event_log.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package helpers
import (
"net/http"

"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/db"
log "github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions api/helpers/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/ansible-semaphore/semaphore/services/tasks"
"github.com/semaphoreui/semaphore/services/tasks"
"net/http"
"net/url"
"runtime/debug"
Expand All @@ -14,7 +14,7 @@ import (
"github.com/gorilla/context"
log "github.com/sirupsen/logrus"

"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/db"

"github.com/gorilla/mux"
)
Expand Down
6 changes: 3 additions & 3 deletions api/integration.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"crypto/sha256"
"encoding/json"
"fmt"
"github.com/ansible-semaphore/semaphore/util"
"github.com/semaphoreui/semaphore/util"
"io"
"net/http"
"strings"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
log "github.com/sirupsen/logrus"
"github.com/thedevsaddam/gojsonq/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion api/integration_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package api

import (
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/db"
"net/http"
"testing"
)
Expand Down
8 changes: 4 additions & 4 deletions api/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (
"text/template"
"time"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/ansible-semaphore/semaphore/pkg/random"
"github.com/ansible-semaphore/semaphore/util"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/semaphoreui/semaphore/pkg/random"
"github.com/semaphoreui/semaphore/util"
"github.com/coreos/go-oidc/v3/oidc"
"github.com/go-ldap/ldap/v3"
"github.com/gorilla/mux"
Expand Down
4 changes: 2 additions & 2 deletions api/options.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package api

import (
"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/gorilla/context"
"net/http"
)
Expand Down
6 changes: 3 additions & 3 deletions api/projects/backupRestore.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package projects
import (
"net/http"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
projectService "github.com/ansible-semaphore/semaphore/services/project"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
projectService "github.com/semaphoreui/semaphore/services/project"
"github.com/gorilla/context"
log "github.com/sirupsen/logrus"
)
Expand Down
4 changes: 2 additions & 2 deletions api/projects/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package projects

import (
"fmt"
"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"net/http"

"github.com/gorilla/context"
Expand Down
4 changes: 2 additions & 2 deletions api/projects/integration.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

log "github.com/sirupsen/logrus"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/gorilla/context"
)

Expand Down
8 changes: 4 additions & 4 deletions api/projects/integrationalias.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"net/http"
"strings"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/ansible-semaphore/semaphore/pkg/random"
"github.com/ansible-semaphore/semaphore/util"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/semaphoreui/semaphore/pkg/random"
"github.com/semaphoreui/semaphore/util"
"github.com/gorilla/context"
)

Expand Down
4 changes: 2 additions & 2 deletions api/projects/integrationextractvalue.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net/http"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/gorilla/context"
log "github.com/sirupsen/logrus"
)
Expand Down
4 changes: 2 additions & 2 deletions api/projects/integrationmatcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"net/http"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/gorilla/context"
log "github.com/sirupsen/logrus"
)
Expand Down
4 changes: 2 additions & 2 deletions api/projects/inventory.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"net/http"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"

"os"
"path/filepath"
Expand Down
4 changes: 2 additions & 2 deletions api/projects/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net/http"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"

"github.com/gorilla/context"
)
Expand Down
4 changes: 2 additions & 2 deletions api/projects/project.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package projects

import (
"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/gorilla/mux"
"net/http"

Expand Down
6 changes: 3 additions & 3 deletions api/projects/projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package projects
import (
"net/http"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/ansible-semaphore/semaphore/util"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/semaphoreui/semaphore/util"
log "github.com/sirupsen/logrus"

"github.com/gorilla/context"
Expand Down
6 changes: 3 additions & 3 deletions api/projects/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"net/http"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/ansible-semaphore/semaphore/util"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/semaphoreui/semaphore/util"
"github.com/gorilla/context"
)

Expand Down
6 changes: 3 additions & 3 deletions api/projects/schedules.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"net/http"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/ansible-semaphore/semaphore/services/schedules"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/semaphoreui/semaphore/services/schedules"
"github.com/gorilla/context"
)

Expand Down
8 changes: 4 additions & 4 deletions api/projects/tasks.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package projects

import (
"errors"
"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/ansible-semaphore/semaphore/services/tasks"
"github.com/ansible-semaphore/semaphore/util"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/semaphoreui/semaphore/services/tasks"
"github.com/semaphoreui/semaphore/util"
"github.com/gorilla/context"
log "github.com/sirupsen/logrus"
"net/http"
Expand Down
6 changes: 3 additions & 3 deletions api/projects/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package projects

import (
"fmt"
"github.com/ansible-semaphore/semaphore/util"
"github.com/semaphoreui/semaphore/util"
"net/http"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/gorilla/context"
log "github.com/sirupsen/logrus"
)
Expand Down
4 changes: 2 additions & 2 deletions api/projects/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net/http"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"
"github.com/gorilla/context"
)

Expand Down
4 changes: 2 additions & 2 deletions api/projects/views.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net/http"

"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
"github.com/semaphoreui/semaphore/api/helpers"
"github.com/semaphoreui/semaphore/db"

"github.com/gorilla/context"
)
Expand Down
Loading