faas-rs/faasd
1
0
Fork 0
mirror of https://github.com/openfaas/faasd.git synced 2025-06-08 16:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review feedback for Labeller

Browse Source 
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (OpenFaaS Ltd) 2022-01-19 18:13:05 +00:00
parent a2ea804d2c
commit 8003748b73
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/provider/handlers/secret_test.go
View File

@ -14,7 +14,7 @@ import (
"github.com/openfaas/faas-provider/types"
"github.com/openfaas/faasd/pkg"
mock "github.com/openfaas/faasd/pkg/provider"
provider "github.com/openfaas/faasd/pkg/provider"
)
func Test_parseSecret(t *testing.T) {
@ -210,10 +210,9 @@ func TestListSecrets(t *testing.T) {
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
fakeStore := &mock.FakeLabeller{}
fakeStore.FakeLabels = tc.labels
labelStore := provider.NewFakeLabeller(tc.labels)
handler := MakeSecretHandler(fakeStore, mountPath)
handler := MakeSecretHandler(labelStore, mountPath)
path := "http://example.com/foo"
if len(tc.namespace) > 0 {
@ -226,29 +225,27 @@ func TestListSecrets(t *testing.T) {
resp := w.Result()
if resp.StatusCode != tc.status {
t.Logf("response body: %s", w.Body.String())
t.Fatalf("expected status: %d, got: %d", tc.status, resp.StatusCode)
t.Fatalf("want status: %d, but got: %d", tc.status, resp.StatusCode)
}
if resp.StatusCode != http.StatusOK && w.Body.String() != tc.err {
t.Fatalf("expected error message: %q, got %q", tc.err, w.Body.String())
t.Fatalf("want error message: %q, but got %q", tc.err, w.Body.String())
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
t.Fatalf("can not read response of list %v", err)
t.Fatalf("can't read response of list %v", err)
}
var res []types.Secret
err = json.Unmarshal(body, &res)
if err != nil {
t.Fatalf("can not read response of list %v", err)
t.Fatalf("unable to unmarshal %q, error: %v", string(body), err)
}
if !reflect.DeepEqual(res, tc.expected) {
t.Fatalf("expected response: %v, got: %v", tc.expected, res)
t.Fatalf("want response: %v, but got: %v", tc.expected, res)
}
})
}

17
pkg/provider/labeller.go
View File

@ -2,17 +2,24 @@ package provider
import "context"
// Labeller can return labels for a namespace from containerd.
type Labeller interface {
Labels(ctx context.Context, namespace string) (map[string]string, error)
}
/*
* FakeLabeller can be used to fake labels applied on namespace to mark them valid/invalid for openfaas functions
*/
//
// FakeLabeller can be used to fake labels applied on namespace to mark
// them valid/invalid for openfaas functions
type FakeLabeller struct {
FakeLabels map[string]string
labels map[string]string
}
func NewFakeLabeller(labels map[string]string) Labeller {
return &FakeLabeller{
labels: labels,
}
}
func (s *FakeLabeller) Labels(ctx context.Context, namespace string) (map[string]string, error) {
return s.FakeLabels, nil
return s.labels, nil
}