Skip to content

Check request ID in state providers #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LeiQL wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Check request ID in state providers #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c56848
guard request ID null in state providers
LeiQL Jan 22, 2024
f9cd855
handle badrequest
LeiQL Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion api/pkg/apis/v1alpha1/providers/states/k8s/k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,12 @@ func (s *K8sStateProvider) Upsert(ctx context.Context, entry states.UpsertReques
Resource: resource,
}

j, _ := json.Marshal(entry.Value.Body)
if entry.Value.ID == "" {
err := v1alpha2.NewCOAError(nil, "found invalid request ID", v1alpha2.BadRequest)
return "", err
}

j, _ := json.Marshal(entry.Value.Body)
item, err := s.DynamicClient.Resource(resourceId).Namespace(scope).Get(ctx, entry.Value.ID, metav1.GetOptions{})
if err != nil {
// TODO: check if not-found error
Expand Down Expand Up @@ -355,6 +359,11 @@ func (s *K8sStateProvider) Delete(ctx context.Context, request states.DeleteRequ
scope = "default"
}

if request.ID == "" {
err := v1alpha2.NewCOAError(nil, "found invalid request ID", v1alpha2.BadRequest)
return err
}

err = s.DynamicClient.Resource(resourceId).Namespace(scope).Delete(ctx, request.ID, metav1.DeleteOptions{})
if err != nil {
sLog.Errorf(" P (K8s State): failed to delete objects: %v", err)
Expand Down Expand Up @@ -387,6 +396,11 @@ func (s *K8sStateProvider) Get(ctx context.Context, request states.GetRequest) (
Resource: resource,
}

if request.ID == "" {
err := v1alpha2.NewCOAError(nil, "found invalid request ID", v1alpha2.BadRequest)
return states.StateEntry{}, err
}

item, err := s.DynamicClient.Resource(resourceId).Namespace(scope).Get(ctx, request.ID, metav1.GetOptions{})
if err != nil {
coaError := v1alpha2.NewCOAError(err, "failed to get object", v1alpha2.InternalError)
Expand Down
2 changes: 1 addition & 1 deletion api/pkg/apis/v1alpha1/providers/states/k8s/k8s_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func TestInitWithBadData(t *testing.T) {
assert.NotNil(t, err)
}

func TestUpSert(t *testing.T) {
func TestUpsert(t *testing.T) {
testK8s := os.Getenv("TEST_K8S_STATE")
if testK8s == "" {
t.Skip("Skipping because TEST_K8S_STATE enviornment variable is not set")
Expand Down
18 changes: 15 additions & 3 deletions coa/pkg/apis/v1alpha2/providers/states/httpstate/httpstate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,21 @@ func (s *HttpStateProvider) Init(config providers.IProviderConfig) error {
}
s.Config = stateConfig
if s.Config.Url == "" {
return v1alpha2.NewCOAError(nil, "Http sate provider url is not set", v1alpha2.BadConfig)
return v1alpha2.NewCOAError(nil, "Http state provider url is not set", v1alpha2.BadConfig)
}
s.Data = make(map[string]interface{}, 0)
return nil
}

func (s *HttpStateProvider) Upsert(ctx context.Context, entry states.UpsertRequest) (string, error) {

client := &http.Client{}
rUrl := s.Config.Url
var err error
if entry.Value.ID == "" {
err = v1alpha2.NewCOAError(nil, "found invalid entry ID", v1alpha2.BadRequest)
return "", err
}
if s.Config.PostNameInPath {
rUrl, err = url.JoinPath(s.Config.Url, entry.Value.ID)
}
Expand Down Expand Up @@ -157,11 +162,15 @@ func (s *HttpStateProvider) Upsert(ctx context.Context, entry states.UpsertReque
}

func (s *HttpStateProvider) List(ctx context.Context, request states.ListRequest) ([]states.StateEntry, string, error) {
return nil, "", v1alpha2.NewCOAError(nil, "Http sate store list is not implemented", v1alpha2.NotImplemented)
return nil, "", v1alpha2.NewCOAError(nil, "Http state store list is not implemented", v1alpha2.NotImplemented)
}

func (s *HttpStateProvider) Delete(ctx context.Context, request states.DeleteRequest) error {
client := &http.Client{}
if request.ID == "" {
err := v1alpha2.NewCOAError(nil, "found invalid request ID", v1alpha2.BadRequest)
return err
}
rUrl, err := url.JoinPath(s.Config.Url, request.ID)
if err != nil {
return err
Expand All @@ -176,13 +185,16 @@ func (s *HttpStateProvider) Delete(ctx context.Context, request states.DeleteReq
}
if resp.StatusCode >= 300 {
return v1alpha2.NewCOAError(nil, fmt.Sprintf("failed to delete from HTTP state store: [%d]", resp.StatusCode), v1alpha2.InternalError)

}
return nil
}

func (s *HttpStateProvider) Get(ctx context.Context, request states.GetRequest) (states.StateEntry, error) {
client := &http.Client{}
if request.ID == "" {
err := v1alpha2.NewCOAError(nil, "found invalid request ID", v1alpha2.BadRequest)
return states.StateEntry{}, err
}
rUrl, err := url.JoinPath(s.Config.Url, request.ID)
if err != nil {
return states.StateEntry{}, err
Expand Down
56 changes: 56 additions & 0 deletions coa/pkg/apis/v1alpha2/providers/states/httpstate/httpstate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package httpstate
import (
"context"
"encoding/json"
"io/ioutil"
"net/http"
"net/http/httptest"
"os"
Expand Down Expand Up @@ -237,12 +238,48 @@ func TestGet(t *testing.T) {
func TestUpsertGetDelete(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method == "GET" {
relativePath := r.URL.Path
if relativePath == "" || relativePath == "/" {
http.Error(w, "invalid path", http.StatusBadRequest)
return
}
response := map[string]interface{}{
"key": "abc",
}
jsonResponse, _ := json.Marshal(response)
w.Header().Set("Content-Type", "application/json")
w.Write(jsonResponse)
} else if r.Method == "POST" {
var data []map[string]interface{}
body, _ := ioutil.ReadAll(r.Body)
err := json.Unmarshal([]byte(body), &data)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
if len(data) == 0 {
http.Error(w, "invalid request body", http.StatusBadRequest)
return
}
firstItemKey := data[0]["key"].(string)
if firstItemKey == "" {
http.Error(w, "invalid request body", http.StatusBadRequest)
return
}
response := map[string]interface{}{
"key": data[0]["key"],
"value": data[0]["value"],
}
jsonResponse, _ := json.Marshal(response)
w.Header().Set("Content-Type", "application/json")
w.Write(jsonResponse)
} else if r.Method == "DELETE" {
relativePath := r.URL.Path
if relativePath == "" || relativePath == "/" {
http.Error(w, "invalid path", http.StatusBadRequest)
return
}
w.Write([]byte("OK"))
} else {
w.Write([]byte("OK"))
}
Expand All @@ -258,6 +295,7 @@ func TestUpsertGetDelete(t *testing.T) {
PostAsArray: true,
NotFoundAs204: true,
})
assert.Nil(t, err)

_, err = provider.Upsert(context.Background(), states.UpsertRequest{
Value: states.StateEntry{
Expand All @@ -277,6 +315,24 @@ func TestUpsertGetDelete(t *testing.T) {
ID: "123",
})
assert.Nil(t, err)

_, err = provider.Upsert(context.Background(), states.UpsertRequest{
Value: states.StateEntry{
ID: "",
Body: TestPayload{},
},
})
assert.NotNil(t, err)

_, err = provider.Get(context.Background(), states.GetRequest{
ID: "",
})
assert.NotNil(t, err)

err = provider.Delete(context.Background(), states.DeleteRequest{
ID: "",
})
assert.NotNil(t, err)
}

func TestClone(t *testing.T) {
Expand Down