Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3d0f7ad

Browse files
kylecarbskylecarbs
committed
Fix linting errors
1 parent e73e0a5 commit 3d0f7ad

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎coderd/parameters.go

+13-14
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ func (api *api) postParameter(rw http.ResponseWriter, r *http.Request) {
4949
if !httpapi.Read(rw, r, &createRequest) {
5050
return
5151
}
52-
scope, id, valid := readScopeAndID(rw, r)
52+
scope, scopeID, valid := readScopeAndID(rw, r)
5353
if !valid {
5454
return
5555
}
56-
parameterValue, err := api.Database.GetParameterValueByScopeAndName(r.Context(), database.GetParameterValueByScopeAndNameParams{
56+
_, err := api.Database.GetParameterValueByScopeAndName(r.Context(), database.GetParameterValueByScopeAndNameParams{
5757
Scope: scope,
58-
ScopeID: id,
58+
ScopeID: scopeID,
5959
Name: createRequest.Name,
6060
})
6161
if err == nil {
@@ -70,13 +70,13 @@ func (api *api) postParameter(rw http.ResponseWriter, r *http.Request) {
7070
})
7171
return
7272
}
73-
parameterValue, err = api.Database.InsertParameterValue(r.Context(), database.InsertParameterValueParams{
73+
parameterValue, err := api.Database.InsertParameterValue(r.Context(), database.InsertParameterValueParams{
7474
ID: uuid.New(),
7575
Name: createRequest.Name,
7676
CreatedAt: database.Now(),
7777
UpdatedAt: database.Now(),
7878
Scope: scope,
79-
ScopeID: id,
79+
ScopeID: scopeID,
8080
SourceScheme: createRequest.SourceScheme,
8181
SourceValue: createRequest.SourceValue,
8282
DestinationScheme: createRequest.DestinationScheme,
@@ -93,13 +93,13 @@ func (api *api) postParameter(rw http.ResponseWriter, r *http.Request) {
9393
}
9494

9595
func (api *api) parameters(rw http.ResponseWriter, r *http.Request) {
96-
scope, id, valid := readScopeAndID(rw, r)
96+
scope, scopeID, valid := readScopeAndID(rw, r)
9797
if !valid {
9898
return
9999
}
100100
parameterValues, err := api.Database.GetParameterValuesByScope(r.Context(), database.GetParameterValuesByScopeParams{
101101
Scope: scope,
102-
ScopeID: id,
102+
ScopeID: scopeID,
103103
})
104104
if errors.Is(err, sql.ErrNoRows) {
105105
err = nil
@@ -120,14 +120,14 @@ func (api *api) parameters(rw http.ResponseWriter, r *http.Request) {
120120
}
121121

122122
func (api *api) deleteParameter(rw http.ResponseWriter, r *http.Request) {
123-
scope, id, valid := readScopeAndID(rw, r)
123+
scope, scopeID, valid := readScopeAndID(rw, r)
124124
if !valid {
125125
return
126126
}
127127
name := chi.URLParam(r, "name")
128128
parameterValue, err := api.Database.GetParameterValueByScopeAndName(r.Context(), database.GetParameterValueByScopeAndNameParams{
129129
Scope: scope,
130-
ScopeID: id,
130+
ScopeID: scopeID,
131131
Name: name,
132132
})
133133
if errors.Is(err, sql.ErrNoRows) {
@@ -167,7 +167,8 @@ func convertParameterValue(parameterValue database.ParameterValue) Parameter {
167167
}
168168
}
169169

170-
func readScopeAndID(rw http.ResponseWriter, r *http.Request) (scope database.ParameterScope, id string, valid bool) {
170+
func readScopeAndID(rw http.ResponseWriter, r *http.Request) (database.ParameterScope, string, bool) {
171+
var scope database.ParameterScope
171172
switch chi.URLParam(r, "scope") {
172173
case string(ParameterOrganization):
173174
scope = database.ParameterScopeOrganization
@@ -181,10 +182,8 @@ func readScopeAndID(rw http.ResponseWriter, r *http.Request) (scope database.Par
181182
httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
182183
Message: fmt.Sprintf("invalid scope %q", scope),
183184
})
184-
return
185+
return scope, "", false
185186
}
186187

187-
id = chi.URLParam(r, "id")
188-
valid = true
189-
return
188+
return scope, chi.URLParam(r, "id"), true
190189
}

‎coderd/parameters_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import (
55
"net/http"
66
"testing"
77

8+
"github.com/stretchr/testify/require"
9+
810
"github.com/coder/coder/coderd"
911
"github.com/coder/coder/coderd/coderdtest"
1012
"github.com/coder/coder/codersdk"
1113
"github.com/coder/coder/database"
12-
"github.com/stretchr/testify/require"
1314
)
1415

1516
func TestPostParameter(t *testing.T) {

‎database/databasefake/databasefake.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func (q *fakeQuerier) AcquireProvisionerJob(_ context.Context, arg database.Acqu
9292
return database.ProvisionerJob{}, sql.ErrNoRows
9393
}
9494

95-
func (q *fakeQuerier) DeleteParameterValueByID(ctx context.Context, id uuid.UUID) error {
95+
func (q *fakeQuerier) DeleteParameterValueByID(_ context.Context, id uuid.UUID) error {
9696
q.mutex.Lock()
9797
defer q.mutex.Unlock()
9898

@@ -470,7 +470,7 @@ func (q *fakeQuerier) GetParameterSchemasByJobID(_ context.Context, jobID uuid.U
470470
return parameters, nil
471471
}
472472

473-
func (q *fakeQuerier) GetParameterValueByScopeAndName(ctx context.Context, arg database.GetParameterValueByScopeAndNameParams) (database.ParameterValue, error) {
473+
func (q *fakeQuerier) GetParameterValueByScopeAndName(_ context.Context, arg database.GetParameterValueByScopeAndNameParams) (database.ParameterValue, error) {
474474
q.mutex.Lock()
475475
defer q.mutex.Unlock()
476476

@@ -489,13 +489,13 @@ func (q *fakeQuerier) GetParameterValueByScopeAndName(ctx context.Context, arg d
489489
return database.ParameterValue{}, sql.ErrNoRows
490490
}
491491

492-
func (q *fakeQuerier) GetProjectsByOrganization(_ context.Context, id string) ([]database.Project, error) {
492+
func (q *fakeQuerier) GetProjectsByOrganization(_ context.Context, organizationID string) ([]database.Project, error) {
493493
q.mutex.Lock()
494494
defer q.mutex.Unlock()
495495

496496
projects := make([]database.Project, 0)
497497
for _, project := range q.project {
498-
if project.OrganizationID == id {
498+
if project.OrganizationID == organizationID {
499499
projects = append(projects, project)
500500
break
501501
}

0 commit comments

Comments
 (0)