Skip to content

Commit

Permalink
APIGOV-26574 more provisioning tests and fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@alrosca
alrosca committed Nov 13, 2023
1 parent 4dbdea9 commit 67af6c1
Show file tree
Hide file tree
Showing 2 changed files with 347 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkg/kong/provisioning.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ func (k KongClient) AddQuota(ctx context.Context, routeID, managedAppID, quotaIn
log.WithError(err).Error("failed to update plugin")
return err
}
return nil
}
}

Expand Down Expand Up @@ -233,7 +234,7 @@ func (k KongClient) createACL(ctx context.Context, aclConfig ACLConfig, routeID
},
}

aclPlugin, err := k.Plugins.CreateForRoute(ctx, &routeID, aclPlugin)
_, err := k.Plugins.CreateForRoute(ctx, &routeID, aclPlugin)
if err != nil {
return err
}
Expand All @@ -248,6 +249,7 @@ func (k KongClient) updateOrDeleteACL(ctx context.Context, aclPlugin *klib.Plugi
if err != nil {
return err
}
return nil
}

aclPlugin.Config = klib.Configuration{
Expand Down
344 changes: 344 additions & 0 deletions pkg/kong/provisioning_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
klib "github.com/kong/go-kong/kong"
"github.com/stretchr/testify/assert"

"github.com/Axway/agent-sdk/pkg/apic/provisioning"
"github.com/Axway/agents-kong/pkg/common"
config "github.com/Axway/agents-kong/pkg/config/discovery"
)

Expand Down Expand Up @@ -225,3 +227,345 @@ func TestDeleteConsumer(t *testing.T) {
})
}
}

func TestAddRouteACL(t *testing.T) {
testCases := map[string]struct {
expectErr bool
consumerID string
routeID string
responses map[string]response
}{
"access already granted": {
expectErr: false,
consumerID: "consumerID",
routeID: "routeID",
responses: map[string]response{
formatRequestKey(http.MethodGet, "/plugins"): {
code: http.StatusOK,
dataIface: map[string]interface{}{
"data": []*klib.Plugin{
{
ID: klib.String("aclPluginID"),
Name: klib.String(common.AclPlugin),
Route: &klib.Route{
ID: klib.String("routeID"),
},
Config: klib.Configuration{
"allow": []string{"consumerID"},
},
},
},
"next": "null",
},
},
},
},
"grant access, acl doesn't exist": {
expectErr: false,
consumerID: "consumerID",
routeID: "routeID",
responses: map[string]response{
formatRequestKey(http.MethodGet, "/plugins"): {
code: http.StatusOK,
dataIface: map[string]interface{}{
"data": []*klib.Plugin{},
"next": "null",
},
},
formatRequestKey(http.MethodPost, "/routes/routeID/plugins"): {
code: http.StatusOK,
dataIface: &klib.Plugin{
ID: klib.String("aclPluginID"),
Name: klib.String(common.AclPlugin),
Route: &klib.Route{
ID: klib.String("routeID"),
},
Config: klib.Configuration{
"allow": []string{"consumerID"},
},
},
},
},
},
"grant access, acl exists": {
expectErr: false,
consumerID: "consumerID",
routeID: "routeID",
responses: map[string]response{
formatRequestKey(http.MethodGet, "/plugins"): {
code: http.StatusOK,
dataIface: map[string]interface{}{
"data": []*klib.Plugin{
{
ID: klib.String("aclPluginID"),
Name: klib.String(common.AclPlugin),
Route: &klib.Route{
ID: klib.String("routeID"),
},
Config: klib.Configuration{
"allow": []string{},
},
},
},
"next": "null",
},
},
formatRequestKey(http.MethodPatch, "/routes/routeID/plugins/aclPluginID"): {
code: http.StatusOK,
dataIface: &klib.Plugin{
ID: klib.String("aclPluginID"),
Name: klib.String(common.AclPlugin),
Route: &klib.Route{
ID: klib.String("routeID"),
},
Config: klib.Configuration{
"allow": []string{"consumerID"},
},
},
},
},
},
}
for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
client := createClient(tc.responses)
err := client.AddRouteACL(context.TODO(), tc.routeID, tc.consumerID)
if tc.expectErr {
assert.NotNil(t, err)
return
}
assert.Nil(t, err)
})
}
}

func TestRemoveRouteACL(t *testing.T) {
testCases := map[string]struct {
expectErr bool
consumerID string
routeID string
responses map[string]response
}{
"access already revoked": {
expectErr: false,
consumerID: "consumerID",
routeID: "routeID",
responses: map[string]response{
formatRequestKey(http.MethodGet, "/plugins"): {
code: http.StatusOK,
dataIface: map[string]interface{}{
"data": []*klib.Plugin{
{
ID: klib.String("aclPluginID"),
Name: klib.String(common.AclPlugin),
Route: &klib.Route{
ID: klib.String("routeID"),
},
Config: klib.Configuration{
"allow": []string{},
},
},
},
"next": "null",
},
},
},
},
"access revoked, no rate limiting plugin": {
expectErr: false,
consumerID: "consumerID",
routeID: "routeID",
responses: map[string]response{
formatRequestKey(http.MethodGet, "/plugins"): {
code: http.StatusOK,
dataIface: map[string]interface{}{
"data": []*klib.Plugin{
{
ID: klib.String("aclPluginID"),
Name: klib.String(common.AclPlugin),
Route: &klib.Route{
ID: klib.String("routeID"),
},
Config: klib.Configuration{
"allow": []string{"consumerID"},
},
},
},
"next": "null",
},
},
formatRequestKey(http.MethodDelete, "/routes/routeID/plugins/aclPluginID"): {
code: http.StatusNoContent,
},
},
},
"access revoked, rate limiting plugin disabled": {
expectErr: false,
consumerID: "consumerID",
routeID: "routeID",
responses: map[string]response{
formatRequestKey(http.MethodGet, "/plugins"): {
code: http.StatusOK,
dataIface: map[string]interface{}{
"data": []*klib.Plugin{
{
ID: klib.String("aclPluginID"),
Name: klib.String(common.AclPlugin),
Route: &klib.Route{
ID: klib.String("routeID"),
},
Config: klib.Configuration{
"allow": []string{"consumerID"},
},
},
{
ID: klib.String("rateLimitingID"),
Name: klib.String(common.RateLimitingPlugin),
Route: &klib.Route{
ID: klib.String("routeID"),
},
Enabled: klib.Bool(true),
},
},
"next": "null",
},
},
formatRequestKey(http.MethodDelete, "/routes/routeID/plugins/aclPluginID"): {
code: http.StatusNoContent,
},
formatRequestKey(http.MethodPatch, "/routes/routeID/plugins/rateLimitingID"): {
code: http.StatusOK,
dataIface: &klib.Plugin{
ID: klib.String("rateLimitingID"),
Name: klib.String(common.RateLimitingPlugin),
Route: &klib.Route{
ID: klib.String("routeID"),
},
Enabled: klib.Bool(false),
},
},
},
},
}
for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
client := createClient(tc.responses)
err := client.RemoveRouteACL(context.TODO(), tc.routeID, tc.consumerID)
if tc.expectErr {
assert.NotNil(t, err)
return
}
assert.Nil(t, err)
})
}
}

func TestAddQuota(t *testing.T) {
testCases := map[string]struct {
expectErr bool
consumerID string
routeID string
quotaInterval string
quotaLimit int
responses map[string]response
}{
"rate limiting already enabled": {
expectErr: false,
consumerID: "consumerID",
routeID: "routeID",
responses: map[string]response{
formatRequestKey(http.MethodGet, "/plugins"): {
code: http.StatusOK,
dataIface: map[string]interface{}{
"data": []*klib.Plugin{
{
ID: klib.String("rateLimitingID"),
Name: klib.String(common.RateLimitingPlugin),
Route: &klib.Route{
ID: klib.String("routeID"),
},
Enabled: klib.Bool(true),
},
},
"next": "null",
},
},
},
},
"enable rate limiting": {
expectErr: false,
consumerID: "consumerID",
routeID: "routeID",
responses: map[string]response{
formatRequestKey(http.MethodGet, "/plugins"): {
code: http.StatusOK,
dataIface: map[string]interface{}{
"data": []*klib.Plugin{
{
ID: klib.String("rateLimitingID"),
Name: klib.String(common.RateLimitingPlugin),
Route: &klib.Route{
ID: klib.String("routeID"),
},
Enabled: klib.Bool(false),
},
},
"next": "null",
},
},
formatRequestKey(http.MethodPatch, "/routes/routeID/plugins/rateLimitingID"): {
code: http.StatusOK,
dataIface: &klib.Plugin{
ID: klib.String("rateLimitingID"),
Name: klib.String(common.RateLimitingPlugin),
Route: &klib.Route{
ID: klib.String("routeID"),
},
Enabled: klib.Bool(true),
},
},
},
},
"add rate limiting plugin": {
expectErr: false,
consumerID: "consumerID",
routeID: "routeID",
quotaInterval: provisioning.Daily.String(),
quotaLimit: 7,
responses: map[string]response{
formatRequestKey(http.MethodGet, "/plugins"): {
code: http.StatusOK,
dataIface: map[string]interface{}{
"data": []*klib.Plugin{},
"next": "null",
},
},
formatRequestKey(http.MethodPost, "/routes/routeID/plugins"): {
code: http.StatusOK,
dataIface: &klib.Plugin{
ID: klib.String("rateLimitingID"),
Name: klib.String(common.RateLimitingPlugin),
Route: &klib.Route{
ID: klib.String("routeID"),
},
Config: klib.Configuration{
"policy": "local",
"day": 7,
},
},
},
},
},
}
for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
client := createClient(tc.responses)
err := client.AddQuota(context.TODO(), tc.routeID, tc.consumerID, tc.quotaInterval, tc.quotaLimit)
if tc.expectErr {
assert.NotNil(t, err)
return
}
assert.Nil(t, err)
})
}
}

0 comments on commit 67af6c1

Please sign in to comment.