Skip to content

Add tests to verify TCP filter sends connection.id in Check() and Rep…#3739

Merged
ldemailly merged 6 commits intoistio:masterfrom
JimmyCYJ:tcp-filter-connection-id
Feb 27, 2018
Merged

Add tests to verify TCP filter sends connection.id in Check() and Rep…#3739
ldemailly merged 6 commits intoistio:masterfrom
JimmyCYJ:tcp-filter-connection-id

Conversation

@JimmyCYJ
Copy link
Copy Markdown
Member

Add tests to verify TCP filter sends connection.id in Check() and Report() calls.

@JimmyCYJ JimmyCYJ requested review from a team and qiwzhang February 23, 2018 22:13
@qiwzhang
Copy link
Copy Markdown
Contributor

/lgtm
/approve

@istio-merge-robot
Copy link
Copy Markdown

/lgtm cancel //PR changed after LGTM, removing LGTM. @JimmyCYJ @qiwzhang

@JimmyCYJ
Copy link
Copy Markdown
Member Author

/test istio-presubmit

@douglas-reid
Copy link
Copy Markdown
Contributor

For the dep ensure bits, do we need to update the istio-contrib repo? @ldemailly can you advise?

@ldemailly
Copy link
Copy Markdown
Member

you can't change Gopkg.lock without following the steps in
https://github.com/istio/istio/wiki/Vendor-FAQ#how-do-i-add--change-a-dependency

Copy link
Copy Markdown
Member

@ldemailly ldemailly left a comment

Choose a reason for hiding this comment

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

need to make an vendor-istio PR first (or undo your .lock changes - are they required?)

@JimmyCYJ
Copy link
Copy Markdown
Member Author

JimmyCYJ commented Feb 27, 2018

@ldemailly I am not sure if I need to change .lock file.
In istio.deps, istio.io/api is using SHA 9d978d, which includes istio/api@ec13aa that defines message NetworkFailPolicy in api/mixer/v1/config/client/client_config.proto.

When I update proxy SHA in istio.deps, I break test istio.io/istio/mixer/test/client/network_policy/network_policy_test.go, because it does not use the new NetworkFailPolicy config.

I modified mixer/test/client/env/v2_config.go in this PR to use NetworkFailPolicy, but I got compile failure.
"env/v2_config.go:109:36: undefined: client.NetworkFailPolicy
env/v2_config.go:111:33: v2.Transport.NetworkFailPolicy.Policy undefined (type client.TransportConfig_NetworkFailPolicy has no field or method Policy)
env/v2_config.go:113:33: v2.Transport.NetworkFailPolicy.Policy undefined (type client.TransportConfig_NetworkFailPolicy has no field or method Policy)
"
Seems that I need to update istio.io/istio/vendor/istio.io/api/mixer/v1/config/client/client_config.pb.go

@ldemailly
Copy link
Copy Markdown
Member

can you follow
https://github.com/istio/istio/wiki/Vendor-FAQ#how-do-i-add--change-a-dependency
and let me know if you encounter any issue

@ldemailly
Copy link
Copy Markdown
Member

ldemailly commented Feb 27, 2018

this PR isn't using your vendor PR (yet) please rev it up, but as mentioned in istio/old_vendor-istio_repo#14 I think you need to make a branch, not a fork

@ldemailly ldemailly dismissed their stale review February 27, 2018 18:16

the build will gate the pr

@JimmyCYJ
Copy link
Copy Markdown
Member Author

/retest

@ldemailly
Copy link
Copy Markdown
Member

build+tests are green, merging istio/old_vendor-istio_repo#15

ldemailly added a commit to istio/old_vendor-istio_repo that referenced this pull request Feb 27, 2018
@ldemailly
Copy link
Copy Markdown
Member

last update: can you cd vendor; git checkout master; git pull
and then cd ..; git diff vendor

should point to new head/master sha: 1c8002038e1782d4a38e22f8e3c328b51b764664

git add vendor; update the PR

and we can merge this :-)

@codecov
Copy link
Copy Markdown

codecov bot commented Feb 27, 2018

Codecov Report

Merging #3739 into master will decrease coverage by 1%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #3739    +/-   ##
=======================================
- Coverage      77%     77%   -<1%     
=======================================
  Files         291     291            
  Lines       26596   26414   -182     
=======================================
- Hits        20267   20117   -150     
+ Misses       5057    5046    -11     
+ Partials     1272    1251    -21
Impacted Files Coverage Δ
mixer/adapter/stackdriver/stackdriver.go 55% <0%> (-15%) ⬇️
mixer/adapter/servicecontrol/servicecontrol.go 63% <0%> (-5%) ⬇️
mixer/adapter/redisquota/redisquota.go 86% <0%> (-3%) ⬇️
mixer/adapter/kubernetesenv/kubernetesenv.go 68% <0%> (-2%) ⬇️
mixer/adapter/stdio/zap.go 97% <0%> (-1%) ⬇️
mixer/adapter/rbac/rbacStore.go 83% <0%> (-1%) ⬇️
mixer/adapter/list/list.go 96% <0%> (ø) ⬇️
mixer/adapter/circonus/circonus.go 71% <0%> (ø) ⬇️
mixer/adapter/denier/denier.go 93% <0%> (ø) ⬇️
mixer/adapter/memquota/rollingWindow.go 100% <0%> (ø) ⬆️
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 151c69e...dbea205. Read the comment docs.

@JimmyCYJ
Copy link
Copy Markdown
Member Author

@ldemailly Thanks a lot for helping me waling through this vendor update.
git diff vendor points to new commit 1c8002038e1782d4a38e22f8e3c328b51b764664.
I have added vendor into this PR.

@ldemailly
Copy link
Copy Markdown
Member

/lgtm

@istio-merge-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ldemailly, qiwzhang

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@istio-merge-robot
Copy link
Copy Markdown

/test all [submit-queue is verifying that this PR is safe to merge]

@ldemailly
Copy link
Copy Markdown
Member

filled #3810 for the weird test failure

@ldemailly ldemailly merged commit 26d71df into istio:master Feb 27, 2018
@JimmyCYJ JimmyCYJ deleted the tcp-filter-connection-id branch February 27, 2018 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants