fix: join should use same logic as install to determine network interface if unspecified (#2128)

* f

* f

* f

* f

Author: emosbaugh

cmd/installer/cli/join.go

@@ -116,6 +116,14 @@ func preRunJoin(flags *JoinCmdFlags) error {
 
 	flags.isAirgap = flags.airgapBundle != ""
 
+	// if a network interface flag was not provided, attempt to discover it
+	if flags.networkInterface == "" {
+		autoInterface, err := determineBestNetworkInterface()
+		if err == nil {
+			flags.networkInterface = autoInterface
+		}
+	}
+
 	return nil
 }
 

pkg/dryrun/kotsadm.go

@@ -45,21 +45,21 @@ func (c *Kotsadm) setResponse(resp interface{}, err error, methodName string, ar
 	return nil
 }
 
-// SetGetJoinTokenResponse sets the response for the GetJoinToken method, based on the provided baseURL and shortToken.
-func (c *Kotsadm) SetGetJoinTokenResponse(baseURL, shortToken string, resp *join.JoinCommandResponse, err error) {
-	mockErr := c.setResponse(resp, err, "GetJoinToken", baseURL, shortToken)
+// SetGetJoinTokenResponse sets the response for the GetJoinToken method, based on the provided address and shortToken.
+func (c *Kotsadm) SetGetJoinTokenResponse(address, shortToken string, resp *join.JoinCommandResponse, err error) {
+	mockErr := c.setResponse(resp, err, "GetJoinToken", address, shortToken)
 	if mockErr != nil {
 		panic(mockErr)
 	}
 }
 
 // GetJoinToken issues a request to the kots api to get the actual join command
 // based on the short token provided by the user.
-func (c *Kotsadm) GetJoinToken(ctx context.Context, baseURL, shortToken string) (*join.JoinCommandResponse, error) {
-	key := strings.Join([]string{"GetJoinToken", baseURL, shortToken}, ":")
+func (c *Kotsadm) GetJoinToken(ctx context.Context, address, shortToken string) (*join.JoinCommandResponse, error) {
+	key := strings.Join([]string{"GetJoinToken", address, shortToken}, ":")
 	if handler, ok := c.mockHandlers[key]; ok {
 		return handler.resp.(*join.JoinCommandResponse), handler.err
 	} else {
-		return nil, fmt.Errorf("no response set for GetJoinToken, baseURL: %s, shortToken: %s", baseURL, shortToken)
+		return nil, fmt.Errorf("no response set for GetJoinToken, address: %s, shortToken: %s", address, shortToken)
 	}
 }

pkg/kotsadm/client.go

@@ -17,8 +17,8 @@ type Client struct{}
 
 // GetJoinToken issues a request to the kots api to get the actual join command
 // based on the short token provided by the user.
-func (c *Client) GetJoinToken(ctx context.Context, baseURL, shortToken string) (*join.JoinCommandResponse, error) {
-	url := fmt.Sprintf("https://%s/api/v1/embedded-cluster/join?token=%s", baseURL, shortToken)
+func (c *Client) GetJoinToken(ctx context.Context, address, shortToken string) (*join.JoinCommandResponse, error) {
+	url := fmt.Sprintf("https://%s/api/v1/embedded-cluster/join?token=%s", address, shortToken)
 	ctx, cancel := context.WithTimeout(ctx, time.Minute)
 	defer cancel()
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)

pkg/kotsadm/interface.go

@@ -19,13 +19,13 @@ func Set(kotsadm ClientInterface) {
 }
 
 type ClientInterface interface {
-	GetJoinToken(ctx context.Context, baseURL, shortToken string) (*join.JoinCommandResponse, error)
+	GetJoinToken(ctx context.Context, address, shortToken string) (*join.JoinCommandResponse, error)
 }
 
 // Convenience functions
 
 // GetJoinToken is a helper function that issues a request to the kots api to get the actual join command
 // based on the short token provided by the user.
-func GetJoinToken(ctx context.Context, baseURL, shortToken string) (*join.JoinCommandResponse, error) {
-	return _kotsadm.GetJoinToken(ctx, baseURL, shortToken)
+func GetJoinToken(ctx context.Context, address, shortToken string) (*join.JoinCommandResponse, error) {
+	return _kotsadm.GetJoinToken(ctx, address, shortToken)
 }