Move service tokens and geoip to profile

Author: jsoriano

cmd/profiles.go

@@ -105,6 +105,10 @@ User profiles are not overwritten on upgrade of elastic-stack, and can be freely
 			if err != nil {
 				return errors.Wrap(err, "error listing all profiles")
 			}
+			if len(profileList) == 0 {
+				fmt.Println("There are no profiles yet.")
+				return nil
+			}
 
 			format, err := cmd.Flags().GetString(cobraext.ProfileFormatFlagName)
 			if err != nil {

cmd/stack.go

@@ -89,7 +89,7 @@ func setupStackCommand() *cobraext.Command {
 				if err != nil {
 					return errors.Wrap(err, "error listing known profiles")
 				}
-				return fmt.Errorf("%s is not a valid profile, known profiles are: %s", profileName, pList)
+				return fmt.Errorf("%s is not a valid profile, known profiles are: %s", profileName, strings.Join(pList, ", "))
 			}
 			if err != nil {
 				return errors.Wrap(err, "error loading profile")

internal/install/install.go

@@ -13,6 +13,7 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"github.com/elastic/elastic-package/internal/configuration/locations"
+	"github.com/elastic/elastic-package/internal/profile"
 )
 
 const versionFilename = "version"
@@ -57,6 +58,17 @@ func EnsureInstalled() error {
 		return errors.Wrap(err, "writing version file failed")
 	}
 
+	// Create initial profile:
+	options := profile.Options{
+		PackagePath:       elasticPackagePath.ProfileDir(),
+		Name:              profile.DefaultProfile,
+		OverwriteExisting: false,
+	}
+	err = profile.CreateProfile(options)
+	if err != nil {
+		return errors.Wrap(err, "creation of initial profile failed")
+	}
+
 	if err := createServiceLogsDir(elasticPackagePath); err != nil {
 		return errors.Wrap(err, "creating service logs directory failed")
 	}

internal/install/static.go

@@ -15,17 +15,5 @@ var terraformDeployerYml string
 //go:embed _static/terraform_deployer_run.sh
 var terraformDeployerRun string
 
-//go:embed _static/GeoLite2-ASN.mmdb
-var geoIpAsnMmdb string
-
-//go:embed _static/GeoLite2-City.mmdb
-var geoIpCityMmdb string
-
-//go:embed _static/GeoLite2-Country.mmdb
-var geoIpCountryMmdb string
-
-//go:embed _static/service_tokens
-var serviceTokens string
-
 //go:embed _static/docker-custom-agent-base.yml
 var dockerCustomAgentBaseYml string

internal/install/_static/GeoLite2-ASN.mmdb renamed to internal/profile/_static/GeoLite2-ASN.mmdb

@@ -12,8 +12,8 @@ services:
     volumes:
       - "./elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml"
       - "../certs/elasticsearch:/usr/share/elasticsearch/config/certs"
-      - "../../../stack/ingest-geoip:/usr/share/elasticsearch/config/ingest-geoip"
-      - "../../../stack/service_tokens:/usr/share/elasticsearch/config/service_tokens"
+      - "./ingest-geoip:/usr/share/elasticsearch/config/ingest-geoip"
+      - "./service_tokens:/usr/share/elasticsearch/config/service_tokens"
     ports:
       - "127.0.0.1:9200:9200"
 

internal/install/_static/GeoLite2-City.mmdb renamed to internal/profile/_static/GeoLite2-City.mmdb

@@ -78,6 +78,29 @@ var (
 			Path:     ElasticsearchConfigFile,
 			Content:  staticSource.Template("_static/elasticsearch.yml.tmpl"),
 		},
+		&resource.File{
+			Provider: "stack-file",
+			Path:     "service_tokens",
+			Content:  staticSource.File("_static/service_tokens"),
+		},
+		&resource.File{
+			Provider:     "stack-file",
+			Path:         "ingest-geoip/GeoLite2-ASN.mmdb",
+			CreateParent: true,
+			Content:      staticSource.File("_static/GeoLite2-ASN.mmdb"),
+		},
+		&resource.File{
+			Provider:     "stack-file",
+			Path:         "ingest-geoip/GeoLite2-City.mmdb",
+			CreateParent: true,
+			Content:      staticSource.File("_static/GeoLite2-City.mmdb"),
+		},
+		&resource.File{
+			Provider:     "stack-file",
+			Path:         "ingest-geoip/GeoLite2-Country.mmdb",
+			CreateParent: true,
+			Content:      staticSource.File("_static/GeoLite2-Country.mmdb"),
+		},
 		&resource.File{
 			Provider: "stack-file",
 			Path:     KibanaConfigFile,
@@ -259,6 +282,9 @@ func DeleteProfile(profileName string) error {
 // FetchAllProfiles returns a list of profile values
 func FetchAllProfiles(elasticPackagePath string) ([]Metadata, error) {
 	dirList, err := os.ReadDir(elasticPackagePath)
+	if errors.Is(err, os.ErrNotExist) {
+		return []Metadata{}, nil
+	}
 	if err != nil {
 		return []Metadata{}, fmt.Errorf("error reading from directory %s: %w", elasticPackagePath, err)
 	}