Skip to content

Commit 43c2f01

Browse files
committed
fix: close the client after the warden is done because ServeHTTP is a blocking call
Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
1 parent bec51f2 commit 43c2f01

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

pkg/bitwarden/bitwarden.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ func Warden(next http.Handler) http.Handler {
125125

126126
return
127127
}
128+
defer client.Close()
128129

129130
ctx := context.WithValue(r.Context(), ContextClientKey, client)
130131
next.ServeHTTP(w, r.WithContext(ctx))

pkg/server/server.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ func (s *Server) getSecretHandler(w http.ResponseWriter, r *http.Request) {
100100

101101
return
102102
}
103-
defer c.Close()
104103

105104
secretResponse, err := c.Secrets().Get(request.ID)
106105
if err != nil {
@@ -120,7 +119,6 @@ func (s *Server) getByIdsSecretHandler(w http.ResponseWriter, r *http.Request) {
120119

121120
return
122121
}
123-
defer c.Close()
124122

125123
secretResponse, err := c.Secrets().GetByIDS(request.IDS)
126124
if err != nil {
@@ -140,7 +138,6 @@ func (s *Server) listSecretsHandler(w http.ResponseWriter, r *http.Request) {
140138

141139
return
142140
}
143-
defer c.Close()
144141

145142
secretResponse, err := c.Secrets().List(request.OrganizationID)
146143
if err != nil {
@@ -160,7 +157,6 @@ func (s *Server) deleteSecretHandler(w http.ResponseWriter, r *http.Request) {
160157

161158
return
162159
}
163-
defer c.Close()
164160

165161
response, err := c.Secrets().Delete(request.IDS)
166162
if err != nil {
@@ -180,7 +176,6 @@ func (s *Server) createSecretHandler(w http.ResponseWriter, r *http.Request) {
180176

181177
return
182178
}
183-
defer c.Close()
184179

185180
response, err := c.Secrets().Create(request.Key, request.Value, request.Note, request.OrganizationID, request.ProjectIDS)
186181
if err != nil {
@@ -200,7 +195,6 @@ func (s *Server) updateSecretHandler(w http.ResponseWriter, r *http.Request) {
200195

201196
return
202197
}
203-
defer c.Close()
204198

205199
response, err := c.Secrets().Update(request.ID, request.Key, request.Value, request.Note, request.OrganizationID, request.ProjectIDS)
206200
if err != nil {

0 commit comments

Comments
 (0)