Fix include path for the client libraries of the gapic artifact library. (googleapis#54)

The correct include path should be `ServiceDescriptor->full_path()`, which is service package + name.

For example, for the service `LibraryService` from `library.proto`, which has `package google.example.library.v1;` the inluce paths should be the following:
```cc
#include "google/example/library/v1/library_service.gapic.h"
#include "google/example/library/v1/library_service_stub.gapic.h"
```

Also add optional args propagation from macro to the underlying rules (affects visibility attribute for example)

Author: vam-google

generator/BUILD.bazel

@@ -53,8 +53,8 @@ cc_binary(
     name = "protoc-gen-cpp_gapic",
     srcs = ["main.cc"],
     includes = ["."],
-    deps = [":gapic_generator"],
     visibility = ["//visibility:public"],
+    deps = [":gapic_generator"],
 )
 
 cc_test(
@@ -69,6 +69,7 @@ cc_test(
     ],
     deps = [
         ":gapic_generator",
+        "//generator/testdata:library_cc_gapic",
         "@gtest//:gtest_main",
     ],
 )

generator/internal/client_cc_generator.cc

@@ -33,9 +33,10 @@ std::vector<std::string> BuildClientCCIncludes(
     pb::ServiceDescriptor const* service) {
   return {
       LocalInclude(absl::StrCat(
-          internal::ServiceNameToFilePath(service->name()), ".gapic.h")),
-      LocalInclude(absl::StrCat(
-          internal::ServiceNameToFilePath(service->name()), "_stub.gapic.h")),
+          internal::ServiceNameToFilePath(service->full_name()), ".gapic.h")),
+      LocalInclude(
+          absl::StrCat(internal::ServiceNameToFilePath(service->full_name()),
+                       "_stub.gapic.h")),
       LocalInclude("gax/call_context.h"), LocalInclude("gax/status.h"),
       LocalInclude("gax/status_or.h"),
   };

generator/internal/stub_cc_generator.cc

@@ -29,7 +29,8 @@ std::vector<std::string> BuildClientStubCCIncludes(
     pb::ServiceDescriptor const* service) {
   return {
       LocalInclude(
-          absl::StrCat(CamelCaseToSnakeCase(service->name()), "_stub.gapic.h")),
+          absl::StrCat(internal::ServiceNameToFilePath(service->full_name()),
+                       "_stub.gapic.h")),
       LocalInclude(absl::StrCat(
           absl::StripSuffix(service->file()->name(), ".proto"), ".grpc.pb.h")),
       LocalInclude("gax/call_context.h"), LocalInclude("gax/retry_loop.h"),

generator/testdata/google/example/library/v1/library_service.gapic.cc.baseline

@@ -1,8 +1,8 @@
 // Generated by the GAPIC C++ plugin.
 // If you make any local changes, they will be lost.
 // source: generator/testdata/library.proto
-#include "library_service.gapic.h"
-#include "library_service_stub.gapic.h"
+#include "google/example/library/v1/library_service.gapic.h"
+#include "google/example/library/v1/library_service_stub.gapic.h"
 #include "gax/call_context.h"
 #include "gax/status.h"
 #include "gax/status_or.h"

generator/testdata/google/example/library/v1/library_service_stub.gapic.cc.baseline

@@ -2,7 +2,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/testdata/library.proto
 
-#include "library_service_stub.gapic.h"
+#include "google/example/library/v1/library_service_stub.gapic.h"
 #include "generator/testdata/library.grpc.pb.h"
 #include "gax/call_context.h"
 #include "gax/retry_loop.h"

rules_gapic/cpp/cc_gapic.bzl

@@ -27,9 +27,12 @@ def _cc_gapic_postprocessed_srcjar_impl(ctx):
     # TODO: Call formatter here
     pushd {output_dir_path}
     zip -q -r {output_dir_name}-h.srcjar . -i ./*.gapic.h
+    find . -name "*.gapic.h" -delete
+    zip -q -r {output_dir_name}.srcjar . -i ./*.cc -i ./*.h
     popd
     mv {output_dir_path}/{output_dir_name}-h.srcjar {output_main_h}
-    cp {gapic_zip} {output_main}
+    mv {output_dir_path}/{output_dir_name}.srcjar {output_main}
+    rm -rf {output_dir_path}
     """.format(
         gapic_zip = gapic_zip.path,
         output_dir_name = output_dir_name,
@@ -55,32 +58,32 @@ _cc_gapic_postprocessed_srcjar = rule(
     },
 )
 
-def cc_gapic_srcjar(name, src, package, visibility = None):
+def cc_gapic_srcjar(name, src, package, **kwargs):
     raw_srcjar_name = "%s_raw" % name
 
     gapic_srcjar(
         name = raw_srcjar_name,
         src = src,
         package = package,
         output_suffix = ".zip",
-        visibility = visibility,
         gapic_generator = Label("//generator:protoc-gen-cpp_gapic"),
+        **kwargs
     )
 
     _cc_gapic_postprocessed_srcjar(
         name = name,
         gapic_zip = ":%s" % raw_srcjar_name,
-        visibility = visibility,
+        **kwargs
     )
 
-def cc_gapic_library(name, src, package, deps = [], visibility = None):
+def cc_gapic_library(name, src, package, deps = [], **kwargs):
     srcjar_name = "%s_srcjar" % name
 
     cc_gapic_srcjar(
         name = srcjar_name,
         src = src,
         package = package,
-        visibility = visibility,
+        **kwargs
     )
 
     actual_deps = deps + [
@@ -93,7 +96,8 @@ def cc_gapic_library(name, src, package, deps = [], visibility = None):
     unzipped_srcjar(
         name = main_dir,
         srcjar = main_file,
-        extension = ".cc",
+        extension = "",
+        **kwargs
     )
 
     main_h_file = ":%s-h.srcjar" % srcjar_name
@@ -102,12 +106,15 @@ def cc_gapic_library(name, src, package, deps = [], visibility = None):
     unzipped_srcjar(
         name = main_h_dir,
         srcjar = main_h_file,
-        extension = ".h",
+        extension = "",
+        **kwargs
     )
 
     native.cc_library(
         name = name,
         srcs = [":%s" % main_dir],
         deps = actual_deps,
         hdrs = [":%s" % main_h_dir],
+        includes = [main_h_dir],
+        **kwargs
     )