Skip to content

Commit 13dcd40

Browse files
github-actions[bot]github-actions[bot]
committed
fix: linting
1 parent b5f9403 commit 13dcd40

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

‎github/data_source_github_enterprise_cost_centers_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestAccGithubEnterpriseCostCentersDataSource(t *testing.T) {
4949
})
5050
}
5151

52-
func testAccCheckEnterpriseCostCentersListContains(costCenterResourceName string, dataSourceName string) resource.TestCheckFunc {
52+
func testAccCheckEnterpriseCostCentersListContains(costCenterResourceName, dataSourceName string) resource.TestCheckFunc {
5353
return func(s *terraform.State) error {
5454
cc, ok := s.RootModule().Resources[costCenterResourceName]
5555
if !ok {

‎github/resource_github_enterprise_cost_center_resources.go‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -135,44 +135,45 @@ func resourceGithubEnterpriseCostCenterResourcesUpdate(ctx context.Context, d *s
135135
const costCenterResourcesRetryTimeout = 5 * time.Minute
136136

137137
retryRemove := func(req enterpriseCostCenterResourcesRequest) error {
138+
//nolint:staticcheck
138139
return resource.RetryContext(ctx, costCenterResourcesRetryTimeout, func() *resource.RetryError {
139140
_, err := enterpriseCostCenterRemoveResources(ctx, client, enterpriseSlug, costCenterID, req)
140141
if err == nil {
141142
return nil
142143
}
143144
if isRetryableGithubResponseError(err) {
145+
//nolint:staticcheck
144146
return resource.RetryableError(err)
145147
}
148+
//nolint:staticcheck
146149
return resource.NonRetryableError(err)
147150
})
148151
}
149152

150153
retryAssign := func(req enterpriseCostCenterResourcesRequest) error {
154+
//nolint:staticcheck
151155
return resource.RetryContext(ctx, costCenterResourcesRetryTimeout, func() *resource.RetryError {
152156
_, err := enterpriseCostCenterAssignResources(ctx, client, enterpriseSlug, costCenterID, req)
153157
if err == nil {
154158
return nil
155159
}
156160
if isRetryableGithubResponseError(err) {
161+
//nolint:staticcheck
157162
return resource.RetryableError(err)
158163
}
164+
//nolint:staticcheck
159165
return resource.NonRetryableError(err)
160166
})
161167
}
162168

163-
chunk := func(items []string, size int) [][]string {
169+
chunk := func(items []string, _ int) [][]string {
164170
if len(items) == 0 {
165171
return nil
166172
}
167-
if size <= 0 {
168-
size = len(items)
169-
}
173+
const size = maxResourcesPerRequest
170174
chunks := make([][]string, 0, (len(items)+size-1)/size)
171175
for start := 0; start < len(items); start += size {
172-
end := start + size
173-
if end > len(items) {
174-
end = len(items)
175-
}
176+
end := min(start+size, len(items))
176177
chunks = append(chunks, items[start:end])
177178
}
178179
return chunks
@@ -252,14 +253,17 @@ func resourceGithubEnterpriseCostCenterResourcesDelete(ctx context.Context, d *s
252253
const costCenterResourcesRetryTimeout = 5 * time.Minute
253254

254255
retryRemove := func(req enterpriseCostCenterResourcesRequest) error {
256+
//nolint:staticcheck
255257
return resource.RetryContext(ctx, costCenterResourcesRetryTimeout, func() *resource.RetryError {
256258
_, err := enterpriseCostCenterRemoveResources(ctx, client, enterpriseSlug, costCenterID, req)
257259
if err == nil {
258260
return nil
259261
}
260262
if isRetryableGithubResponseError(err) {
263+
//nolint:staticcheck
261264
return resource.RetryableError(err)
262265
}
266+
//nolint:staticcheck
263267
return resource.NonRetryableError(err)
264268
})
265269
}
@@ -273,10 +277,7 @@ func resourceGithubEnterpriseCostCenterResourcesDelete(ctx context.Context, d *s
273277
}
274278
chunks := make([][]string, 0, (len(items)+size-1)/size)
275279
for start := 0; start < len(items); start += size {
276-
end := start + size
277-
if end > len(items) {
278-
end = len(items)
279-
}
280+
end := min(start+size, len(items))
280281
chunks = append(chunks, items[start:end])
281282
}
282283
return chunks
@@ -358,7 +359,7 @@ func isRetryableGithubResponseError(err error) bool {
358359
return false
359360
}
360361

361-
func diffStringSlices(current []string, desired []string) (toAdd []string, toRemove []string) {
362+
func diffStringSlices(current, desired []string) (toAdd, toRemove []string) {
362363
cur := schema.NewSet(schema.HashString, stringSliceToAnySlice(current))
363364
des := schema.NewSet(schema.HashString, stringSliceToAnySlice(desired))
364365

‎github/util_cost_centers.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ type enterpriseCostCenterRemoveResponse struct {
6161
Message string `json:"message"`
6262
}
6363

64-
func enterpriseCostCentersList(ctx context.Context, client *github.Client, enterpriseSlug string, state string) ([]enterpriseCostCenter, error) {
64+
func enterpriseCostCentersList(ctx context.Context, client *github.Client, enterpriseSlug, state string) ([]enterpriseCostCenter, error) {
6565
u, err := url.Parse(fmt.Sprintf("enterprises/%s/settings/billing/cost-centers", enterpriseSlug))
6666
if err != nil {
6767
return nil, err
@@ -87,7 +87,7 @@ func enterpriseCostCentersList(ctx context.Context, client *github.Client, enter
8787
return result.CostCenters, nil
8888
}
8989

90-
func enterpriseCostCenterGet(ctx context.Context, client *github.Client, enterpriseSlug string, costCenterID string) (*enterpriseCostCenter, error) {
90+
func enterpriseCostCenterGet(ctx context.Context, client *github.Client, enterpriseSlug, costCenterID string) (*enterpriseCostCenter, error) {
9191
req, err := client.NewRequest("GET", fmt.Sprintf("enterprises/%s/settings/billing/cost-centers/%s", enterpriseSlug, costCenterID), nil)
9292
if err != nil {
9393
return nil, err
@@ -102,7 +102,7 @@ func enterpriseCostCenterGet(ctx context.Context, client *github.Client, enterpr
102102
return &result, nil
103103
}
104104

105-
func enterpriseCostCenterCreate(ctx context.Context, client *github.Client, enterpriseSlug string, name string) (*enterpriseCostCenter, error) {
105+
func enterpriseCostCenterCreate(ctx context.Context, client *github.Client, enterpriseSlug, name string) (*enterpriseCostCenter, error) {
106106
req, err := client.NewRequest("POST", fmt.Sprintf("enterprises/%s/settings/billing/cost-centers", enterpriseSlug), &enterpriseCostCenterCreateRequest{Name: name})
107107
if err != nil {
108108
return nil, err
@@ -117,7 +117,7 @@ func enterpriseCostCenterCreate(ctx context.Context, client *github.Client, ente
117117
return &result, nil
118118
}
119119

120-
func enterpriseCostCenterUpdate(ctx context.Context, client *github.Client, enterpriseSlug string, costCenterID string, name string) (*enterpriseCostCenter, error) {
120+
func enterpriseCostCenterUpdate(ctx context.Context, client *github.Client, enterpriseSlug, costCenterID, name string) (*enterpriseCostCenter, error) {
121121
req, err := client.NewRequest("PATCH", fmt.Sprintf("enterprises/%s/settings/billing/cost-centers/%s", enterpriseSlug, costCenterID), &enterpriseCostCenterUpdateRequest{Name: name})
122122
if err != nil {
123123
return nil, err
@@ -132,7 +132,7 @@ func enterpriseCostCenterUpdate(ctx context.Context, client *github.Client, ente
132132
return &result, nil
133133
}
134134

135-
func enterpriseCostCenterArchive(ctx context.Context, client *github.Client, enterpriseSlug string, costCenterID string) (*enterpriseCostCenterArchiveResponse, error) {
135+
func enterpriseCostCenterArchive(ctx context.Context, client *github.Client, enterpriseSlug, costCenterID string) (*enterpriseCostCenterArchiveResponse, error) {
136136
req, err := client.NewRequest("DELETE", fmt.Sprintf("enterprises/%s/settings/billing/cost-centers/%s", enterpriseSlug, costCenterID), nil)
137137
if err != nil {
138138
return nil, err
@@ -147,7 +147,7 @@ func enterpriseCostCenterArchive(ctx context.Context, client *github.Client, ent
147147
return &result, nil
148148
}
149149

150-
func enterpriseCostCenterAssignResources(ctx context.Context, client *github.Client, enterpriseSlug string, costCenterID string, reqBody enterpriseCostCenterResourcesRequest) (*enterpriseCostCenterAssignResponse, error) {
150+
func enterpriseCostCenterAssignResources(ctx context.Context, client *github.Client, enterpriseSlug, costCenterID string, reqBody enterpriseCostCenterResourcesRequest) (*enterpriseCostCenterAssignResponse, error) {
151151
req, err := client.NewRequest("POST", fmt.Sprintf("enterprises/%s/settings/billing/cost-centers/%s/resource", enterpriseSlug, costCenterID), &reqBody)
152152
if err != nil {
153153
return nil, err
@@ -162,7 +162,8 @@ func enterpriseCostCenterAssignResources(ctx context.Context, client *github.Cli
162162
return &result, nil
163163
}
164164

165-
func enterpriseCostCenterRemoveResources(ctx context.Context, client *github.Client, enterpriseSlug string, costCenterID string, reqBody enterpriseCostCenterResourcesRequest) (*enterpriseCostCenterRemoveResponse, error) {
165+
//nolint:unparam
166+
func enterpriseCostCenterRemoveResources(ctx context.Context, client *github.Client, enterpriseSlug, costCenterID string, reqBody enterpriseCostCenterResourcesRequest) (*enterpriseCostCenterRemoveResponse, error) {
166167
req, err := client.NewRequest("DELETE", fmt.Sprintf("enterprises/%s/settings/billing/cost-centers/%s/resource", enterpriseSlug, costCenterID), &reqBody)
167168
if err != nil {
168169
return nil, err
@@ -177,7 +178,7 @@ func enterpriseCostCenterRemoveResources(ctx context.Context, client *github.Cli
177178
return &result, nil
178179
}
179180

180-
func enterpriseCostCenterSplitResources(resources []enterpriseCostCenterResource) (users []string, organizations []string, repositories []string) {
181+
func enterpriseCostCenterSplitResources(resources []enterpriseCostCenterResource) (users, organizations, repositories []string) {
181182
for _, r := range resources {
182183
switch strings.ToLower(r.Type) {
183184
case "user":

0 commit comments

Comments
 (0)