Prefix interceptor var with service to avoid collision (#3905)

Author: nitinmohan87

codegen/cli/cli.go

@@ -167,7 +167,7 @@ func BuildCommandData(data *service.Data) *CommandData {
 	var interceptors *InterceptorData
 	if len(data.ClientInterceptors) > 0 {
 		interceptors = &InterceptorData{
-			VarName: "inter",
+			VarName: codegen.Goify(data.Name, false) + "Inter",
 			PkgName: data.PkgName,
 		}
 	}
@@ -226,7 +226,7 @@ func BuildSubcommandData(data *service.Data, m *service.MethodData, buildFunctio
 	var interceptors *InterceptorData
 	if len(m.ClientInterceptors) > 0 {
 		interceptors = &InterceptorData{
-			VarName: "inter",
+			VarName: codegen.Goify(data.Name, false) + "Inter",
 			PkgName: data.PkgName,
 		}
 	}

grpc/codegen/testdata/endpoint-endpoint-with-interceptors.golden

@@ -35,7 +35,7 @@ func UsageExamples() string {
 // line.
 func ParseEndpoint(
 	cc *grpc.ClientConn,
-	inter servicewithinterceptors.ClientInterceptors,
+	serviceWithInterceptorsInter servicewithinterceptors.ClientInterceptors,
 	opts ...grpc.CallOption,
 ) (goa.Endpoint, any, error) {
 	var (
@@ -118,11 +118,11 @@ func ParseEndpoint(
 			switch epn {
 			case "method-a":
 				endpoint = c.MethodA()
-				endpoint = servicewithinterceptors.WrapMethodAClientEndpoint(endpoint, inter)
+				endpoint = servicewithinterceptors.WrapMethodAClientEndpoint(endpoint, serviceWithInterceptorsInter)
 				data, err = servicewithinterceptorsc.BuildMethodAPayload(*serviceWithInterceptorsMethodAMessageFlag)
 			case "method-b":
 				endpoint = c.MethodB()
-				endpoint = servicewithinterceptors.WrapMethodBClientEndpoint(endpoint, inter)
+				endpoint = servicewithinterceptors.WrapMethodBClientEndpoint(endpoint, serviceWithInterceptorsInter)
 				data, err = servicewithinterceptorsc.BuildMethodBPayload(*serviceWithInterceptorsMethodBMessageFlag)
 			}
 		}