Skip to content

Commit

Permalink
Merge pull request #62 from artem-sidorenko/datasource
Browse files Browse the repository at this point in the history 
Refactoring: datasource is a better name for data sources
  • Loading branch information
@artem-sidorenko
artem-sidorenko authored Mar 12, 2019
2 parents a5d603c + 9773238 commit a79b18d
Show file tree
Hide file tree
Showing 44 changed files with 46 additions and 46 deletions.
4 changes: 2 additions & 2 deletions cli/commands/generate/generate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"github.com/artem-sidorenko/chagen/generator"

// some of connectors control functionality will be moved to source at some point
_ "github.com/artem-sidorenko/chagen/source"
"github.com/artem-sidorenko/chagen/source/connectors"
_ "github.com/artem-sidorenko/chagen/datasource"
"github.com/artem-sidorenko/chagen/datasource/connectors"

"github.com/urfave/cli"
)
Expand Down
0 source/connectors/connectors.go → datasource/connectors/connectors.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion source/connectors/connectors_test.go → datasource/connectors/connectors_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"testing"

"github.com/artem-sidorenko/chagen/data"
"github.com/artem-sidorenko/chagen/source/connectors"
"github.com/artem-sidorenko/chagen/datasource/connectors"

"github.com/urfave/cli"
)
Expand Down
4 changes: 2 additions & 2 deletions source/connectors/github/github.go → datasource/connectors/github/github.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"fmt"
"os"

"github.com/artem-sidorenko/chagen/source/connectors"
"github.com/artem-sidorenko/chagen/source/connectors/github/internal/client"
"github.com/artem-sidorenko/chagen/datasource/connectors"
"github.com/artem-sidorenko/chagen/datasource/connectors/github/internal/client"

"github.com/urfave/cli"
)
Expand Down
6 changes: 3 additions & 3 deletions source/connectors/github/github_test.go → datasource/connectors/github/github_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"reflect"
"testing"

"github.com/artem-sidorenko/chagen/datasource/connectors"
"github.com/artem-sidorenko/chagen/datasource/connectors/github"
"github.com/artem-sidorenko/chagen/datasource/connectors/github/internal/testclient"
tcli "github.com/artem-sidorenko/chagen/internal/testing/cli"
"github.com/artem-sidorenko/chagen/source/connectors"
"github.com/artem-sidorenko/chagen/source/connectors/github"
"github.com/artem-sidorenko/chagen/source/connectors/github/internal/testclient"
)

func setupTestConnector(
Expand Down
2 changes: 1 addition & 1 deletion source/connectors/github/helpers.go → datasource/connectors/github/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package github

import (
"github.com/artem-sidorenko/chagen/source/connectors/helpers"
"github.com/artem-sidorenko/chagen/datasource/connectors/helpers"
)

// formatErrorCode formats the error message for this connector
Expand Down
0 ...nnectors/github/internal/client/client.go → ...nnectors/github/internal/client/client.go
View file
File renamed without changes.
0 ...tors/github/internal/client/interfaces.go → ...tors/github/internal/client/interfaces.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../github/internal/testclient/generators.go → .../github/internal/testclient/generators.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"net/http"
"time"

"github.com/artem-sidorenko/chagen/source/connectors/helpers"
"github.com/artem-sidorenko/chagen/datasource/connectors/helpers"
"github.com/google/go-github/github"
)

Expand Down
0 ...ors/github/internal/testclient/helpers.go → ...ors/github/internal/testclient/helpers.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions .../github/internal/testclient/testclient.go → .../github/internal/testclient/testclient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"context"
"fmt"

"github.com/artem-sidorenko/chagen/source/connectors/github/internal/client"
"github.com/artem-sidorenko/chagen/source/connectors/internal/testing/apitestdata"
"github.com/artem-sidorenko/chagen/datasource/connectors/github/internal/client"
"github.com/artem-sidorenko/chagen/datasource/connectors/internal/testing/apitestdata"

"github.com/google/go-github/github"
)
Expand Down
2 changes: 1 addition & 1 deletion source/connectors/github/issues.go → datasource/connectors/github/issues.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"sync"

"github.com/artem-sidorenko/chagen/source/connectors/helpers"
"github.com/artem-sidorenko/chagen/datasource/connectors/helpers"

"github.com/artem-sidorenko/chagen/data"

Expand Down
4 changes: 2 additions & 2 deletions source/connectors/github/issues_test.go → datasource/connectors/github/issues_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"time"

"github.com/artem-sidorenko/chagen/data"
"github.com/artem-sidorenko/chagen/datasource/connectors/github"
"github.com/artem-sidorenko/chagen/datasource/connectors/github/internal/testclient"
"github.com/artem-sidorenko/chagen/internal/testing/helpers"
"github.com/artem-sidorenko/chagen/source/connectors/github"
"github.com/artem-sidorenko/chagen/source/connectors/github/internal/testclient"
)

func TestConnector_Issues(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion source/connectors/github/prs.go → datasource/connectors/github/prs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"sync"
"time"

"github.com/artem-sidorenko/chagen/source/connectors/helpers"
"github.com/artem-sidorenko/chagen/datasource/connectors/helpers"

"github.com/artem-sidorenko/chagen/data"

Expand Down
4 changes: 2 additions & 2 deletions source/connectors/github/prs_test.go → datasource/connectors/github/prs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"time"

"github.com/artem-sidorenko/chagen/data"
"github.com/artem-sidorenko/chagen/datasource/connectors/github"
"github.com/artem-sidorenko/chagen/datasource/connectors/github/internal/testclient"
"github.com/artem-sidorenko/chagen/internal/testing/helpers"
"github.com/artem-sidorenko/chagen/source/connectors/github"
"github.com/artem-sidorenko/chagen/source/connectors/github/internal/testclient"
)

func TestConnector_MRs(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion source/connectors/github/tags.go → datasource/connectors/github/tags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"sync"

"github.com/artem-sidorenko/chagen/source/connectors/helpers"
"github.com/artem-sidorenko/chagen/datasource/connectors/helpers"

"github.com/artem-sidorenko/chagen/data"

Expand Down
4 changes: 2 additions & 2 deletions source/connectors/github/tags_test.go → datasource/connectors/github/tags_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"time"

"github.com/artem-sidorenko/chagen/data"
"github.com/artem-sidorenko/chagen/datasource/connectors/github"
"github.com/artem-sidorenko/chagen/datasource/connectors/github/internal/testclient"
"github.com/artem-sidorenko/chagen/internal/testing/helpers"
"github.com/artem-sidorenko/chagen/source/connectors/github"
"github.com/artem-sidorenko/chagen/source/connectors/github/internal/testclient"
)

func TestConnector_Tags(t *testing.T) {
Expand Down
0 source/connectors/github/urls.go → datasource/connectors/github/urls.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion source/connectors/github/urls_test.go → datasource/connectors/github/urls_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package github_test
import (
"testing"

"github.com/artem-sidorenko/chagen/source/connectors/github/internal/testclient"
"github.com/artem-sidorenko/chagen/datasource/connectors/github/internal/testclient"
)

func TestGetNewTagURL(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions source/connectors/gitlab/gitlab.go → datasource/connectors/gitlab/gitlab.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"fmt"
"os"

"github.com/artem-sidorenko/chagen/source/connectors"
"github.com/artem-sidorenko/chagen/source/connectors/gitlab/internal/client"
"github.com/artem-sidorenko/chagen/datasource/connectors"
"github.com/artem-sidorenko/chagen/datasource/connectors/gitlab/internal/client"

"github.com/urfave/cli"
)
Expand Down
6 changes: 3 additions & 3 deletions source/connectors/gitlab/gitlab_test.go → datasource/connectors/gitlab/gitlab_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"reflect"
"testing"

"github.com/artem-sidorenko/chagen/datasource/connectors"
"github.com/artem-sidorenko/chagen/datasource/connectors/gitlab"
"github.com/artem-sidorenko/chagen/datasource/connectors/gitlab/internal/testclient"
tcli "github.com/artem-sidorenko/chagen/internal/testing/cli"
"github.com/artem-sidorenko/chagen/source/connectors"
"github.com/artem-sidorenko/chagen/source/connectors/gitlab"
"github.com/artem-sidorenko/chagen/source/connectors/gitlab/internal/testclient"
)

func setupTestConnector(
Expand Down
2 changes: 1 addition & 1 deletion source/connectors/gitlab/helpers.go → datasource/connectors/gitlab/helpers.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gitlab

import (
"github.com/artem-sidorenko/chagen/source/connectors/helpers"
"github.com/artem-sidorenko/chagen/datasource/connectors/helpers"
)

// formatErrorCode formats the error message for this connector
Expand Down
0 ...nnectors/gitlab/internal/client/client.go → ...nnectors/gitlab/internal/client/client.go
View file
File renamed without changes.
0 ...tors/gitlab/internal/client/interfaces.go → ...tors/gitlab/internal/client/interfaces.go
View file
File renamed without changes.
0 .../gitlab/internal/testclient/generators.go → .../gitlab/internal/testclient/generators.go
View file
File renamed without changes.
0 ...ors/gitlab/internal/testclient/helpers.go → ...ors/gitlab/internal/testclient/helpers.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions .../gitlab/internal/testclient/testclient.go → .../gitlab/internal/testclient/testclient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"fmt"
"time"

"github.com/artem-sidorenko/chagen/source/connectors/gitlab/internal/client"
"github.com/artem-sidorenko/chagen/source/connectors/internal/testing/apitestdata"
"github.com/artem-sidorenko/chagen/datasource/connectors/gitlab/internal/client"
"github.com/artem-sidorenko/chagen/datasource/connectors/internal/testing/apitestdata"

gitlab "github.com/xanzy/go-gitlab"
)
Expand Down
2 changes: 1 addition & 1 deletion source/connectors/gitlab/issues.go → datasource/connectors/gitlab/issues.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"sync"

"github.com/artem-sidorenko/chagen/data"
"github.com/artem-sidorenko/chagen/source/connectors/helpers"
"github.com/artem-sidorenko/chagen/datasource/connectors/helpers"
gitlab "github.com/xanzy/go-gitlab"
)

Expand Down
4 changes: 2 additions & 2 deletions source/connectors/gitlab/issues_test.go → datasource/connectors/gitlab/issues_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"time"

"github.com/artem-sidorenko/chagen/data"
"github.com/artem-sidorenko/chagen/datasource/connectors/gitlab"
"github.com/artem-sidorenko/chagen/datasource/connectors/gitlab/internal/testclient"
"github.com/artem-sidorenko/chagen/internal/testing/helpers"
"github.com/artem-sidorenko/chagen/source/connectors/gitlab"
"github.com/artem-sidorenko/chagen/source/connectors/gitlab/internal/testclient"
)

func TestConnector_Issues(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion source/connectors/gitlab/mrs.go → datasource/connectors/gitlab/mrs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

gitlab "github.com/xanzy/go-gitlab"

"github.com/artem-sidorenko/chagen/source/connectors/helpers"
"github.com/artem-sidorenko/chagen/datasource/connectors/helpers"

"github.com/artem-sidorenko/chagen/data"
)
Expand Down
4 changes: 2 additions & 2 deletions source/connectors/gitlab/mrs_test.go → datasource/connectors/gitlab/mrs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"time"

"github.com/artem-sidorenko/chagen/data"
"github.com/artem-sidorenko/chagen/datasource/connectors/gitlab"
"github.com/artem-sidorenko/chagen/datasource/connectors/gitlab/internal/testclient"
"github.com/artem-sidorenko/chagen/internal/testing/helpers"
"github.com/artem-sidorenko/chagen/source/connectors/gitlab"
"github.com/artem-sidorenko/chagen/source/connectors/gitlab/internal/testclient"
)

func TestConnector_MRs(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion source/connectors/gitlab/tags.go → datasource/connectors/gitlab/tags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"sync"

"github.com/artem-sidorenko/chagen/source/connectors/helpers"
"github.com/artem-sidorenko/chagen/datasource/connectors/helpers"

"github.com/artem-sidorenko/chagen/data"
gitlab "github.com/xanzy/go-gitlab"
Expand Down
4 changes: 2 additions & 2 deletions source/connectors/gitlab/tags_test.go → datasource/connectors/gitlab/tags_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"time"

"github.com/artem-sidorenko/chagen/data"
"github.com/artem-sidorenko/chagen/datasource/connectors/gitlab"
"github.com/artem-sidorenko/chagen/datasource/connectors/gitlab/internal/testclient"
"github.com/artem-sidorenko/chagen/internal/testing/helpers"
"github.com/artem-sidorenko/chagen/source/connectors/gitlab"
"github.com/artem-sidorenko/chagen/source/connectors/gitlab/internal/testclient"
)

func TestConnector_Tags(t *testing.T) {
Expand Down
0 source/connectors/gitlab/urls.go → datasource/connectors/gitlab/urls.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion source/connectors/gitlab/urls_test.go → datasource/connectors/gitlab/urls_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package gitlab_test
import (
"testing"

"github.com/artem-sidorenko/chagen/source/connectors/gitlab/internal/testclient"
"github.com/artem-sidorenko/chagen/datasource/connectors/gitlab/internal/testclient"
)

func TestGetNewTagURL(t *testing.T) {
Expand Down
0 source/connectors/helpers/helpers.go → datasource/connectors/helpers/helpers.go
View file
File renamed without changes.
0 source/connectors/interface.go → datasource/connectors/interface.go
View file
File renamed without changes.
0 ...ternal/testing/apitestdata/apitestdata.go → ...ternal/testing/apitestdata/apitestdata.go
View file
File renamed without changes.
0 ...s/internal/testing/apitestdata/commits.go → ...s/internal/testing/apitestdata/commits.go
View file
File renamed without changes.
0 ...rs/internal/testing/apitestdata/issues.go → ...rs/internal/testing/apitestdata/issues.go
View file
File renamed without changes.
0 ...ctors/internal/testing/apitestdata/mrs.go → ...ctors/internal/testing/apitestdata/mrs.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tors/internal/testing/apitestdata/tags.go → ...tors/internal/testing/apitestdata/tags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package apitestdata
import (
"time"

"github.com/artem-sidorenko/chagen/source/connectors/helpers"
"github.com/artem-sidorenko/chagen/datasource/connectors/helpers"
)

// Tag describes a struct with tag information
Expand Down
8 changes: 4 additions & 4 deletions source/source.go → datasource/datasource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
limitations under the License.
*/

// Package source provides the data source functionality
package source
// Package datasource provides the data source functionality
package datasource

import (
_ "github.com/artem-sidorenko/chagen/source/connectors/github" //enable github
_ "github.com/artem-sidorenko/chagen/source/connectors/gitlab" //enable gitlab
_ "github.com/artem-sidorenko/chagen/datasource/connectors/github" //enable github
_ "github.com/artem-sidorenko/chagen/datasource/connectors/gitlab" //enable gitlab
)
2 changes: 1 addition & 1 deletion internal/testing/testconnector/testconnector.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"time"

"github.com/artem-sidorenko/chagen/data"
"github.com/artem-sidorenko/chagen/datasource/connectors"
"github.com/artem-sidorenko/chagen/internal/testing/testconnector/testdata"
"github.com/artem-sidorenko/chagen/source/connectors"

"github.com/urfave/cli"
)
Expand Down

0 comments on commit a79b18d

Please sign in to comment.