fix: pass relay name to systemd install, use correct operation name in CallConnectGateway

Author: bernie-g

packages/api/api.go

@@ -48,6 +48,7 @@ const (
 	operationCallRegisterOrgRelay                  = "CallRegisterOrgRelay"
 	operationCallGetOrgRelays                      = "CallGetOrgRelays"
 	operationCallRegisterGateway                   = "CallRegisterGateway"
+	operationCallConnectGateway                    = "CallConnectGateway"
 	operationCallEnrollGateway                     = "CallEnrollGateway"
 	operationCallPAMAccess                         = "CallPAMAccess"
 	operationCallPAMAccessApprovalRequest          = "CallPAMAccessApprovalRequest"
@@ -906,11 +907,11 @@ func CallConnectGateway(httpClient *resty.Client, request ConnectGatewayRequest)
 		Post(fmt.Sprintf("%v/v3/gateways/connect", config.INFISICAL_URL))
 
 	if err != nil {
-		return RegisterGatewayResponse{}, NewGenericRequestError(operationCallRegisterGateway, err)
+		return RegisterGatewayResponse{}, NewGenericRequestError(operationCallConnectGateway, err)
 	}
 
 	if response.IsError() {
-		return RegisterGatewayResponse{}, NewAPIErrorWithResponse(operationCallRegisterGateway, response, nil)
+		return RegisterGatewayResponse{}, NewAPIErrorWithResponse(operationCallConnectGateway, response, nil)
 	}
 
 	return resBody, nil

packages/cmd/gateway.go

@@ -565,6 +565,8 @@ var gatewaySystemdInstallCmd = &cobra.Command{
 				util.HandleError(errors.New("--token is required when --enroll-method=token"))
 			}
 
+			relayName, _ := util.GetRelayName(cmd, false, "")
+
 			httpClient, clientErr := util.GetRestyClientWithCustomHeaders()
 			if clientErr != nil {
 				util.HandleError(clientErr, "unable to create HTTP client")
@@ -579,7 +581,7 @@ var gatewaySystemdInstallCmd = &cobra.Command{
 			}
 
 			// Install systemd service using the long-lived access token
-			if installErr := gatewayv2.InstallEnrolledGatewaySystemdService(enrollResp.AccessToken, domain, gatewayName, "", serviceLogFile); installErr != nil {
+			if installErr := gatewayv2.InstallEnrolledGatewaySystemdService(enrollResp.AccessToken, domain, gatewayName, relayName, serviceLogFile); installErr != nil {
 				util.HandleError(installErr, "Unable to install systemd service")
 			}
 		} else {