cloud: added group replacement;

pkg/application/app.go

@@ -45,6 +45,7 @@ func Default(options ...Option) kernel.Kernel {
 		WithMetadataServer,
 		WithConsumerMessagesPerRunnerMetrics,
 		WithKernelSettingsFromConfig,
+		WithLoggerGroupTag,
 		WithLoggerApplicationTag,
 		WithLoggerContextFieldsMessageEncoder,
 		WithLoggerContextFieldsResolver(log.ContextLoggerFieldsResolver),

pkg/application/options.go

@@ -178,6 +178,18 @@ func WithKernelSettingsFromConfig(app *App) {
 	})
 }
 
+func WithLoggerGroupTag(app *App) {
+	app.addLoggerOption(func(config cfg.GosoConf, logger log.GosoLogger) error {
+		if !config.IsSet("app_group") {
+			return errors.New("can not get application group from config to set it on logger")
+		}
+
+		return logger.Option(log.WithFields(map[string]interface{}{
+			"group": config.GetString("app_group"),
+		}))
+	})
+}
+
 func WithLoggerApplicationTag(app *App) {
 	app.addLoggerOption(func(config cfg.GosoConf, logger log.GosoLogger) error {
 		if !config.IsSet("app_name") {

pkg/application/testdata/config.dist.yml

@@ -1,5 +1,6 @@
 env: test
 
 app_name: test_app
+app_group: test_group
 app_project: test_project
 app_family: test_family

pkg/cfg/application_identifiers.go

@@ -1,11 +1,16 @@
 package cfg
 
-import "fmt"
+import (
+	"strings"
+
+	"github.com/justtrackio/gosoline/pkg/funk"
+)
 
 type AppId struct {
 	Project     string `cfg:"project" default:"{app_project}" json:"project"`
 	Environment string `cfg:"environment" default:"{env}" json:"environment"`
 	Family      string `cfg:"family" default:"{app_family}" json:"family"`
+	Group       string `cfg:"group" default:"{app_group}" json:"group"`
 	Application string `cfg:"application" default:"{app_name}" json:"application"`
 }
 
@@ -14,6 +19,7 @@ func GetAppIdFromConfig(config Config) AppId {
 		Project:     config.GetString("app_project"),
 		Environment: config.GetString("env"),
 		Family:      config.GetString("app_family"),
+		Group:       config.GetString("app_group"),
 		Application: config.GetString("app_name"),
 	}
 }
@@ -31,11 +37,20 @@ func (i *AppId) PadFromConfig(config Config) {
 		i.Family = config.GetString("app_family")
 	}
 
+	if len(i.Group) == 0 {
+		i.Group = config.GetString("app_group")
+	}
+
 	if len(i.Application) == 0 {
 		i.Application = config.GetString("app_name")
 	}
 }
 
 func (i *AppId) String() string {
-	return fmt.Sprintf("%s-%s-%s-%s", i.Project, i.Environment, i.Family, i.Application)
+	elements := []string{i.Project, i.Environment, i.Family, i.Group, i.Application}
+	elements = funk.Filter(elements, func(element string) bool {
+		return len(element) > 0
+	})
+
+	return strings.Join(elements, "-")
 }

pkg/cfg/application_identifiers_test.go

@@ -12,6 +12,7 @@ func TestGetAppIdFromConfig(t *testing.T) {
 	config := new(cfgMocks.Config)
 	config.On("GetString", "app_project").Return("prj")
 	config.On("GetString", "app_family").Return("fam")
+	config.On("GetString", "app_group").Return("grp")
 	config.On("GetString", "app_name").Return("name")
 	config.On("GetString", "env").Return("test")
 
@@ -21,6 +22,7 @@ func TestGetAppIdFromConfig(t *testing.T) {
 		Project:     "prj",
 		Environment: "test",
 		Family:      "fam",
+		Group:       "grp",
 		Application: "name",
 	}, appId)
 
@@ -31,6 +33,7 @@ func TestAppId_PadFromConfig(t *testing.T) {
 	config := new(cfgMocks.Config)
 	config.On("GetString", "app_project").Return("prj")
 	config.On("GetString", "app_family").Return("fam")
+	config.On("GetString", "app_group").Return("grp")
 	config.On("GetString", "app_name").Return("name")
 	config.On("GetString", "env").Return("test")
 
@@ -41,6 +44,7 @@ func TestAppId_PadFromConfig(t *testing.T) {
 		Project:     "prj",
 		Environment: "test",
 		Family:      "fam",
+		Group:       "grp",
 		Application: "name",
 	}, appId)
 

pkg/cloud/aws/kinesis/metadata_repository.go

@@ -111,8 +111,8 @@ type metadataRepository struct {
 func NewMetadataRepository(ctx context.Context, config cfg.Config, logger log.Logger, stream Stream, clientId ClientId, settings Settings) (MetadataRepository, error) {
 	ddbSettings := &ddb.Settings{
 		ModelId: mdl.ModelId{
-			Application: "kinsumer",
-			Name:        "metadata",
+			Group: "kinsumer",
+			Name:  "metadata",
 		},
 		Main: ddb.MainSettings{
 			Model:              &FullRecord{},

pkg/cloud/aws/kinesis/naming.go

@@ -15,7 +15,7 @@ type StreamNameSettingsAware interface {
 }
 
 type StreamNamingSettings struct {
-	Pattern string `cfg:"pattern,nodecode" default:"{project}-{env}-{family}-{app}-{name}"`
+	Pattern string `cfg:"pattern,nodecode" default:"{project}-{env}-{family}-{group}-{streamName}"`
 }
 
 func GetStreamName(config cfg.Config, settings StreamNameSettingsAware) (Stream, error) {
@@ -31,11 +31,12 @@ func GetStreamName(config cfg.Config, settings StreamNameSettingsAware) (Stream,
 	name := namingSettings.Pattern
 
 	values := map[string]string{
-		"project": appId.Project,
-		"env":     appId.Environment,
-		"family":  appId.Family,
-		"app":     appId.Application,
-		"name":    settings.GetStreamName(),
+		"project":    appId.Project,
+		"env":        appId.Environment,
+		"family":     appId.Family,
+		"group":      appId.Group,
+		"app":        appId.Application,
+		"streamName": settings.GetStreamName(),
 	}
 
 	for key, val := range values {

pkg/cloud/aws/kinesis/naming_test.go

@@ -23,8 +23,9 @@ func (s *GetStreamNameTestSuite) SetupTest() {
 	s.settings = &kinesis.Settings{
 		AppId: cfg.AppId{
 			Project:     "justtrack",
-			Environment: "test",
+			Environment: "env",
 			Family:      "gosoline",
+			Group:       "grp",
 			Application: "producer",
 		},
 		ClientName: "default",
@@ -40,12 +41,12 @@ func (s *GetStreamNameTestSuite) setupConfig(settings map[string]interface{}) {
 func (s *GetStreamNameTestSuite) TestDefault() {
 	name, err := kinesis.GetStreamName(s.config, s.settings)
 	s.NoError(err)
-	s.EqualValues("justtrack-test-gosoline-producer-event", name)
+	s.EqualValues("justtrack-env-gosoline-grp-event", string(name))
 }
 
 func (s *GetStreamNameTestSuite) TestDefaultWithPattern() {
 	s.setupConfig(map[string]interface{}{
-		"cloud.aws.kinesis.clients.default.naming.pattern": "{app}-{name}",
+		"cloud.aws.kinesis.clients.default.naming.pattern": "{app}-{streamName}",
 	})
 
 	name, err := kinesis.GetStreamName(s.config, s.settings)
@@ -56,7 +57,7 @@ func (s *GetStreamNameTestSuite) TestDefaultWithPattern() {
 func (s *GetStreamNameTestSuite) TestSpecificClientWithPattern() {
 	s.settings.ClientName = "specific"
 	s.setupConfig(map[string]interface{}{
-		"cloud.aws.kinesis.clients.specific.naming.pattern": "{app}-{name}",
+		"cloud.aws.kinesis.clients.specific.naming.pattern": "{app}-{streamName}",
 	})
 
 	name, err := kinesis.GetStreamName(s.config, s.settings)

pkg/cloud/aws/sns/naming.go

@@ -33,7 +33,7 @@ func (s TopicNameSettings) GetTopicId() string {
 }
 
 type TopicNamingSettings struct {
-	Pattern string `cfg:"pattern,nodecode" default:"{project}-{env}-{family}-{app}-{topicId}"`
+	Pattern string `cfg:"pattern,nodecode" default:"{project}-{env}-{family}-{group}-{topicId}"`
 }
 
 func GetTopicName(config cfg.Config, topicSettings TopicNameSettingsAware) (string, error) {
@@ -51,6 +51,7 @@ func GetTopicName(config cfg.Config, topicSettings TopicNameSettingsAware) (stri
 		"project": appId.Project,
 		"env":     appId.Environment,
 		"family":  appId.Family,
+		"group":   appId.Group,
 		"app":     appId.Application,
 		"topicId": topicSettings.GetTopicId(),
 	}

pkg/cloud/aws/sns/naming_test.go

@@ -25,6 +25,7 @@ func (s *GetTopicNameTestSuite) SetupTest() {
 			Project:     "justtrack",
 			Environment: "test",
 			Family:      "gosoline",
+			Group:       "group",
 			Application: "producer",
 		},
 		ClientName: "default",
@@ -40,7 +41,7 @@ func (s *GetTopicNameTestSuite) setupConfig(settings map[string]interface{}) {
 func (s *GetTopicNameTestSuite) TestDefault() {
 	name, err := sns.GetTopicName(s.config, s.settings)
 	s.NoError(err)
-	s.Equal("justtrack-test-gosoline-producer-event", name)
+	s.Equal("justtrack-test-gosoline-group-event", name)
 }
 
 func (s *GetTopicNameTestSuite) TestDefaultWithPattern() {

pkg/cloud/aws/sqs/naming.go

@@ -39,7 +39,7 @@ func (s QueueNameSettings) GetQueueId() string {
 }
 
 type QueueNamingSettings struct {
-	Pattern string `cfg:"pattern,nodecode" default:"{project}-{env}-{family}-{app}-{queueId}"`
+	Pattern string `cfg:"pattern,nodecode" default:"{project}-{env}-{family}-{group}-{queueId}"`
 }
 
 func GetQueueName(config cfg.Config, queueSettings QueueNameSettingsAware) (string, error) {
@@ -57,6 +57,7 @@ func GetQueueName(config cfg.Config, queueSettings QueueNameSettingsAware) (stri
 		"project": appId.Project,
 		"env":     appId.Environment,
 		"family":  appId.Family,
+		"group":   appId.Group,
 		"app":     appId.Application,
 		"queueId": queueSettings.GetQueueId(),
 	}

pkg/cloud/aws/sqs/naming_test.go

@@ -25,6 +25,7 @@ func (s *GetSqsQueueNameTestSuite) SetupTest() {
 			Project:     "justtrack",
 			Environment: "test",
 			Family:      "gosoline",
+			Group:       "group",
 			Application: "producer",
 		},
 		ClientName: "default",
@@ -40,15 +41,15 @@ func (s *GetSqsQueueNameTestSuite) setupConfig(settings map[string]interface{})
 func (s *GetSqsQueueNameTestSuite) TestDefault() {
 	name, err := sqs.GetQueueName(s.config, s.settings)
 	s.NoError(err)
-	s.Equal("justtrack-test-gosoline-producer-event", name)
+	s.Equal("justtrack-test-gosoline-group-event", name)
 }
 
 func (s *GetSqsQueueNameTestSuite) TestDefaultFifo() {
 	s.settings.FifoEnabled = true
 
 	name, err := sqs.GetQueueName(s.config, s.settings)
 	s.NoError(err)
-	s.Equal("justtrack-test-gosoline-producer-event.fifo", name)
+	s.Equal("justtrack-test-gosoline-group-event.fifo", name)
 }
 
 func (s *GetSqsQueueNameTestSuite) TestDefaultWithPattern() {

pkg/conc/ddb/leader_election_ddb.go

@@ -19,10 +19,14 @@ type DdbLeaderElectionItem struct {
 	LeadingUntil int64  `json:"leadingUntil" ddb:"ttl=enabled"`
 }
 
+type TableNamingSettings struct {
+	Pattern string `cfg:"pattern,nodecode" default:"{project}-{env}-{family}-leader-elections"`
+}
+
 type DdbLeaderElectionSettings struct {
-	TableName     string        `cfg:"table_name" default:"{app_project}-{env}-{app_family}-leader-elections"`
-	GroupId       string        `cfg:"group_id" default:"{app_name}"`
-	LeaseDuration time.Duration `cfg:"lease_duration" default:"1m"`
+	Naming        TableNamingSettings `cfg:"naming"`
+	GroupId       string              `cfg:"group_id" default:"{app_name}"`
+	LeaseDuration time.Duration       `cfg:"lease_duration" default:"1m"`
 }
 
 type DdbLeaderElection struct {
@@ -44,7 +48,7 @@ func NewDdbLeaderElectionWithSettings(ctx context.Context, config cfg.Config, lo
 	repository, err := ddb.NewRepository(ctx, config, logger, &ddb.Settings{
 		ModelId: mdl.ModelId{},
 		TableNamingSettings: ddb.TableNamingSettings{
-			Pattern: settings.TableName,
+			Pattern: settings.Naming.Pattern,
 		},
 		DisableTracing: true,
 		Main: ddb.MainSettings{

pkg/conc/ddb/leader_election_ddb_test.go

@@ -30,7 +30,9 @@ func (s *DdbLeaderElectionTestCase) SetupTest() {
 
 	var err error
 	s.election, err = concDdb.NewDdbLeaderElectionWithInterfaces(s.logger, s.clock, s.repository, &concDdb.DdbLeaderElectionSettings{
-		TableName:     "gosoline-leader-election",
+		Naming: concDdb.TableNamingSettings{
+			Pattern: "gosoline-leader-election",
+		},
 		GroupId:       "test",
 		LeaseDuration: time.Minute,
 	})

pkg/db-repo/notification_publisher_test.go

@@ -3,6 +3,7 @@ package db_repo_test
 import (
 	"context"
 	"testing"
+	"time"
 
 	"github.com/justtrackio/gosoline/pkg/cfg"
 	db_repo "github.com/justtrackio/gosoline/pkg/db-repo"
@@ -12,6 +13,23 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+type modelBased struct {
+	value                string
+	createdAt, updatedAt *time.Time
+}
+
+func (m *modelBased) GetId() *uint {
+	return mdl.Box(uint(3))
+}
+
+func (m *modelBased) SetUpdatedAt(updatedAt *time.Time) {
+	m.updatedAt = updatedAt
+}
+
+func (m *modelBased) SetCreatedAt(createdAt *time.Time) {
+	m.createdAt = createdAt
+}
+
 func Test_Publish_Notifier(t *testing.T) {
 	input := &modelBased{
 		value: "my test input",
@@ -33,6 +51,7 @@ func Test_Publish_Notifier(t *testing.T) {
 		Name:        "myTest",
 		Application: "testApp",
 		Family:      "testFamily",
+		Group:       "grp",
 		Environment: "test",
 	}