From 60fef31748fde5e97f34dc7b01b817282ee46535 Mon Sep 17 00:00:00 2001 From: bergquist Date: Sat, 23 Feb 2019 23:39:05 +0100 Subject: [PATCH] moves social package to /login ref #14679 --- pkg/api/login_oauth.go | 2 +- pkg/cmd/grafana-server/server.go | 2 +- pkg/infra/usagestats/service.go | 2 +- pkg/{ => login}/social/common.go | 0 pkg/{ => login}/social/generic_oauth.go | 0 pkg/{ => login}/social/github_oauth.go | 0 pkg/{ => login}/social/gitlab_oauth.go | 0 pkg/{ => login}/social/google_oauth.go | 0 pkg/{ => login}/social/grafana_com_oauth.go | 0 pkg/{ => login}/social/social.go | 0 10 files changed, 3 insertions(+), 3 deletions(-) rename pkg/{ => login}/social/common.go (100%) rename pkg/{ => login}/social/generic_oauth.go (100%) rename pkg/{ => login}/social/github_oauth.go (100%) rename pkg/{ => login}/social/gitlab_oauth.go (100%) rename pkg/{ => login}/social/google_oauth.go (100%) rename pkg/{ => login}/social/grafana_com_oauth.go (100%) rename pkg/{ => login}/social/social.go (100%) diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go index 7d9537b4790..a4c4a064226 100644 --- a/pkg/api/login_oauth.go +++ b/pkg/api/login_oauth.go @@ -19,9 +19,9 @@ import ( "github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/login" + "github.com/grafana/grafana/pkg/login/social" m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" - "github.com/grafana/grafana/pkg/social" ) var ( diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go index a1db5cd4b4c..b4f0fa3a2d2 100644 --- a/pkg/cmd/grafana-server/server.go +++ b/pkg/cmd/grafana-server/server.go @@ -16,9 +16,9 @@ import ( "github.com/grafana/grafana/pkg/api/routing" "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/login" + "github.com/grafana/grafana/pkg/login/social" "github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/registry" - "github.com/grafana/grafana/pkg/social" "golang.org/x/sync/errgroup" diff --git a/pkg/infra/usagestats/service.go b/pkg/infra/usagestats/service.go index c2bf0d06349..ccebf6a17f4 100644 --- a/pkg/infra/usagestats/service.go +++ b/pkg/infra/usagestats/service.go @@ -5,8 +5,8 @@ import ( "time" "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/login/social" "github.com/grafana/grafana/pkg/services/sqlstore" - "github.com/grafana/grafana/pkg/social" "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/registry" diff --git a/pkg/social/common.go b/pkg/login/social/common.go similarity index 100% rename from pkg/social/common.go rename to pkg/login/social/common.go diff --git a/pkg/social/generic_oauth.go b/pkg/login/social/generic_oauth.go similarity index 100% rename from pkg/social/generic_oauth.go rename to pkg/login/social/generic_oauth.go diff --git a/pkg/social/github_oauth.go b/pkg/login/social/github_oauth.go similarity index 100% rename from pkg/social/github_oauth.go rename to pkg/login/social/github_oauth.go diff --git a/pkg/social/gitlab_oauth.go b/pkg/login/social/gitlab_oauth.go similarity index 100% rename from pkg/social/gitlab_oauth.go rename to pkg/login/social/gitlab_oauth.go diff --git a/pkg/social/google_oauth.go b/pkg/login/social/google_oauth.go similarity index 100% rename from pkg/social/google_oauth.go rename to pkg/login/social/google_oauth.go diff --git a/pkg/social/grafana_com_oauth.go b/pkg/login/social/grafana_com_oauth.go similarity index 100% rename from pkg/social/grafana_com_oauth.go rename to pkg/login/social/grafana_com_oauth.go diff --git a/pkg/social/social.go b/pkg/login/social/social.go similarity index 100% rename from pkg/social/social.go rename to pkg/login/social/social.go