resolve conflicts

x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta/okta.go

@@ -179,53 +179,6 @@ func GetUserDetails(ctx context.Context, cli *http.Client, host, key, user strin
 	return getDetails[User](ctx, cli, u, endpoint, key, user == "", omit, lim, window, log)
 }
 
-<<<<<<< HEAD
-=======
-// GetUserFactors returns Okta group roles using the groups API endpoint. host is the
-// Okta user domain and key is the API token to use for the query. group must not be empty.
-//
-// See GetUserDetails for details of the query and rate limit parameters.
-//
-// See https://developer.okta.com/docs/api/openapi/okta-management/management/tag/UserFactor/#tag/UserFactor/operation/listFactors.
-func GetUserFactors(ctx context.Context, cli *http.Client, host, key, user string, lim RateLimiter, window time.Duration, log *logp.Logger) ([]Factor, http.Header, error) {
-	if user == "" {
-		return nil, nil, errors.New("no user specified")
-	}
-
-	const endpoint = "/api/v1/users/{user}/factors"
-	path := strings.Replace(endpoint, "{user}", user, 1)
-
-	u := &url.URL{
-		Scheme: "https",
-		Host:   host,
-		Path:   path,
-	}
-	return getDetails[Factor](ctx, cli, u, endpoint, key, true, OmitNone, lim, window, log)
-}
-
-// GetUserRoles returns Okta group roles using the groups API endpoint. host is the
-// Okta user domain and key is the API token to use for the query. group must not be empty.
-//
-// See GetUserDetails for details of the query and rate limit parameters.
-//
-// See https://developer.okta.com/docs/api/openapi/okta-management/management/tag/RoleAssignmentBGroup/#tag/RoleAssignmentBGroup/operation/listGroupAssignedRoles.
-func GetUserRoles(ctx context.Context, cli *http.Client, host, key, user string, lim RateLimiter, window time.Duration, log *logp.Logger) ([]Role, http.Header, error) {
-	if user == "" {
-		return nil, nil, errors.New("no user specified")
-	}
-
-	const endpoint = "/api/v1/users/{user}/roles"
-	path := strings.Replace(endpoint, "{user}", user, 1)
-
-	u := &url.URL{
-		Scheme: "https",
-		Host:   host,
-		Path:   path,
-	}
-	return getDetails[Role](ctx, cli, u, endpoint, key, true, OmitNone, lim, window, log)
-}
-
->>>>>>> 4e19d09ab2 (x-pack/filebeat/input/entityanalytics/provider/okta: Rate limiting fixes (#41583))
 // GetUserGroupDetails returns Okta group details using the users API endpoint. host is the
 // Okta user domain and key is the API token to use for the query. user must not be empty.
 //
@@ -248,31 +201,6 @@ func GetUserGroupDetails(ctx context.Context, cli *http.Client, host, key, user
 	return getDetails[Group](ctx, cli, u, endpoint, key, true, OmitNone, lim, window, log)
 }
 
-<<<<<<< HEAD
-=======
-// GetGroupRoles returns Okta group roles using the groups API endpoint. host is the
-// Okta user domain and key is the API token to use for the query. group must not be empty.
-//
-// See GetUserDetails for details of the query and rate limit parameters.
-//
-// See https://developer.okta.com/docs/api/openapi/okta-management/management/tag/RoleAssignmentBGroup/#tag/RoleAssignmentBGroup/operation/listGroupAssignedRoles.
-func GetGroupRoles(ctx context.Context, cli *http.Client, host, key, group string, lim RateLimiter, window time.Duration, log *logp.Logger) ([]Role, http.Header, error) {
-	if group == "" {
-		return nil, nil, errors.New("no group specified")
-	}
-
-	const endpoint = "/api/v1/groups/{group}/rules"
-	path := strings.Replace(endpoint, "{group}", group, 1)
-
-	u := &url.URL{
-		Scheme: "https",
-		Host:   host,
-		Path:   path,
-	}
-	return getDetails[Role](ctx, cli, u, endpoint, key, true, OmitNone, lim, window, log)
-}
-
->>>>>>> 4e19d09ab2 (x-pack/filebeat/input/entityanalytics/provider/okta: Rate limiting fixes (#41583))
 // GetDeviceDetails returns Okta device details using the list devices API endpoint. host is the
 // Okta user domain and key is the API token to use for the query. If device is not empty,
 // details for the specific device are returned, otherwise a list of all devices is returned.