Merge remote-tracking branch 'origin/main' into audit-licenses/kira-p…

…ilot
coder · Kira-Pilot · Feb 14, 2023 · Feb 8, 2023 · Feb 8, 2023 · Feb 8, 2023
commit e66b9a83e4cfdf47af99735d1a051f37b4450090
diff --git a/coderd/database/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go
@@ -3860,13 +3860,13 @@ func (q *fakeQuerier) InsertLicense(
 	return l, nil
 }
 
-func (q *fakeQuerier) GetLicense(_ context.Context, id int32) (database.License, error) {
+func (q *fakeQuerier) GetLicenseByID(_ context.Context, id int32) (database.License, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
 
-	for _, l := range q.licenses {
-		if l.ID == id {
-			return l, nil
+	for _, license := range q.licenses {
+		if license.ID == id {
+			return license, nil
 		}
 	}
 	return database.License{}, sql.ErrNoRows

diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/licenses.sql b/coderd/database/queries/licenses.sql
@@ -9,11 +9,6 @@ INSERT INTO
 VALUES
 	($1, $2, $3, $4) RETURNING *;
 
--- name: GetLicense :one
-SELECT *
-FROM licenses
-WHERE id = $1;
-
 -- name: GetLicenses :many
 SELECT *
 FROM licenses

diff --git a/enterprise/coderd/licenses.go b/enterprise/coderd/licenses.go
@@ -214,7 +214,7 @@ func (api *API) deleteLicense(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	dl, err := api.Database.GetLicense(ctx, int32(id))
+	dl, err := api.Database.GetLicenseByID(ctx, int32(id))
 	if err != nil {
 		// don't fail the HTTP request simply because we cannot audit
 		api.Logger.Warn(context.Background(), "could not retrieve license; cannot audit", slog.Error(err))