Skip to content

Backport NET-4135 - Fix NodeMeta filtering Catalog List Services API (#18322) #19116

Merged
asheshvidyut merged 2 commits intorelease/1.15.xfrom
backport/NET-4135/rel-1.15.x
Oct 9, 2023
Merged

Backport NET-4135 - Fix NodeMeta filtering Catalog List Services API (#18322) #19116
asheshvidyut merged 2 commits intorelease/1.15.xfrom
backport/NET-4135/rel-1.15.x

Conversation

@asheshvidyut
Copy link
Contributor

Backport

This PR is auto-generated from #18322 to be assessed for backporting due to the inclusion of the label backport/1.15.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@absolutelightning
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "91efd2c15e14d27f7317426f22a23ec1610e1088", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Description

Fixed the working of filter query parameter in /v1/catalog/services API. Fixes - #17422

Testing & Reproduction steps

Followed this tutorial and setup workloads in K8s.
Did curl -

asheshvidyut@asheshvidyut-H2GX766V9T ~/consul (NET-4135) » curl -ks -G http://localhost:8500/v1/catalog/services --data-urlencode filter="NodeMeta[\"consul-network-segment\"] == \"\" and NodeMeta[\"consul-version\"] == \"1.17.0\"" | jq
{
  "consul": []
}
asheshvidyut@asheshvidyut-H2GX766V9T ~/consul (NET-4135) » curl -ks -G http://localhost:8500/v1/catalog/services --data-urlencode filter="NodeMeta[\"synthetic-node\"] == true" | jq
{
  "frontend": [],
  "frontend-sidecar-proxy": [],
  "nginx": [],
  "nginx-sidecar-proxy": [],
  "payments": [],
  "payments-sidecar-proxy": [],
  "postgres": [],
  "postgres-sidecar-proxy": [],
  "products-api": [],
  "products-api-sidecar-proxy": [],
  "public-api": [],
  "public-api-sidecar-proxy": []
}

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

* logs for debugging

* Init

* white spaces fix

* added change log

* Fix tests

* fix typo

* using queryoptionfilter to populate args.filter

* tests

* fix test

* fix tests

* fix tests

* fix tests

* fix tests

* fix variable name

* fix tests

* fix tests

* fix tests

* Update .changelog/18322.txt

Co-authored-by: Ganesh S <ganesh.seetharaman@hashicorp.com>

* fix change log

* address nits

* removed unused line

* doing join only when filter has nodemeta

* fix tests

* fix tests

* Update agent/consul/catalog_endpoint.go

Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com>

* fix tests

* removed unwanted code

---------

Co-authored-by: Ganesh S <ganesh.seetharaman@hashicorp.com>
Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com>
@asheshvidyut asheshvidyut requested a review from a team as a code owner October 9, 2023 05:16
@asheshvidyut asheshvidyut requested a review from a team October 9, 2023 05:16
@asheshvidyut asheshvidyut requested review from a team as code owners October 9, 2023 05:16
@asheshvidyut asheshvidyut requested review from dlaguerta and randyhdev and removed request for a team October 9, 2023 05:16
@github-actions github-actions bot added type/docs Documentation needs to be created/updated/clarified theme/api Relating to the HTTP API interface theme/acls ACL and token generation theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/ui Anything related to the UI theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies theme/tls Using TLS (Transport Layer Security) or mTLS (mutual TLS) to secure communication theme/telemetry Anything related to telemetry or observability type/ci Relating to continuous integration (CI) tooling for testing or releases pr/dependencies PR specifically updates dependencies of project theme/envoy/xds Related to Envoy support theme/contributing Additions and enhancements to community contributing materials theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/certificates Related to creating, distributing, and rotating certificates in Consul theme/agent-cache Agent Cache theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation labels Oct 9, 2023
@asheshvidyut asheshvidyut changed the base branch from main to release/1.15.x October 9, 2023 05:16
@asheshvidyut asheshvidyut enabled auto-merge (squash) October 9, 2023 05:23
auto-merge was automatically disabled October 9, 2023 05:29

Pull request was closed

@asheshvidyut asheshvidyut reopened this Oct 9, 2023
@asheshvidyut asheshvidyut enabled auto-merge (squash) October 9, 2023 05:29
@asheshvidyut asheshvidyut disabled auto-merge October 9, 2023 05:46
@asheshvidyut asheshvidyut enabled auto-merge (squash) October 9, 2023 05:48
auto-merge was automatically disabled October 9, 2023 05:48

Pull request was closed

@asheshvidyut asheshvidyut reopened this Oct 9, 2023
@asheshvidyut asheshvidyut enabled auto-merge (squash) October 9, 2023 05:54
@asheshvidyut asheshvidyut merged commit 7b45148 into release/1.15.x Oct 9, 2023
@asheshvidyut asheshvidyut deleted the backport/NET-4135/rel-1.15.x branch October 9, 2023 06:21
@asheshvidyut asheshvidyut added the consul-india PRs/Issues assigned to Consul India team label Dec 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

consul-india PRs/Issues assigned to Consul India team pr/dependencies PR specifically updates dependencies of project pr/no-backport theme/acls ACL and token generation theme/agent-cache Agent Cache theme/api Relating to the HTTP API interface theme/certificates Related to creating, distributing, and rotating certificates in Consul theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation theme/contributing Additions and enhancements to community contributing materials theme/envoy/xds Related to Envoy support theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/telemetry Anything related to telemetry or observability theme/tls Using TLS (Transport Layer Security) or mTLS (mutual TLS) to secure communication theme/ui Anything related to the UI type/ci Relating to continuous integration (CI) tooling for testing or releases type/docs Documentation needs to be created/updated/clarified

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants