Skip to content

Commit

Permalink
fix: change module root path to gojekfarm
Browse files Browse the repository at this point in the history
  • Loading branch information
Pardeep Bhatt committed Jun 26, 2023
1 parent f792f39 commit 2733b10
Show file tree
Hide file tree
Showing 321 changed files with 887 additions and 888 deletions.
2 changes: 1 addition & 1 deletion cmd/bootstrap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"fmt"
"os"

"github.com/runatlantis/atlantis/testdrive"
"github.com/gojekfarm/atlantis/testdrive"
"github.com/spf13/cobra"
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
homedir "github.com/mitchellh/go-homedir"
"github.com/moby/moby/pkg/fileutils"
"github.com/pkg/errors"
"github.com/runatlantis/atlantis/server"
"github.com/runatlantis/atlantis/server/core/config/valid"
"github.com/runatlantis/atlantis/server/events/vcs/bitbucketcloud"
"github.com/runatlantis/atlantis/server/logging"
"github.com/gojekfarm/atlantis/server"
"github.com/gojekfarm/atlantis/server/core/config/valid"
"github.com/gojekfarm/atlantis/server/events/vcs/bitbucketcloud"
"github.com/gojekfarm/atlantis/server/logging"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
8 changes: 4 additions & 4 deletions cmd/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"testing"

homedir "github.com/mitchellh/go-homedir"
"github.com/runatlantis/atlantis/server"
"github.com/runatlantis/atlantis/server/events/vcs/fixtures"
"github.com/runatlantis/atlantis/server/logging"
. "github.com/runatlantis/atlantis/testing"
"github.com/gojekfarm/atlantis/server"
"github.com/gojekfarm/atlantis/server/events/vcs/fixtures"
"github.com/gojekfarm/atlantis/server/logging"
. "github.com/gojekfarm/atlantis/testing"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"gopkg.in/yaml.v2"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/runatlantis/atlantis
module github.com/gojekfarm/atlantis

go 1.17

Expand Down
4 changes: 2 additions & 2 deletions main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package main
import (
"fmt"

"github.com/runatlantis/atlantis/cmd"
"github.com/runatlantis/atlantis/server/logging"
"github.com/gojekfarm/atlantis/cmd"
"github.com/gojekfarm/atlantis/server/logging"
"github.com/spf13/viper"
)

Expand Down
12 changes: 6 additions & 6 deletions server/controllers/api_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"net/http"
"strings"

"github.com/runatlantis/atlantis/server/core/locking"
"github.com/runatlantis/atlantis/server/events"
"github.com/runatlantis/atlantis/server/events/command"
"github.com/runatlantis/atlantis/server/events/models"
"github.com/runatlantis/atlantis/server/events/vcs"
"github.com/runatlantis/atlantis/server/logging"
"github.com/gojekfarm/atlantis/server/core/locking"
"github.com/gojekfarm/atlantis/server/events"
"github.com/gojekfarm/atlantis/server/events/command"
"github.com/gojekfarm/atlantis/server/events/models"
"github.com/gojekfarm/atlantis/server/events/vcs"
"github.com/gojekfarm/atlantis/server/logging"
"github.com/uber-go/tally"
"gopkg.in/go-playground/validator.v9"
)
Expand Down
22 changes: 11 additions & 11 deletions server/controllers/api_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ package controllers_test
import (
"bytes"
"encoding/json"
"github.com/runatlantis/atlantis/server/events/command"
"github.com/runatlantis/atlantis/server/events/models"
"github.com/gojekfarm/atlantis/server/events/command"
"github.com/gojekfarm/atlantis/server/events/models"
"net/http"
"net/http/httptest"
"testing"

. "github.com/petergtz/pegomock"
"github.com/runatlantis/atlantis/server/controllers"
. "github.com/runatlantis/atlantis/server/core/locking/mocks"
"github.com/runatlantis/atlantis/server/events"
. "github.com/runatlantis/atlantis/server/events/mocks"
. "github.com/runatlantis/atlantis/server/events/mocks/matchers"
. "github.com/runatlantis/atlantis/server/events/vcs/mocks"
"github.com/runatlantis/atlantis/server/logging"
"github.com/runatlantis/atlantis/server/metrics"
. "github.com/runatlantis/atlantis/testing"
"github.com/gojekfarm/atlantis/server/controllers"
. "github.com/gojekfarm/atlantis/server/core/locking/mocks"
"github.com/gojekfarm/atlantis/server/events"
. "github.com/gojekfarm/atlantis/server/events/mocks"
. "github.com/gojekfarm/atlantis/server/events/mocks/matchers"
. "github.com/gojekfarm/atlantis/server/events/vcs/mocks"
"github.com/gojekfarm/atlantis/server/logging"
"github.com/gojekfarm/atlantis/server/metrics"
. "github.com/gojekfarm/atlantis/testing"
)

const atlantisTokenHeader = "X-Atlantis-Token"
Expand Down
4 changes: 2 additions & 2 deletions server/controllers/events/azuredevops_request_validator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"testing"

. "github.com/petergtz/pegomock"
"github.com/runatlantis/atlantis/server/controllers/events"
. "github.com/runatlantis/atlantis/testing"
"github.com/gojekfarm/atlantis/server/controllers/events"
. "github.com/gojekfarm/atlantis/testing"
)

func TestAzureDevopsValidate_WithBasicAuthErr(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions server/controllers/events/events_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import (
"github.com/mcdafydd/go-azuredevops/azuredevops"
"github.com/microcosm-cc/bluemonday"
"github.com/pkg/errors"
"github.com/runatlantis/atlantis/server/events"
"github.com/runatlantis/atlantis/server/events/models"
"github.com/runatlantis/atlantis/server/events/vcs"
"github.com/runatlantis/atlantis/server/events/vcs/bitbucketcloud"
"github.com/runatlantis/atlantis/server/events/vcs/bitbucketserver"
"github.com/runatlantis/atlantis/server/logging"
"github.com/gojekfarm/atlantis/server/events"
"github.com/gojekfarm/atlantis/server/events/models"
"github.com/gojekfarm/atlantis/server/events/vcs"
"github.com/gojekfarm/atlantis/server/events/vcs/bitbucketcloud"
"github.com/gojekfarm/atlantis/server/events/vcs/bitbucketserver"
"github.com/gojekfarm/atlantis/server/logging"
"github.com/uber-go/tally"
gitlab "github.com/xanzy/go-gitlab"
)
Expand Down
46 changes: 23 additions & 23 deletions server/controllers/events/events_controller_e2e_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,29 @@ import (
"github.com/hashicorp/go-getter"
"github.com/hashicorp/go-version"
. "github.com/petergtz/pegomock"
"github.com/runatlantis/atlantis/server"
events_controllers "github.com/runatlantis/atlantis/server/controllers/events"
"github.com/runatlantis/atlantis/server/core/config"
"github.com/runatlantis/atlantis/server/core/config/valid"
"github.com/runatlantis/atlantis/server/core/db"
"github.com/runatlantis/atlantis/server/core/locking"
"github.com/runatlantis/atlantis/server/core/runtime"
runtimemocks "github.com/runatlantis/atlantis/server/core/runtime/mocks"
runtimematchers "github.com/runatlantis/atlantis/server/core/runtime/mocks/matchers"
"github.com/runatlantis/atlantis/server/core/runtime/policy"
"github.com/runatlantis/atlantis/server/core/terraform"
"github.com/runatlantis/atlantis/server/events"
"github.com/runatlantis/atlantis/server/events/command"
"github.com/runatlantis/atlantis/server/events/mocks"
"github.com/runatlantis/atlantis/server/events/mocks/matchers"
"github.com/runatlantis/atlantis/server/events/models"
"github.com/runatlantis/atlantis/server/events/vcs"
vcsmocks "github.com/runatlantis/atlantis/server/events/vcs/mocks"
"github.com/runatlantis/atlantis/server/events/webhooks"
jobmocks "github.com/runatlantis/atlantis/server/jobs/mocks"
"github.com/runatlantis/atlantis/server/logging"
"github.com/runatlantis/atlantis/server/metrics"
. "github.com/runatlantis/atlantis/testing"
"github.com/gojekfarm/atlantis/server"
events_controllers "github.com/gojekfarm/atlantis/server/controllers/events"
"github.com/gojekfarm/atlantis/server/core/config"
"github.com/gojekfarm/atlantis/server/core/config/valid"
"github.com/gojekfarm/atlantis/server/core/db"
"github.com/gojekfarm/atlantis/server/core/locking"
"github.com/gojekfarm/atlantis/server/core/runtime"
runtimemocks "github.com/gojekfarm/atlantis/server/core/runtime/mocks"
runtimematchers "github.com/gojekfarm/atlantis/server/core/runtime/mocks/matchers"
"github.com/gojekfarm/atlantis/server/core/runtime/policy"
"github.com/gojekfarm/atlantis/server/core/terraform"
"github.com/gojekfarm/atlantis/server/events"
"github.com/gojekfarm/atlantis/server/events/command"
"github.com/gojekfarm/atlantis/server/events/mocks"
"github.com/gojekfarm/atlantis/server/events/mocks/matchers"
"github.com/gojekfarm/atlantis/server/events/models"
"github.com/gojekfarm/atlantis/server/events/vcs"
vcsmocks "github.com/gojekfarm/atlantis/server/events/vcs/mocks"
"github.com/gojekfarm/atlantis/server/events/webhooks"
jobmocks "github.com/gojekfarm/atlantis/server/jobs/mocks"
"github.com/gojekfarm/atlantis/server/logging"
"github.com/gojekfarm/atlantis/server/metrics"
. "github.com/gojekfarm/atlantis/testing"
)

const ConftestVersion = "0.25.0"
Expand Down
20 changes: 10 additions & 10 deletions server/controllers/events/events_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ import (
"errors"
"fmt"
. "github.com/petergtz/pegomock"
events_controllers "github.com/runatlantis/atlantis/server/controllers/events"
"github.com/runatlantis/atlantis/server/controllers/events/mocks"
"github.com/runatlantis/atlantis/server/events"
emocks "github.com/runatlantis/atlantis/server/events/mocks"
"github.com/runatlantis/atlantis/server/events/mocks/matchers"
"github.com/runatlantis/atlantis/server/events/models"
vcsmocks "github.com/runatlantis/atlantis/server/events/vcs/mocks"
"github.com/runatlantis/atlantis/server/logging"
"github.com/runatlantis/atlantis/server/metrics"
. "github.com/runatlantis/atlantis/testing"
events_controllers "github.com/gojekfarm/atlantis/server/controllers/events"
"github.com/gojekfarm/atlantis/server/controllers/events/mocks"
"github.com/gojekfarm/atlantis/server/events"
emocks "github.com/gojekfarm/atlantis/server/events/mocks"
"github.com/gojekfarm/atlantis/server/events/mocks/matchers"
"github.com/gojekfarm/atlantis/server/events/models"
vcsmocks "github.com/gojekfarm/atlantis/server/events/vcs/mocks"
"github.com/gojekfarm/atlantis/server/logging"
"github.com/gojekfarm/atlantis/server/metrics"
. "github.com/gojekfarm/atlantis/testing"
gitlab "github.com/xanzy/go-gitlab"
"io"
"net/http"
Expand Down
4 changes: 2 additions & 2 deletions server/controllers/events/github_request_validator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"testing"

. "github.com/petergtz/pegomock"
"github.com/runatlantis/atlantis/server/controllers/events"
. "github.com/runatlantis/atlantis/testing"
"github.com/gojekfarm/atlantis/server/controllers/events"
. "github.com/gojekfarm/atlantis/testing"
)

func TestValidate_WithSecretErr(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions server/controllers/events/gitlab_request_parser_validator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"testing"

. "github.com/petergtz/pegomock"
"github.com/runatlantis/atlantis/server/controllers/events"
. "github.com/runatlantis/atlantis/testing"
"github.com/gojekfarm/atlantis/server/controllers/events"
. "github.com/gojekfarm/atlantis/testing"
gitlab "github.com/xanzy/go-gitlab"
)

Expand Down
6 changes: 3 additions & 3 deletions server/controllers/github_app_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"net/http"
"net/url"

"github.com/runatlantis/atlantis/server/controllers/templates"
"github.com/runatlantis/atlantis/server/events/vcs"
"github.com/runatlantis/atlantis/server/logging"
"github.com/gojekfarm/atlantis/server/controllers/templates"
"github.com/gojekfarm/atlantis/server/events/vcs"
"github.com/gojekfarm/atlantis/server/logging"
)

// GithubAppController handles the creation and setup of a new GitHub app
Expand Down
10 changes: 5 additions & 5 deletions server/controllers/jobs_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"net/url"

"github.com/gorilla/mux"
"github.com/runatlantis/atlantis/server/controllers/templates"
"github.com/runatlantis/atlantis/server/controllers/websocket"
"github.com/runatlantis/atlantis/server/core/locking"
"github.com/runatlantis/atlantis/server/logging"
"github.com/runatlantis/atlantis/server/metrics"
"github.com/gojekfarm/atlantis/server/controllers/templates"
"github.com/gojekfarm/atlantis/server/controllers/websocket"
"github.com/gojekfarm/atlantis/server/core/locking"
"github.com/gojekfarm/atlantis/server/logging"
"github.com/gojekfarm/atlantis/server/metrics"
"github.com/uber-go/tally"
)

Expand Down
12 changes: 6 additions & 6 deletions server/controllers/locks_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (
"net/http"
"net/url"

"github.com/runatlantis/atlantis/server/controllers/templates"
"github.com/gojekfarm/atlantis/server/controllers/templates"

"github.com/gorilla/mux"
"github.com/runatlantis/atlantis/server/core/locking"
"github.com/runatlantis/atlantis/server/events"
"github.com/runatlantis/atlantis/server/events/models"
"github.com/runatlantis/atlantis/server/events/vcs"
"github.com/runatlantis/atlantis/server/logging"
"github.com/gojekfarm/atlantis/server/core/locking"
"github.com/gojekfarm/atlantis/server/events"
"github.com/gojekfarm/atlantis/server/events/models"
"github.com/gojekfarm/atlantis/server/events/vcs"
"github.com/gojekfarm/atlantis/server/logging"
)

// LocksController handles all requests relating to Atlantis locks.
Expand Down
28 changes: 14 additions & 14 deletions server/controllers/locks_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@ import (
"testing"
"time"

"github.com/runatlantis/atlantis/server/controllers"
"github.com/runatlantis/atlantis/server/controllers/templates"
tMocks "github.com/runatlantis/atlantis/server/controllers/templates/mocks"
"github.com/runatlantis/atlantis/server/core/db"
"github.com/runatlantis/atlantis/server/core/locking"
"github.com/gojekfarm/atlantis/server/controllers"
"github.com/gojekfarm/atlantis/server/controllers/templates"
tMocks "github.com/gojekfarm/atlantis/server/controllers/templates/mocks"
"github.com/gojekfarm/atlantis/server/core/db"
"github.com/gojekfarm/atlantis/server/core/locking"

"github.com/gorilla/mux"
. "github.com/petergtz/pegomock"
"github.com/runatlantis/atlantis/server/events"

"github.com/runatlantis/atlantis/server/core/locking/mocks"
"github.com/runatlantis/atlantis/server/events/command"
mocks2 "github.com/runatlantis/atlantis/server/events/mocks"
"github.com/runatlantis/atlantis/server/events/models"
vcsmocks "github.com/runatlantis/atlantis/server/events/vcs/mocks"
"github.com/runatlantis/atlantis/server/logging"
. "github.com/runatlantis/atlantis/testing"
"github.com/gojekfarm/atlantis/server/events"

"github.com/gojekfarm/atlantis/server/core/locking/mocks"
"github.com/gojekfarm/atlantis/server/events/command"
mocks2 "github.com/gojekfarm/atlantis/server/events/mocks"
"github.com/gojekfarm/atlantis/server/events/models"
vcsmocks "github.com/gojekfarm/atlantis/server/events/vcs/mocks"
"github.com/gojekfarm/atlantis/server/logging"
. "github.com/gojekfarm/atlantis/testing"
)

func AnyRepo() models.Repo {
Expand Down
4 changes: 2 additions & 2 deletions server/controllers/status_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"net/http"

"github.com/runatlantis/atlantis/server/events"
"github.com/runatlantis/atlantis/server/logging"
"github.com/gojekfarm/atlantis/server/events"
"github.com/gojekfarm/atlantis/server/logging"
)

// StatusController handles the status of Atlantis.
Expand Down
8 changes: 4 additions & 4 deletions server/controllers/status_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"net/http/httptest"
"testing"

"github.com/runatlantis/atlantis/server/controllers"
"github.com/runatlantis/atlantis/server/events"
"github.com/runatlantis/atlantis/server/logging"
. "github.com/runatlantis/atlantis/testing"
"github.com/gojekfarm/atlantis/server/controllers"
"github.com/gojekfarm/atlantis/server/events"
"github.com/gojekfarm/atlantis/server/logging"
. "github.com/gojekfarm/atlantis/testing"
)

func TestStatusController_Startup(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion server/controllers/websocket/mux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/gorilla/websocket"
"github.com/pkg/errors"
"github.com/runatlantis/atlantis/server/logging"
"github.com/gojekfarm/atlantis/server/logging"
)

// PartitionKeyGenerator generates partition keys for the multiplexor
Expand Down
2 changes: 1 addition & 1 deletion server/controllers/websocket/writer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/gorilla/websocket"
"github.com/pkg/errors"
"github.com/runatlantis/atlantis/server/logging"
"github.com/gojekfarm/atlantis/server/logging"
)

func NewWriter(log logging.SimpleLogging) *Writer {
Expand Down
4 changes: 2 additions & 2 deletions server/core/config/parser_validator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
shlex "github.com/flynn-archive/go-shlex"
validation "github.com/go-ozzo/ozzo-validation"
"github.com/pkg/errors"
"github.com/runatlantis/atlantis/server/core/config/raw"
"github.com/runatlantis/atlantis/server/core/config/valid"
"github.com/gojekfarm/atlantis/server/core/config/raw"
"github.com/gojekfarm/atlantis/server/core/config/valid"
yaml "gopkg.in/yaml.v2"
)

Expand Down
6 changes: 3 additions & 3 deletions server/core/config/parser_validator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"testing"

"github.com/hashicorp/go-version"
"github.com/runatlantis/atlantis/server/core/config"
"github.com/runatlantis/atlantis/server/core/config/valid"
. "github.com/runatlantis/atlantis/testing"
"github.com/gojekfarm/atlantis/server/core/config"
"github.com/gojekfarm/atlantis/server/core/config/valid"
. "github.com/gojekfarm/atlantis/testing"
)

var globalCfgArgs = valid.GlobalCfgArgs{
Expand Down
Loading

0 comments on commit 2733b10

Please sign in to comment.