Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions pkg/connector/role.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ func roleResource(ctx context.Context, role *splunk.Role, parentResourceID *v2.R
displayName,
resourceTypeRole,
roleID,
[]rs.GroupTraitOption{rs.WithGroupProfile(profile)},
[]rs.GroupTraitOption{},
rs.WithResourceProfile(profile),
rs.WithParentResourceID(parentResourceID),
)
if err != nil {
Expand Down Expand Up @@ -122,12 +123,7 @@ func (r *roleResourceType) Grants(ctx context.Context, resource *v2.Resource, pt
return nil, "", nil, err
}

roleTrait, err := rs.GetGroupTrait(resource)
if err != nil {
return nil, "", nil, err
}

roleName, ok := rs.GetProfileStringValue(roleTrait.Profile, "role_name")
roleName, ok := rs.GetProfileStringValue(rs.GetProfile(resource), "role_name")
if !ok {
return nil, "", nil, fmt.Errorf("splunk-connector: error parsing role name from role profile")
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/connector/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ func userResource(ctx context.Context, user *splunk.User, parentResourceID *v2.R
userID,
[]resource.UserTraitOption{
resource.WithEmail(user.Content.Email, true),
resource.WithUserProfile(profile),
resource.WithStatus(v2.UserTrait_Status_STATUS_ENABLED),
},
resource.WithResourceProfile(profile),
resource.WithResourceStatus(v2.Status_RESOURCE_STATUS_ENABLED, ""),
resource.WithParentResourceID(parentResourceID),
)
if err != nil {
Expand Down
Loading