Remove ES bootsrap code from Fleet Server (#105)

* Moved it to testing/esutil package because it is still used for
  integration testing indices bootstrapping

cmd/fleet/main.go

@@ -7,23 +7,22 @@ package fleet
 import (
 	"context"
 	"fmt"
-	"github.com/elastic/go-ucfg"
-	"github.com/elastic/go-ucfg/yaml"
 	"io"
 	"os"
 	"sync"
 	"time"
 
+	"github.com/elastic/go-ucfg"
+	"github.com/elastic/go-ucfg/yaml"
+
 	"github.com/elastic/fleet-server/v7/internal/pkg/action"
 	"github.com/elastic/fleet-server/v7/internal/pkg/bulk"
 	"github.com/elastic/fleet-server/v7/internal/pkg/cache"
 	"github.com/elastic/fleet-server/v7/internal/pkg/config"
 	"github.com/elastic/fleet-server/v7/internal/pkg/coordinator"
 	"github.com/elastic/fleet-server/v7/internal/pkg/dl"
 	"github.com/elastic/fleet-server/v7/internal/pkg/env"
-	"github.com/elastic/fleet-server/v7/internal/pkg/esboot"
 	"github.com/elastic/fleet-server/v7/internal/pkg/logger"
-	"github.com/elastic/fleet-server/v7/internal/pkg/migrate"
 	"github.com/elastic/fleet-server/v7/internal/pkg/monitor"
 	"github.com/elastic/fleet-server/v7/internal/pkg/policy"
 	"github.com/elastic/fleet-server/v7/internal/pkg/profile"
@@ -472,24 +471,6 @@ func (f *FleetServer) runServer(ctx context.Context, cfg *config.Config) (err er
 	}
 	sv := saved.NewMgr(bulker, savedObjectKey())
 
-	// Initial indices bootstrapping, needed for agents actions development
-	// TODO: remove this after the indices bootstrapping logic implemented in ES plugin
-	bootFlag := env.GetStr(
-		"FLEET_ES_BOOT",
-		"",
-	)
-	if bootFlag == "1" {
-		log.Debug().Msg("FLEET_ES_BOOT is set to true, perform bootstrap")
-		err = esboot.EnsureESIndices(ctx, es)
-		if err != nil {
-			return err
-		}
-		err = migrate.Migrate(ctx, log.Logger, sv, bulker)
-		if err != nil {
-			return err
-		}
-	}
-
 	// Replacing to errgroup context
 	g, ctx := errgroup.WithContext(ctx)
 

dev-tools/integration/main.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/elastic/fleet-server/v7/internal/pkg/config"
 	"github.com/elastic/fleet-server/v7/internal/pkg/es"
-	"github.com/elastic/fleet-server/v7/internal/pkg/esboot"
+	"github.com/elastic/fleet-server/v7/internal/pkg/testing/esutil"
 
 	"github.com/rs/zerolog/log"
 )
@@ -34,15 +34,15 @@ func main() {
 	es, err := es.NewClient(ctx, cfg)
 	checkErr(err)
 
-	err = esboot.EnsureESIndices(ctx, es)
+	err = esutil.EnsureESIndices(ctx, es)
 	checkErr(err)
 
 	// Create .kibana index for integration tests
 	// This temporarily until all the parts are unplugged from .kibana
 	// Otherwise the fleet server fails to start at the moment
 	const name = ".kibana"
-	err = esboot.EnsureIndex(ctx, es, name, kibanaMapping)
-	if errors.Is(err, esboot.ErrResourceAlreadyExists) {
+	err = esutil.EnsureIndex(ctx, es, name, kibanaMapping)
+	if errors.Is(err, esutil.ErrResourceAlreadyExists) {
 		log.Info().Str("name", name).Msg("Index already exists")
 		err = nil
 	}

internal/pkg/esboot/bootstrap.go → internal/pkg/testing/esutil/bootstrap.go

@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package esboot
+package esutil
 
 import (
 	"context"

internal/pkg/esboot/datastream.go → internal/pkg/testing/esutil/datastream.go

@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package esboot
+package esutil
 
 import (
 	"context"

internal/pkg/esboot/esutil.go → internal/pkg/testing/esutil/esutil.go

@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package esboot
+package esutil
 
 import (
 	"encoding/json"

internal/pkg/esboot/ilm.go → internal/pkg/testing/esutil/ilm.go

@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package esboot
+package esutil
 
 import (
 	"context"

internal/pkg/esboot/index.go → internal/pkg/testing/esutil/index.go

@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package esboot
+package esutil
 
 import (
 	"context"

internal/pkg/esboot/strmap.go → internal/pkg/testing/esutil/strmap.go

@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package esboot
+package esutil
 
 type stringMap map[string]interface{}
 

internal/pkg/esboot/template.go → internal/pkg/testing/esutil/template.go

@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package esboot
+package esutil
 
 import (
 	"context"

internal/pkg/testing/setup.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/elastic/fleet-server/v7/internal/pkg/bulk"
 	"github.com/elastic/fleet-server/v7/internal/pkg/config"
-	"github.com/elastic/fleet-server/v7/internal/pkg/esboot"
+	"github.com/elastic/fleet-server/v7/internal/pkg/testing/esutil"
 )
 
 var defaultCfg config.Config
@@ -53,7 +53,7 @@ func SetupBulk(ctx context.Context, t *testing.T, opts ...bulk.BulkOpt) bulk.Bul
 func SetupIndex(ctx context.Context, t *testing.T, bulker bulk.Bulk, mapping string) string {
 	t.Helper()
 	index := xid.New().String()
-	err := esboot.EnsureIndex(ctx, bulker.Client(), index, mapping)
+	err := esutil.EnsureIndex(ctx, bulker.Client(), index, mapping)
 	if err != nil {
 		t.Fatal(err)
 	}