-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Addressed twifkak comments: refactored IsHealthy, also added healthz …
…http handler.
- Loading branch information
Showing
10 changed files
with
170 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Copyright 2019 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package healthz | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "github.com/ampproject/amppackager/packager/certcache" | ||
| "net/http" | ||
| ) | ||
|
|
||
| type Healthz struct { | ||
| certHandler certcache.CertHandler | ||
| } | ||
|
|
||
| func New(certHandler certcache.CertHandler) (*Healthz, error) { | ||
| return &Healthz{certHandler}, nil | ||
| } | ||
|
|
||
| func (this *Healthz) ServeHTTP(resp http.ResponseWriter, req *http.Request) { | ||
| // Follow https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ | ||
| err := this.certHandler.IsHealthy() | ||
| if err != nil { | ||
| resp.WriteHeader(500) | ||
| resp.Write([]byte(fmt.Sprintf("not healthy: %v", err))) | ||
| } else { | ||
| resp.WriteHeader(200) | ||
| resp.Write([]byte("ok")) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| // Copyright 2019 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package healthz | ||
|
|
||
| import ( | ||
| "crypto/x509" | ||
| "net/http" | ||
| "testing" | ||
|
|
||
| "github.com/ampproject/amppackager/packager/mux" | ||
| "github.com/pkg/errors" | ||
|
|
||
| pkgt "github.com/ampproject/amppackager/packager/testing" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| type fakeHealthyCertHandler struct { | ||
| } | ||
|
|
||
| func (this fakeHealthyCertHandler) GetLatestCert() *x509.Certificate { | ||
| return pkgt.Certs[0] | ||
| } | ||
|
|
||
| func (this fakeHealthyCertHandler) IsHealthy() error { | ||
| return nil | ||
| } | ||
|
|
||
| type fakeNotHealthyCertHandler struct { | ||
| } | ||
|
|
||
| func (this fakeNotHealthyCertHandler) GetLatestCert() *x509.Certificate { | ||
| return pkgt.Certs[0] | ||
| } | ||
|
|
||
| func (this fakeNotHealthyCertHandler) IsHealthy() error { | ||
| return errors.New("random error") | ||
| } | ||
|
|
||
| func TestHealthzOk(t *testing.T) { | ||
| handler, err := New(fakeHealthyCertHandler{}) | ||
| require.NoError(t, err) | ||
| resp := pkgt.Get(t, mux.New(nil, nil, nil, handler), "/healthz") | ||
| assert.Equal(t, http.StatusOK, resp.StatusCode, "ok", resp) | ||
| } | ||
|
|
||
| func TestHealthzFail(t *testing.T) { | ||
| handler, err := New(fakeNotHealthyCertHandler{}) | ||
| require.NoError(t, err) | ||
| resp := pkgt.Get(t, mux.New(nil, nil, nil, handler), "/healthz") | ||
| assert.Equal(t, http.StatusInternalServerError, resp.StatusCode, "error", resp) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.