adam/bridge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix linting

Browse Source
This commit is contained in:
Mike Mason
2023-07-17 19:24:54 +00:00
parent 1f67d3c805
commit 4d1e9717e5
14 changed files with 81 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/metal/models/organizations.go
View File

@@ -2,6 +2,7 @@ package models
import "go.infratographer.com/x/gidx"
// OrganizationDetails contains the organization and membership information.
type OrganizationDetails struct {
ID string `json:"id"`
Name string `json:"name"`
@@ -9,6 +10,7 @@ type OrganizationDetails struct {
Projects []*ProjectDetails `json:"projects"`
}
// PrefixedID returns the prefixed id for the organization.
func (d *OrganizationDetails) PrefixedID() gidx.PrefixedID {
if d.ID == "" {
return gidx.NullPrefixedID

2
internal/metal/models/users.go
View File

@@ -11,7 +11,7 @@ const (
// MetalUserIssuer is the issuer that is used for metal api token users.
MetalUserIssuer = "https://auth.equinix.com/"
// MetaluserIssuerIDPrefix is the issuer id prefix added by the issuer.
// MetalUserIssuerIDPrefix is the issuer id prefix added by the issuer.
MetalUserIssuerIDPrefix = "auth|"
)

8
internal/metal/providers/emapi/memberships.go
View File

@@ -10,7 +10,7 @@ type Roles []string
// Memberships contains a list of memberships
type Memberships []*Membership
// ToDetailsWithOrganizationDetails convers the memberships to generic membership models with organization details.
// ToDetailsWithOrganizationDetails converts the memberships to generic membership models with organization details.
func (m Memberships) ToDetailsWithOrganizationDetails(orgDetails *models.OrganizationDetails) []*models.Membership[models.OrganizationDetails] {
memberships := make([]*models.Membership[models.OrganizationDetails], len(m))
@@ -31,7 +31,7 @@ func (m Memberships) ToDetailsWithOrganizationDetails(orgDetails *models.Organiz
return memberships
}
// ToDetailsWithProjectDetails convers the memberships to generic membership models with project details.
// ToDetailsWithProjectDetails converts the memberships to generic membership models with project details.
func (m Memberships) ToDetailsWithProjectDetails(projDetails *models.ProjectDetails) []*models.Membership[models.ProjectDetails] {
memberships := make([]*models.Membership[models.ProjectDetails], len(m))
@@ -60,7 +60,7 @@ type Membership struct {
User *User `json:"user"`
}
// ToDetailsWithOrganizationDetails convers the membership to generic membership model with organization details.
// ToDetailsWithOrganizationDetails converts the membership to generic membership model with organization details.
func (m *Membership) ToDetailsWithOrganizationDetails(orgDetails *models.OrganizationDetails) *models.Membership[models.OrganizationDetails] {
if m.ID == "" {
return nil
@@ -74,7 +74,7 @@ func (m *Membership) ToDetailsWithOrganizationDetails(orgDetails *models.Organiz
}
}
// ToDetailsWithOrganizationDetails convers the membership to generic membership model with organization details.
// ToDetailsWithProjectDetails converts the membership to generic membership model with organization details.
func (m *Membership) ToDetailsWithProjectDetails(projDetails *models.ProjectDetails) *models.Membership[models.ProjectDetails] {
if m.ID == "" {
return nil

2
internal/metal/providers/emapi/organizations.go
View File

@@ -75,7 +75,7 @@ func (o *Organization) ToDetails() *models.OrganizationDetails {
func (c *Client) getOrganizationWithMemberships(ctx context.Context, id string) (*Organization, error) {
var org Organization
_, err := c.DoRequest(ctx, http.MethodGet, organizationsPath+"/"+id+"?include=memberships.user", nil, &org)
_, err := c.DoRequest(ctx, http.MethodGet, organizationsPath+"/"+id+"?include=memberships.user", nil, &org) // nolint:bodyclose // body is closed by Do json decode.
if err != nil {
return nil, fmt.Errorf("error loading organization: %w", err)
}

2
internal/metal/providers/emapi/projects.go
View File

@@ -75,7 +75,7 @@ func (p *Project) ToDetails() *models.ProjectDetails {
func (c *Client) getProjectWithMemberships(ctx context.Context, id string) (*Project, error) {
var project Project
_, err := c.DoRequest(ctx, http.MethodGet, projectsPath+"/"+id+"?include=memberships.user", nil, &project)
_, err := c.DoRequest(ctx, http.MethodGet, projectsPath+"/"+id+"?include=memberships.user", nil, &project) // nolint:bodyclose // body is closed by Do json decode.
if err != nil {
return nil, fmt.Errorf("error loading organization: %w", err)
}

2
internal/metal/providers/emapi/users.go
View File

@@ -71,7 +71,7 @@ func (u *User) ToDetails() *models.UserDetails {
func (c *Client) getUser(ctx context.Context, id string) (*User, error) {
var user User
_, err := c.DoRequest(ctx, http.MethodGet, usersPath+"/"+id, nil, &user)
_, err := c.DoRequest(ctx, http.MethodGet, usersPath+"/"+id, nil, &user) // nolint:bodyclose // body is closed by Do json decode.
if err != nil {
return nil, fmt.Errorf("error loading organization: %w", err)
}