Convert cluster-related v2 API test fragments to v3

[ankatare]

Signed-off-by: Abhay Narayan Katare [email protected]

For an explanation of how to fill out the fields, please see the relevant section
in PULL_REQUESTS.md

Commit Message: changes in test files for "Convert v2 API test fragments to v3"
Additional Description: file changes in test/common/upstream/
Risk Level:
Testing: format test and integration test
Docs Changes:
Release Notes:
[Optional Runtime guard:]
Progress toward #10843
[Optional Deprecated:]
Note : I will push remaining files changes in next PR

[zuercher]

@junr03 can you have a look?

[junr03]

Hey @ankatare thanks for contributing! A comment about your CI failure.

Also do you mind updating the PR description per the docs here?

[junr03]

@ankatare do you need guidance on how to proceed here? It looks like you need to fix the field differences between the v2 and the v3 protos. Looking at the errors in the build should guide you there. Let me know if you need anything!

[ankatare]

@junr03 Hi Thanks for your guidance. I fixed most of the build issues, currently i am working on some issues in my local env.
will get back to you soon for anything.

[ankatare]

@junr03 seems some formatting issue here. need your help to understand it and how to follow guidelines.

[ankatare]

@junr03 i am talking about current build ( ongoing ).

[dio]

@ankatare I think you can try to run:

./tools/code_format/check_format.py fix test/common/upstream/cluster_manager_impl_test.cc

Or (to fix all possible files),

./tools/code_format/check_format.py fix

And here is the diff, after running the above command:

diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc
index 2b922ec09..cf718a40f 100644
--- a/test/common/upstream/cluster_manager_impl_test.cc
+++ b/test/common/upstream/cluster_manager_impl_test.cc
@@ -104,7 +104,7 @@ public:
     auto message_ptr = admin_.config_tracker_.config_tracker_callbacks_["clusters"]();
     const auto& clusters_config_dump =
         dynamic_cast<const envoy::admin::v3::ClustersConfigDump&>(*message_ptr);
-
+
     envoy::admin::v3::ClustersConfigDump expected_clusters_config_dump;
     TestUtility::loadFromYaml(expected_dump_yaml, expected_clusters_config_dump);
     EXPECT_EQ(expected_clusters_config_dump.DebugString(), clusters_config_dump.DebugString());
diff --git a/test/common/upstream/utility.h b/test/common/upstream/utility.h
index d2401caeb..f66353195 100644
--- a/test/common/upstream/utility.h
+++ b/test/common/upstream/utility.h
@@ -48,7 +48,6 @@ constexpr static const char* kDefaultStaticClusterTmpl = R"EOF(
   }
   )EOF";

-
 inline std::string defaultStaticClusterJson(const std::string& name) {
   return fmt::sprintf(kDefaultStaticClusterTmpl, name, R"EOF(
 "socket_address": {

For completeness, this is the log output from CI: https://dev.azure.com/cncf/4684fb3d-0389-4e0b-8251-221942316e06/_apis/build/builds/39431/logs/7

[ankatare]

@dio Thanks for help. let me run script locally

[ankatare]

@dio though build is still running, let's wait for final results.

[ankatare]

@dio @junr03 need your help to understand the build issue ..

"Caused by: com.google.devtools.build.lib.remote.ExecutionStatusException: FAILED_PRECONDITION: no matching bots available"

Another Message: mesg: ttyname failed: Inappropriate ioctl for device

[ankatare]

@zuercher Hi, Thanks for help. finally it merged :)

[stale]

This pull request has been automatically marked as stale because it has not had activity in the last 7 days. It will be closed in 7 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!

[junr03]

@ankatare now that what you have is green I was wondering if you were going to tackle the rest of the fragments in the test/ tree. Otherwise, we can merge this, but not call #10843 fixed; as this PR does not quite fix all of it.

[ankatare]

@junr03 thanks for your comments. I am currently working on review comments on #11213
Moreover #11213 also contains file changes wrt #11031
I will continue pushing PRs in order to fix #10843.

[junr03]

I updated the PR description. Thanks for working on this!

[junr03]

@envoyproxy/senior-maintainers I think this PR is jammed because it predates the CI changes for coverage so the status is not being reported. Can one of you with admin merge this?

[mattklein123]

Please merge master to make sure we don't have other issue, thanks!

/wait

[stale]

This pull request has been automatically marked as stale because it has not had activity in the last 7 days. It will be closed in 7 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!

[junr03]

@ankatare do you mind merging master here?

[ankatare]

@junr03 sorry , I didn't get. What is ming merging ?

[junr03]

@junr03 sorry , I didn't get. What is ming merging ?

typo s/ming/mind

[junr03]

I'd like a master merge on this branch to make sure all the new CI flows run correctly.

[ankatare]

@junr03 ok , sure. Thanks for inputs. I will merge it ASAP.

[ankatare]

@junr03 done as per inputs. Thanks

[junr03]

@ankatare did you push the merge? I don't see it here

[ankatare]

@junr03 ohh, really sorry. will do it ASAP today

[ankatare]

@junr03 Done now.

[stale]

This pull request has been automatically marked as stale because it has not had activity in the last 7 days. It will be closed in 7 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!