Add comment, add strings.TrimSpace

blakerouse · blakerouse · commit f1bd2a38fd98 · 2021-03-04T10:10:30.000-05:00
diff --git a/x-pack/elastic-agent/pkg/agent/cmd/container.go b/x-pack/elastic-agent/pkg/agent/cmd/container.go
@@ -37,6 +37,8 @@ const (
 )
 
 var (
+	// Used to strip the appended ({uuid}) from the name of an enrollment token. This makes much easier for
+	// a container to reference a token by name, without having to know what the generated UUID is for that name.
 	tokenNameStrip = regexp.MustCompile(`\s\([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\)$`)
 )
 
@@ -327,7 +329,7 @@ func findPolicy(policies []kibanaPolicy) (*kibanaPolicy, error) {
 func findKey(keys []kibanaAPIKey, policy *kibanaPolicy) (*kibanaAPIKey, error) {
 	tokenName := envWithDefault(defaultTokenName, "FLEET_TOKEN_NAME")
 	for _, key := range keys {
-		name := tokenNameStrip.ReplaceAllString(key.Name, "")
+		name := strings.TrimSpace(tokenNameStrip.ReplaceAllString(key.Name, ""))
 		if name == tokenName && key.PolicyID == policy.ID {
 			return &key, nil
 		}

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ const (`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`var (`
	`40`	`+ // Used to strip the appended ({uuid}) from the name of an enrollment token. This makes much easier for`
	`41`	`+ // a container to reference a token by name, without having to know what the generated UUID is for that name.`
`40`	`42`	tokenNameStrip = regexp.MustCompile(`\s\([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\)$`)
`41`	`43`	`)`
`42`	`44`
`@@ -327,7 +329,7 @@ func findPolicy(policies []kibanaPolicy) (*kibanaPolicy, error) {`
`327`	`329`	`func findKey(keys []kibanaAPIKey, policy kibanaPolicy) (kibanaAPIKey, error) {`
`328`	`330`	`tokenName := envWithDefault(defaultTokenName, "FLEET_TOKEN_NAME")`
`329`	`331`	`for _, key := range keys {`
`330`		`- name := tokenNameStrip.ReplaceAllString(key.Name, "")`
	`332`	`+ name := strings.TrimSpace(tokenNameStrip.ReplaceAllString(key.Name, ""))`
`331`	`333`	`if name == tokenName && key.PolicyID == policy.ID {`
`332`	`334`	`return &key, nil`
`333`	`335`	`}`