Skip to content
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.

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

feat: add support to validate via Kong API #502

Merged
merged 20 commits into from
Jan 19, 2022
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
14 changes: 14 additions & 0 deletions cmd/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,20 @@ var (
assumeYes bool
)

func validateEntity(ctx context.Context, kongClient *kong.Client, entityType string, entity interface{}) (bool, error) {
errWrap := "validate entity '%s': %s"
endpoint := fmt.Sprintf("/schemas/%s/validate", entityType)
req, err := kongClient.NewRequest(http.MethodPost, endpoint, nil, entity)
if err != nil {
return false, fmt.Errorf(errWrap, entityType, err)
}
resp, err := kongClient.Do(ctx, req, nil)
if err != nil {
return false, fmt.Errorf(errWrap, entityType, err)
}
return resp.StatusCode == http.StatusOK, nil
}

// workspaceExists checks if workspace exists in Kong.
func workspaceExists(ctx context.Context, config utils.KongClientConfig, workspaceName string) (bool, error) {
rootConfig := config.ForWorkspace("")
Expand Down
146 changes: 143 additions & 3 deletions cmd/validate.go
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
package cmd

import (
"context"
"fmt"
"reflect"
"sync"

"github.com/kong/deck/file"
"github.com/kong/deck/state"
"github.com/kong/deck/utils"
"github.com/kong/go-kong/kong"
"github.com/spf13/cobra"
)

var (
validateCmdKongStateFile []string
validateCmdRBACResourcesOnly bool
validateOnline bool
)

var maxConcurrency = 100
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hbagdi what value you think would be most appropriate here? For now I pseudo-randomly set it to 100, which is slightly lower than the nginx default of 128.

Another option would be to have a default value but make it configurable with a CLI flag.

Thoughts?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's make it configurable from the get-go. Add a --parallelism flag to the validate command.


// validateCmd represents the diff command
var validateCmd = &cobra.Command{
Use: "validate",
Short: "Validate the state file",
Long: `The validate command reads the state file and ensures validity.

It reads all the specified state files and reports YAML/JSON
parsing issues. It also checks for foreign relationships
and alerts if there are broken relationships, or missing links present.

No communication takes places between decK and Kong during the execution of
this command.
this command unless --online flag is used.
`,
Args: validateNoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
Expand All @@ -50,11 +58,18 @@ this command.
return err
}
// this catches foreign relation errors
_, err = state.Get(rawState)
ks, err := state.Get(rawState)
if err != nil {
return err
}

if validateOnline {
if errs := validateWithKong(cmd, ks); errs != nil {
for _, e := range errs {
fmt.Println(e)
hbagdi marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad, we don't print errors, we return the error from this command and cobra prints and exists appropriately.
You will need to implement an error type that can hold multiple errors and print those.
Similar to t

return nil
},
PreRunE: func(cmd *cobra.Command, args []string) error {
Expand All @@ -66,6 +81,128 @@ this command.
},
}

func validateEntities(ctx context.Context, obj interface{}, kongClient *kong.Client, entityType string) []error {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most of the functions that have been added in this PR should belong to either the util package or a new kong/validation package. cmd package must not have such business logic within itself.
Please move these functions.

entities := callGetAll(obj)
errors := []error{}

// create a buffer of channels. Creation of new coroutines
// are allowed only if the buffer is not full.
chanBuff := make(chan struct{}, maxConcurrency)

var wg sync.WaitGroup
wg.Add(entities.Len())
hbagdi marked this conversation as resolved.
Show resolved Hide resolved
// each coroutine will append on a slice of errors.
// since slices are not thread-safe, let's add a mutex
// to handle access to the slice.
mu := &sync.Mutex{}
for i := 0; i < entities.Len(); i++ {
// reserve a slot
chanBuff <- struct{}{}
go func(i int) {
defer wg.Done()
// release a slot when completed
defer func() { <-chanBuff }()
_, err := validateEntity(ctx, kongClient, entityType, entities.Index(i).Interface())
if err != nil {
mu.Lock()
errors = append(errors, err)
mu.Unlock()
}
}(i)
}
wg.Wait()
return errors
}

func validateWithKong(cmd *cobra.Command, ks *state.KongState) []error {
ctx := cmd.Context()
kongClient, err := utils.GetKongClient(rootConfig)
allErr := []error{}
if err != nil {
return []error{err}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a call to fetchKongVersion using this client here? See cmd/ping.go for example.
This is to ensure that there is connectivity (network-level + authn) with Kong before we start throwing requests.

if err := validateEntities(ctx, ks.Services, kongClient, "services"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.ACLGroups, kongClient, "acls"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.BasicAuths, kongClient, "basicauth_credentials"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.CACertificates, kongClient, "ca_certificates"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.Certificates, kongClient, "certificates"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.Consumers, kongClient, "consumers"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.Documents, kongClient, "documents"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.HMACAuths, kongClient, "hmacauth_credentials"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.JWTAuths, kongClient, "jwt_secrets"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.KeyAuths, kongClient, "keyauth_credentials"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.Oauth2Creds, kongClient, "oauth2_credentials"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.Plugins, kongClient, "plugins"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.Routes, kongClient, "routes"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.SNIs, kongClient, "snis"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.Targets, kongClient, "targets"); err != nil {
allErr = append(allErr, err...)
}
if err := validateEntities(ctx, ks.Upstreams, kongClient, "upstreams"); err != nil {
allErr = append(allErr, err...)
}
return allErr
}

func callGetAll(obj interface{}) reflect.Value {
// call GetAll method on entity
method := reflect.ValueOf(obj).MethodByName("GetAll")
entities := method.Call([]reflect.Value{})[0].Interface()
return reflect.ValueOf(entities)
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A further improvement to this function would be to add error as the second return value and check that in ensureGetAllMethod. An error should be returned if there is an error in looking up the method or calling the method (if any).
In the init() then, print the error and exit rather than a panic. This is to make the UX a bit better.
Printing a helpful error and exiting is a better user experience than a CLI that does a stack dump on the user.
Even better, an error that is actionable. If the method lookup fails, then inform the user in the output that they should file a bug with Kong Inc.

This is not a blocker for merging.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I totally agree an obscure fail will not help users. I implemented this (example by forcing a fail):

$ deck validate --online
GetAll() method not found for *state.ServicesCollection. Please file a bug with Kong Inc.
exit status 1

Let me know what you think!


// ensureGetAllMethod ensures at init time that `GetAll()` method exists on the relevant structs.
// If the method doesn't exist, the code will panic. This increases the likelihood of catching such an
// error during manual testing.
func ensureGetAllMethods() {
// let's make sure ASAP that all resources have the expected GetAll method
dummyEmptyState, _ := state.NewKongState()
callGetAll(dummyEmptyState.Services)
callGetAll(dummyEmptyState.ACLGroups)
callGetAll(dummyEmptyState.BasicAuths)
callGetAll(dummyEmptyState.CACertificates)
callGetAll(dummyEmptyState.Certificates)
callGetAll(dummyEmptyState.Consumers)
callGetAll(dummyEmptyState.Documents)
callGetAll(dummyEmptyState.HMACAuths)
callGetAll(dummyEmptyState.JWTAuths)
callGetAll(dummyEmptyState.KeyAuths)
callGetAll(dummyEmptyState.Oauth2Creds)
callGetAll(dummyEmptyState.Plugins)
callGetAll(dummyEmptyState.Routes)
callGetAll(dummyEmptyState.SNIs)
callGetAll(dummyEmptyState.Targets)
callGetAll(dummyEmptyState.Upstreams)
hbagdi marked this conversation as resolved.
Show resolved Hide resolved
}

func init() {
rootCmd.AddCommand(validateCmd)
validateCmd.Flags().BoolVar(&validateCmdRBACResourcesOnly, "rbac-resources-only",
Expand All @@ -74,4 +211,7 @@ func init() {
"state", "s", []string{"kong.yaml"}, "file(s) containing Kong's configuration.\n"+
"This flag can be specified multiple times for multiple files.\n"+
"Use '-' to read from stdin.")
validateCmd.Flags().BoolVar(&validateOnline, "online",
false, "perform schema validation against Kong API.")
GGabriele marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
false, "perform schema validation against Kong API.")
false, "perform validations against Kong API. When this flag is used, validation is done via communication with Kong. This increases the time for validation but catches significant errors. No resource is created in Kong.")

ensureGetAllMethods()
}
1 change: 1 addition & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ func registerSignalHandler() context.Context {
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)

go func() {
defer signal.Stop(sigs)
GGabriele marked this conversation as resolved.
Show resolved Hide resolved
sig := <-sigs
fmt.Println("received", sig, ", terminating...")
cancel()
Expand Down