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.

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

Jump to bottom

feat: support online validation with Konnect #1335

Merged
merged 16 commits into from
Oct 21, 2024
+307 −11
Merged

feat: support online validation with Konnect #1335

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
dc80a8d
feat: support online validation with Konnect
GGabriele Jul 4, 2024
e07f7b0
Merge branch 'main' into feat/konnect_validate
Prashansa-K Sep 27, 2024
a05a422
tests: Added e2e tests for gateway validation with konnect.
Prashansa-K Oct 10, 2024
419a953
chore: lint fix
Prashansa-K Oct 10, 2024
a904b53
Merge branch 'main' into feat/konnect_validate
Prashansa-K Oct 10, 2024
4e75b4c
chore: removed workspace flag test as it is not supported with konnect
Prashansa-K Oct 10, 2024
b05d593
tests: added rbac-resources file
Prashansa-K Oct 10, 2024
dff8245
refactor: refactored tests and code to add all konnect validate usecases
Prashansa-K Oct 10, 2024
1361bfd
chore: fixed workspace setting for Konnect check
Prashansa-K Oct 10, 2024
1e7758b
chore: added mutually exclusive flags for konnect compatibility
Prashansa-K Oct 10, 2024
f91a6f4
chore: fixed logical error
Prashansa-K Oct 10, 2024
cf17473
chore: fixed descripancy in info due to preRun order in cobra
Prashansa-K Oct 10, 2024
382bf1b
chore: added corrections based on PR review
Prashansa-K Oct 18, 2024
dceaa22
Merge branch 'main' into feat/konnect_validate
Prashansa-K Oct 18, 2024
fa9c5c4
removing unrelated code for vault validation
Prashansa-K Oct 21, 2024
dc4737c
Merge branch 'main' into feat/konnect_validate
Prashansa-K Oct 21, 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
29 changes: 20 additions & 9 deletions cmd/gateway_validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ var (

func executeValidate(cmd *cobra.Command, _ []string) error {
mode := getMode(nil)
if validateOnline && mode == modeKonnect {
return fmt.Errorf("online validation not yet supported in konnect mode")
}
_ = sendAnalytics("validate", "", mode)
// read target file
// this does json schema validation as well
Expand All @@ -45,7 +42,7 @@ func executeValidate(cmd *cobra.Command, _ []string) error {
ctx := cmd.Context()
var kongClient *kong.Client
if validateOnline {
kongClient, err = getKongClient(ctx, targetContent)
kongClient, err = getKongClient(ctx, targetContent, mode)
if err != nil {
return err
}
Expand Down Expand Up @@ -285,7 +282,9 @@ func validateWithKong(
return validator.Validate(parsedFormatVersion)
}

func getKongClient(ctx context.Context, targetContent *file.Content) (*kong.Client, error) {
func getKongClient(
ctx context.Context, targetContent *file.Content, mode mode,
) (*kong.Client, error) {
workspaceName := validateWorkspace
if validateWorkspace != "" {
// check if workspace exists
Expand All @@ -299,10 +298,22 @@ func getKongClient(ctx context.Context, targetContent *file.Content) (*kong.Clie
}
}

wsConfig := rootConfig.ForWorkspace(workspaceName)
kongClient, err := reconcilerUtils.GetKongClient(wsConfig)
if err != nil {
return nil, err
var (
kongClient *kong.Client
err error
)
if mode == modeKonnect {
kongClient, err = GetKongClientForKonnectMode(ctx, &konnectConfig)
if err != nil {
return nil, err
}
dumpConfig.KonnectControlPlane = konnectControlPlane
} else {
wsConfig := rootConfig.ForWorkspace(workspaceName)
kongClient, err = reconcilerUtils.GetKongClient(wsConfig)
if err != nil {
return nil, err
}
}
return kongClient, nil
}
Expand Down
3 changes: 3 additions & 0 deletions validate/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@ func (v *Validator) Validate(formatVersion semver.Version) []error {
if err := v.entities(v.state.FilterChains, "filter_chains"); err != nil {
allErr = append(allErr, err...)
}
if err := v.entities(v.state.Vaults, "vaults"); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, I lack some context here. How is this addition related to this PR? @GGabriele

Copy link
Member

Choose a reason for hiding this comment

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

ping: @GGabriele. Do you mind chiming in here? 🙇

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Vaults validation is currently completely missing from decK. This is not strictly related to the konnect implementation, so we can move it into a separate commit if we want.

Copy link
Member

Choose a reason for hiding this comment

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

I'd prefer to extract it if that's the case.

Additionally, if possible I'd suggest to mark this with a comment why this is needed.

Copy link
Contributor

Choose a reason for hiding this comment

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

I have created a separate PR for this @pmalek
#1421

allErr = append(allErr, err...)
}

// validate routes format with Kong 3.x
parsed30, err := semver.ParseTolerant(utils.FormatVersion30)
Expand Down
Loading