Merge pull request #28 from splunk/mw/te-188-short-hostnames

Use host value from cluster master to connect to

Author: michaelw

path_config_connection.go

@@ -252,7 +252,7 @@ func (b *backend) connectionWriteHandler(ctx context.Context, req *logical.Reque
 
 func (b *backend) pathConnectionsList() *framework.Path {
 	return &framework.Path{
-		Pattern: fmt.Sprintf("config/?$"),
+		Pattern: "config/?$",
 
 		Callbacks: map[logical.Operation]framework.OperationFunc{
 			logical.ListOperation: b.connectionListHandler,

path_creds_create.go

@@ -118,30 +118,31 @@ func (b *backend) credsReadHandlerStandalone(ctx context.Context, req *logical.R
 		"username":   username,
 		"role":       name,
 		"connection": role.Connection,
+		"url":        conn.Params().BaseURL, // new in v0.7.0
 	})
 	resp.Secret.TTL = role.DefaultTTL
 	resp.Secret.MaxTTL = role.MaxTTL
 
 	return resp, nil
 }
 
-func findNode(nodeFQDN string, hosts []splunk.ServerInfoEntry, roleConfig *roleConfig) (bool, error) {
+func findNode(nodeFQDN string, hosts []splunk.ServerInfoEntry, roleConfig *roleConfig) (*splunk.ServerInfoEntry, error) {
 	for _, host := range hosts {
 		// check if node_fqdn is in either of HostFQDN or Host. User might not always the FQDN on the cli input
 		if strings.EqualFold(host.Content.HostFQDN, nodeFQDN) || strings.EqualFold(host.Content.Host, nodeFQDN) {
-			// Return true if the requested node type is allowed
+			// Return host if the requested node type is allowed
 			if strutil.StrListContains(roleConfig.AllowedServerRoles, "*") {
-				return true, nil
+				return &host, nil
 			}
 			for _, role := range host.Content.Roles {
 				if strutil.StrListContainsGlob(roleConfig.AllowedServerRoles, role) {
-					return true, nil
+					return &host, nil
 				}
 			}
-			return false, fmt.Errorf("host %q does not have any of the allowed server roles: %q", nodeFQDN, roleConfig.AllowedServerRoles)
+			return nil, fmt.Errorf("host %q does not have any of the allowed server roles: %q", nodeFQDN, roleConfig.AllowedServerRoles)
 		}
 	}
-	return false, fmt.Errorf("host %q not found", nodeFQDN)
+	return nil, fmt.Errorf("host %q not found", nodeFQDN)
 }
 
 func (b *backend) credsReadHandlerMulti(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
@@ -181,15 +182,17 @@ func (b *backend) credsReadHandlerMulti(ctx context.Context, req *logical.Reques
 		return nil, errwrap.Wrapf("unable to read searchpeers from cluster master: {{err}}", err)
 	}
 
-	_, err = findNode(nodeFQDN, nodes, role)
+	foundNode, err := findNode(nodeFQDN, nodes, role)
 	if err != nil {
 		return nil, err
 	}
+	if foundNode.Content.Host == "" {
+		return nil, fmt.Errorf("host field unexpectedly empty for %q", nodeFQDN)
+	}
+	nodeFQDN = foundNode.Content.Host // the actual FQDN as returned by the cluster master, confusingly
 
 	// Re-create connection for node
-	config.URL = "https://" + nodeFQDN + ":8089"
-	// XXX config.ID = ""
-	conn, err = config.newConnection(ctx) // XXX cache
+	conn, err = b.ensureNodeConnection(ctx, config, nodeFQDN)
 	if err != nil {
 		return nil, err
 	}
@@ -232,6 +235,7 @@ func (b *backend) credsReadHandlerMulti(ctx context.Context, req *logical.Reques
 		"role":       name,
 		"connection": role.Connection,
 		"node_fqdn":  nodeFQDN,
+		"url":        conn.Params().BaseURL, // new in v0.7.0
 	})
 	resp.Secret.TTL = role.DefaultTTL
 	resp.Secret.MaxTTL = role.MaxTTL

path_creds_create_test.go

@@ -136,7 +136,7 @@ func Test_findNode(t *testing.T) {
 				t.Errorf("findNode() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			if got != tt.want {
+			if (got != nil) != tt.want {
 				t.Errorf("findNode() = %v, want %v", got, tt.want)
 			}
 		})