Skip to content

Commit

Permalink
Prefix template name, but not mapping name
Browse files Browse the repository at this point in the history 
Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
  • Loading branch information
@rubenvp8510
rubenvp8510 committed Sep 13, 2021
1 parent 81932d7 commit eac1a7f
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 29 deletions.
35 changes: 24 additions & 11 deletions cmd/es-rollover/app/index_options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,43 +25,56 @@ const rolloverIndexFormat = "%s-000001"

// IndexOption holds the information for the indices to rollover
type IndexOption struct {
Prefix string
TemplateName string
prefix string
indexType string
Mapping string
}

// RolloverIndices return an array of indices to rollover
func RolloverIndices(archive bool, prefix string) []IndexOption {
if archive {
return []IndexOption{
{
Prefix: strings.TrimLeft(fmt.Sprintf("%s-jaeger-span-archive", prefix), "-"),
TemplateName: "jaeger-span",
prefix: prefix,
indexType: "jaeger-span-archive",
Mapping: "jaeger-span",
},
}
}
return []IndexOption{
{
Prefix: strings.TrimLeft(fmt.Sprintf("%s-jaeger-span", prefix), "-"),
TemplateName: "jaeger-span",
prefix: prefix,
Mapping: "jaeger-span",
indexType: "jaeger-span",
},
{
Prefix: strings.TrimLeft(fmt.Sprintf("%s-jaeger-service", prefix), "-"),
TemplateName: "jaeger-service",
prefix: prefix,
Mapping: "jaeger-service",
indexType: "jaeger-service",
},
}
}

func (i *IndexOption) IndexName() string {
return strings.TrimLeft(fmt.Sprintf("%s-%s", i.prefix, i.indexType), "-")
}

// ReadAliasName returns read alias name of the index
func (i *IndexOption) ReadAliasName() string {
return fmt.Sprintf(readAliasFormat, i.Prefix)
return fmt.Sprintf(readAliasFormat, i.IndexName())
}

// WriteAliasName returns write alias name of the index
func (i *IndexOption) WriteAliasName() string {
return fmt.Sprintf(writeAliasFormat, i.Prefix)
return fmt.Sprintf(writeAliasFormat, i.IndexName())
}

// InitialRolloverIndex returns the initial index rollover name
func (i *IndexOption) InitialRolloverIndex() string {
return fmt.Sprintf(rolloverIndexFormat, i.Prefix)
return fmt.Sprintf(rolloverIndexFormat, i.IndexName())
}

// TemplateName returns the prefixed template name
func (i *IndexOption) TemplateName() string {
return strings.TrimLeft(fmt.Sprintf("%s-%s", i.prefix, i.Mapping), "-")
}
24 changes: 12 additions & 12 deletions cmd/es-rollover/app/index_options_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

func TestRolloverIndices(t *testing.T) {
type expectedValues struct {
prefix string
mapping string
templateName string
readAliasName string
writeAliasName string
Expand All @@ -39,15 +39,15 @@ func TestRolloverIndices(t *testing.T) {
name: "Empty prefix",
expected: []expectedValues{
{
prefix: "jaeger-span",
templateName: "jaeger-span",
mapping: "jaeger-span",
readAliasName: "jaeger-span-read",
writeAliasName: "jaeger-span-write",
initialRolloverIndex: "jaeger-span-000001",
},
{
prefix: "jaeger-service",
templateName: "jaeger-service",
mapping: "jaeger-service",
readAliasName: "jaeger-service-read",
writeAliasName: "jaeger-service-write",
initialRolloverIndex: "jaeger-service-000001",
Expand All @@ -60,8 +60,8 @@ func TestRolloverIndices(t *testing.T) {
prefix: "mytenant",
expected: []expectedValues{
{
prefix: "mytenant-jaeger-span-archive",
templateName: "jaeger-span",
templateName: "mytenant-jaeger-span",
mapping: "jaeger-span",
readAliasName: "mytenant-jaeger-span-archive-read",
writeAliasName: "mytenant-jaeger-span-archive-write",
initialRolloverIndex: "mytenant-jaeger-span-archive-000001",
Expand All @@ -73,7 +73,7 @@ func TestRolloverIndices(t *testing.T) {
archive: true,
expected: []expectedValues{
{
prefix: "jaeger-span-archive",
mapping: "jaeger-span",
templateName: "jaeger-span",
readAliasName: "jaeger-span-archive-read",
writeAliasName: "jaeger-span-archive-write",
Expand All @@ -86,15 +86,15 @@ func TestRolloverIndices(t *testing.T) {
prefix: "mytenant",
expected: []expectedValues{
{
prefix: "mytenant-jaeger-span",
templateName: "jaeger-span",
mapping: "jaeger-span",
templateName: "mytenant-jaeger-span",
readAliasName: "mytenant-jaeger-span-read",
writeAliasName: "mytenant-jaeger-span-write",
initialRolloverIndex: "mytenant-jaeger-span-000001",
},
{
prefix: "mytenant-jaeger-service",
templateName: "jaeger-service",
mapping: "jaeger-service",
templateName: "mytenant-jaeger-service",
readAliasName: "mytenant-jaeger-service-read",
writeAliasName: "mytenant-jaeger-service-write",
initialRolloverIndex: "mytenant-jaeger-service-000001",
Expand All @@ -107,8 +107,8 @@ func TestRolloverIndices(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
result := RolloverIndices(test.archive, test.prefix)
for i, r := range result {
assert.Equal(t, test.expected[i].prefix, r.Prefix)
assert.Equal(t, test.expected[i].templateName, r.TemplateName)
assert.Equal(t, test.expected[i].templateName, r.TemplateName())
assert.Equal(t, test.expected[i].mapping, r.Mapping)
assert.Equal(t, test.expected[i].readAliasName, r.ReadAliasName())
assert.Equal(t, test.expected[i].writeAliasName, r.WriteAliasName())
assert.Equal(t, test.expected[i].initialRolloverIndex, r.InitialRolloverIndex())
Expand Down
12 changes: 6 additions & 6 deletions cmd/es-rollover/app/init/action.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,18 +104,18 @@ func createIndexIfNotExist(c client.IndexAPI, index string) error {
return nil
}

func (c Action) init(version uint, indexset app.IndexOption) error {
mapping, err := c.getMapping(version, indexset.TemplateName)
func (c Action) init(version uint, indexopt app.IndexOption) error {
mapping, err := c.getMapping(version, indexopt.Mapping)
if err != nil {
return err
}

err = c.IndicesClient.CreateTemplate(mapping, indexset.TemplateName)
err = c.IndicesClient.CreateTemplate(mapping, indexopt.TemplateName())
if err != nil {
return err
}

index := indexset.InitialRolloverIndex()
index := indexopt.InitialRolloverIndex()
err = createIndexIfNotExist(c.IndicesClient, index)
if err != nil {
return err
Expand All @@ -126,8 +126,8 @@ func (c Action) init(version uint, indexset app.IndexOption) error {
return err
}

readAlias := indexset.ReadAliasName()
writeAlias := indexset.WriteAliasName()
readAlias := indexopt.ReadAliasName()
writeAlias := indexopt.WriteAliasName()
aliases := []client.Alias{}

if !filter.AliasExists(jaegerIndices, readAlias) {
Expand Down

0 comments on commit eac1a7f

Please sign in to comment.