CreateRemoteSource, CreateLocalSource -> Create

checker/check_test.go

@@ -407,7 +407,7 @@ func TestCheckErrors(t *testing.T) {
 	triggerChecker := TriggerChecker{
 		TriggerID: "SuperId",
 		Database:  dataBase,
-		Source:    local.CreateLocalSource(dataBase),
+		Source:    local.Create(dataBase),
 		Logger:    logger,
 		Config: &Config{
 			MetricsTTLSeconds: 10,
@@ -585,7 +585,7 @@ func TestIgnoreNodataToOk(t *testing.T) {
 	triggerChecker := TriggerChecker{
 		TriggerID: "SuperId",
 		Database:  dataBase,
-		Source:    local.CreateLocalSource(dataBase),
+		Source:    local.Create(dataBase),
 		Logger:    logger,
 		Config: &Config{
 			MetricsTTLSeconds: 3600,
@@ -680,7 +680,7 @@ func TestHandleTrigger(t *testing.T) {
 	triggerChecker := TriggerChecker{
 		TriggerID: "SuperId",
 		Database:  dataBase,
-		Source:    local.CreateLocalSource(dataBase),
+		Source:    local.Create(dataBase),
 		Logger:    logger,
 		Config: &Config{
 			MetricsTTLSeconds: 3600,
@@ -832,7 +832,7 @@ func TestHandleTrigger(t *testing.T) {
 		triggerChecker1 := TriggerChecker{
 			TriggerID: "SuperId",
 			Database:  dataBase,
-			Source:    local.CreateLocalSource(dataBase),
+			Source:    local.Create(dataBase),
 			Logger:    logger,
 			Config: &Config{
 				MetricsTTLSeconds: 3600,

checker/trigger_test.go

@@ -20,7 +20,7 @@ func TestInitTriggerChecker(t *testing.T) {
 	logger, _ := logging.GetLogger("Test")
 	config := &Config{}
 	dataBase := mock_moira_alert.NewMockDatabase(mockCtrl)
-	localSource := local.CreateLocalSource(dataBase)
+	localSource := local.Create(dataBase)
 	triggerID := "superId"
 	defer mockCtrl.Finish()
 

cmd/api/main.go

@@ -111,9 +111,9 @@ func main() {
 
 	logger.Infof("Start listening by address: [%s]", apiConfig.Listen)
 
-	localSource := local.CreateLocalSource(database)
+	localSource := local.Create(database)
 	remoteConfig := config.Remote.GetRemoteSourceSettings()
-	remoteSource := remote.CreateRemoteSource(remoteConfig)
+	remoteSource := remote.Create(remoteConfig)
 	metricSourceProvider := metricSource.CreateMetricSourceProvider(localSource, remoteSource)
 
 	httpHandler := handler.NewHandler(database, logger, searchIndex, apiConfig, metricSourceProvider, configFile)

cmd/checker/main.go

@@ -78,8 +78,8 @@ func main() {
 	database := redis.NewDatabase(logger, databaseSettings, redis.Checker)
 
 	remoteConfig := config.Remote.GetRemoteSourceSettings()
-	localSource := local.CreateLocalSource(database)
-	remoteSource := remote.CreateRemoteSource(remoteConfig)
+	localSource := local.Create(database)
+	remoteSource := remote.Create(remoteConfig)
 	metricSourceProvider := metricSource.CreateMetricSourceProvider(localSource, remoteSource)
 
 	isConfigured, _ := remoteSource.IsConfigured()

cmd/notifier/main.go

@@ -82,9 +82,9 @@ func main() {
 	databaseSettings := config.Redis.GetSettings()
 	database := redis.NewDatabase(logger, databaseSettings, redis.Notifier)
 
-	localSource := local.CreateLocalSource(database)
+	localSource := local.Create(database)
 	remoteConfig := config.Remote.GetRemoteSourceSettings()
-	remoteSource := remote.CreateRemoteSource(remoteConfig)
+	remoteSource := remote.Create(remoteConfig)
 	metricSourceProvider := metricSource.CreateMetricSourceProvider(localSource, remoteSource)
 
 	notifierConfig := config.Notifier.getSettings(logger)

integration_tests/notifier/notifier_test.go

@@ -78,7 +78,7 @@ func TestNotifier(t *testing.T) {
 	mockCtrl = gomock.NewController(t)
 	defer mockCtrl.Finish()
 	database := redis.NewDatabase(logger, redis.Config{Port: "6379", Host: "localhost"}, redis.Notifier)
-	metricsSourceProvider := metricSource.CreateMetricSourceProvider(local.CreateLocalSource(database), nil)
+	metricsSourceProvider := metricSource.CreateMetricSourceProvider(local.Create(database), nil)
 	database.SaveContact(&contact)
 	database.SaveSubscription(&subscription)
 	database.SaveTrigger(trigger.ID, &trigger)

metric_source/local/local.go

@@ -17,8 +17,8 @@ type Local struct {
 	dataBase moira.Database
 }
 
-// CreateLocalSource configures local metric source
-func CreateLocalSource(dataBase moira.Database) metricSource.MetricSource {
+// Create configures local metric source
+func Create(dataBase moira.Database) metricSource.MetricSource {
 	// configure carbon-api functions
 	functions.New(make(map[string]string))
 

metric_source/local/local_test.go

@@ -21,7 +21,7 @@ func init() {
 func TestEvaluateTarget(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	dataBase := mock_moira_alert.NewMockDatabase(mockCtrl)
-	localSource := CreateLocalSource(dataBase)
+	localSource := Create(dataBase)
 	defer mockCtrl.Finish()
 
 	pattern := "super.puper.pattern"
@@ -159,7 +159,7 @@ func TestEvaluateTarget(t *testing.T) {
 func TestLocal_IsConfigured(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	dataBase := mock_moira_alert.NewMockDatabase(mockCtrl)
-	localSource := CreateLocalSource(dataBase)
+	localSource := Create(dataBase)
 
 	Convey("Always true", t, func() {
 		actual, err := localSource.IsConfigured()

metric_source/remote/remote.go

@@ -28,8 +28,8 @@ type Remote struct {
 	client *http.Client
 }
 
-// CreateRemoteSource configures remote metric source
-func CreateRemoteSource(config *Config) metricSource.MetricSource {
+// Create configures remote metric source
+func Create(config *Config) metricSource.MetricSource {
 	return &Remote{
 		config: config,
 		client: &http.Client{Timeout: config.Timeout},

metric_source/remote/remote_test.go

@@ -11,14 +11,14 @@ import (
 
 func TestIsConfigured(t *testing.T) {
 	Convey("Remote is not configured", t, func() {
-		remote := CreateRemoteSource(&Config{URL: "", Enabled: true})
+		remote := Create(&Config{URL: "", Enabled: true})
 		isConfigured, err := remote.IsConfigured()
 		So(isConfigured, ShouldBeFalse)
 		So(err, ShouldResemble, ErrRemoteStorageDisabled)
 	})
 
 	Convey("Remote is configured", t, func() {
-		remote := CreateRemoteSource(&Config{URL: "http://host", Enabled: true})
+		remote := Create(&Config{URL: "http://host", Enabled: true})
 		isConfigured, err := remote.IsConfigured()
 		So(isConfigured, ShouldBeTrue)
 		So(err, ShouldBeEmpty)

notifier/notifier_test.go

@@ -179,7 +179,7 @@ func configureNotifier(t *testing.T) {
 	logger, _ = logging.GetLogger("Scheduler")
 	scheduler = mock_scheduler.NewMockScheduler(mockCtrl)
 	sender = mock_moira_alert.NewMockSender(mockCtrl)
-	metricsSourceProvider := metricSource.CreateMetricSourceProvider(local.CreateLocalSource(dataBase), nil)
+	metricsSourceProvider := metricSource.CreateMetricSourceProvider(local.Create(dataBase), nil)
 
 	notif = NewNotifier(dataBase, logger, config, notifierMetrics, metricsSourceProvider)
 	notif.scheduler = scheduler