Skip to content

upgrade: mockery and proto-gen - #22634

Merged
sreeram77 merged 11 commits into
mainfrom
sreeram77/mockery
Aug 27, 2025
Merged

upgrade: mockery and proto-gen#22634
sreeram77 merged 11 commits into
mainfrom
sreeram77/mockery

Conversation

@sreeram77

@sreeram77 sreeram77 commented Aug 27, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

Description

  • upgrade: mockery to v3 and regen mocks
  • upgrade: protoc-gen-go-grpc to v1.5.1 and regen proto go files

Testing & Reproduction steps

Links

PR Checklist

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

PCI review checklist

  • I have documented a clear reason for, and description of, the change I am making.

  • If applicable, I've documented a plan to revert these changes if they require more than reverting the pull request.

  • If applicable, I've documented the impact of any changes to security controls.

    Examples of changes to security controls include using new access control methods, adding or removing logging pipelines, etc.

@sreeram77
sreeram77 requested a review from a team as a code owner August 27, 2025 05:54
@github-actions github-actions Bot added pr/dependencies PR specifically updates dependencies of project theme/envoy/xds Related to Envoy support labels Aug 27, 2025
@sreeram77 sreeram77 added backport/all Apply backports for all active releases per .release/versions.hcl pr/no-changelog PR does not need a corresponding .changelog entry labels Aug 27, 2025
@sreeram77
sreeram77 force-pushed the sreeram77/mockery branch 5 times, most recently from 263785c to 78e6909 Compare August 27, 2025 10:18
@sreeram77
sreeram77 requested a review from Copilot August 27, 2025 12:45
Copilot AI reviewed Aug 27, 2025
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull Request Overview

This PR upgrades two key development tools and regenerates their corresponding outputs:

  • Upgrades mockery to v3 and regenerates mocks
  • Upgrades protoc-gen-go-grpc to v1.5.1 and regenerates protobuf Go files

Key changes include:

  • Updated protobuf code generation with newer tooling versions and improved patterns
  • Generated files now use more efficient string handling and memory management patterns

Reviewed Changes

Copilot reviewed 99 out of 135 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
proto/private/pbautoconf/auto_config.pb.go Regenerated with protoc-gen-go v1.36.6, includes struct layout optimizations and string handling improvements
proto/private/pbacl/acl.pb.go Regenerated with protoc-gen-go v1.36.6, includes struct layout optimizations and string handling improvements
proto-public/pbserverdiscovery/serverdiscovery_grpc.pb.go Regenerated with protoc-gen-go-grpc v1.5.1, includes generic streaming types and improved type safety
proto-public/pbserverdiscovery/serverdiscovery.pb.go Regenerated with protoc-gen-go v1.36.6, includes struct layout optimizations and string handling improvements
proto-public/pbresource/resource_grpc.pb.go Regenerated with protoc-gen-go-grpc v1.5.1, includes generic streaming types and improved type safety

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

Comment thread proto-public/pbserverdiscovery/serverdiscovery_grpc.pb.go
Comment thread proto-public/pbresource/resource_grpc.pb.go
@sreeram77
sreeram77 merged commit f9ada9b into main Aug 27, 2025
@sreeram77
sreeram77 deleted the sreeram77/mockery branch August 27, 2025 12:49
@hc-github-team-consul-core hc-github-team-consul-core added backport/1.21 This release series is longer active on CE, use backport/ent/1.21 backport/ent/1.18 Changes are backported to 1.18 ent backport/ent/1.19 labels Aug 27, 2025
@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 16, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

28 similar comments
@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 17, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 18, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 19, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 20, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 22, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 23, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 24, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 25, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 26, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 27, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 28, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 29, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 30, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Jan 31, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 1, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 2, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 4, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 5, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 7, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 8, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 9, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 10, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 11, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 12, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 13, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 14, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 15, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

@hc-github-team-consul-core

hc-github-team-consul-core commented Feb 16, 2026

Copy link
Copy Markdown
Collaborator

📣 Hi @sreeram77! a backport is missing for this PR [22634] for versions [1.20,1.21] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

supHTI pushed a commit to supHTI/consul that referenced this pull request Sep 1, 2026
@sreeram77
upgrade: mockery and proto-gen, and regen files (hashicorp#22634)
680f9a6 
* update: mockery to v3 and generate mocks

* update: protoc-gen to v1.5.1 and regen proto go files

* fix: use InterfaceName_mock.go for filename in mockery

* update: generate mock files with mockery v3

* fix: case in structname in mockery config

* update: testcase errMsg in TestPatchStruct

* update: increase timeout for context in TestSubscribeBackend_IntegrationWithServer_TLSReload
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@nitin-sachdev-29 nitin-sachdev-29 nitin-sachdev-29 approved these changes

Assignees

No one assigned

Labels

backport/all Apply backports for all active releases per .release/versions.hcl backport/ent/1.18 Changes are backported to 1.18 ent backport/1.21 This release series is longer active on CE, use backport/ent/1.21 pr/dependencies PR specifically updates dependencies of project pr/no-changelog PR does not need a corresponding .changelog entry theme/envoy/xds Related to Envoy support

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sreeram77 @hc-github-team-consul-core @nitin-sachdev-29