chore: switch synth.py to helper library to avoid double injecting license header (#85)

Author: chingor13

synth.metadata

@@ -1,20 +1,41 @@
 {
-  "updateTime": "2020-03-02T22:46:55.339863Z",
+  "updateTime": "2020-03-11T20:11:26.452995Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.47.0",
-        "dockerImage": "googleapis/artman@sha256:b3e50d6b8de03920b9f065bbc3d210e2ca93a043446f1fa16cdf567393c09678"
+        "version": "1.1.0",
+        "dockerImage": "googleapis/artman@sha256:f54b7644a1d2e7a37b23f5c0dfe9bba473e41c675002a507a244389e27487ca9"
+      }
+    },
+    {
+      "generator": {
+        "name": "artman",
+        "version": "1.1.0",
+        "dockerImage": "googleapis/artman@sha256:f54b7644a1d2e7a37b23f5c0dfe9bba473e41c675002a507a244389e27487ca9"
+      }
+    },
+    {
+      "generator": {
+        "name": "artman",
+        "version": "1.1.0",
+        "dockerImage": "googleapis/artman@sha256:f54b7644a1d2e7a37b23f5c0dfe9bba473e41c675002a507a244389e27487ca9"
+      }
+    },
+    {
+      "git": {
+        "name": "googleapis",
+        "remote": "https://github.com/googleapis/googleapis.git",
+        "sha": "85e454be7a353f7fe1bf2b0affb753305785b872",
+        "internalRef": "300367734"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "83c6f84035ee0f80eaa44d8b688a010461cc4080",
-        "internalRef": "297918498",
-        "log": "83c6f84035ee0f80eaa44d8b688a010461cc4080\nUpdate google/api/auth.proto to make AuthProvider to have JwtLocation\n\nPiperOrigin-RevId: 297918498\n\n"
+        "sha": "85e454be7a353f7fe1bf2b0affb753305785b872",
+        "internalRef": "300367734"
       }
     },
     {

synth.py

@@ -37,40 +37,27 @@
 
 
 for version in versions:
-  library = gapic.java_library(
+  library = java.gapic_library(
       service=service,
       version=version,
-      config_path=config_pattern.format(version=version),
-      artman_output_name='')
+      config_pattern=config_pattern,
+  )
 
   if version == 'v1':
       # add GrafeasClient import
       s.replace(
-          library / f'gapic-google-cloud-{service}-{version}/src/**/ContainerAnalysisClient.java',
+          f'google-cloud-{service}/src/main/java/com/google/cloud/devtools/containeranalysis/{version}/ContainerAnalysisClient.java',
           'import com.google.iam.v1.TestIamPermissionsResponse;',
           'import com.google.iam.v1.TestIamPermissionsResponse;\nimport io.grafeas.v1.GrafeasClient;'
       )
 
       # add getGrafeasClient()
       s.replace(
-          library / f'gapic-google-cloud-{service}-{version}/src/**/ContainerAnalysisClient.java',
+          f'google-cloud-{service}/src/main/java/com/google/cloud/devtools/containeranalysis/{version}/ContainerAnalysisClient.java',
           r'(\s+private final ContainerAnalysisStub stub;.*)',
           f'\g<1>{get_grafeas_code}'
       )
-
-  package_name = f'com.google.{service}.{version}'
-  java.fix_proto_headers(library / f'proto-google-cloud-{service}-{version}')
-  java.fix_grpc_headers(library / f'grpc-google-cloud-{service}-{version}', package_name)
-  java.fix_grpc_headers(library / f'grpc-google-cloud-{service}-{version}', f'io.grafeas.{version}')
-
-
-  s.copy(library / f'gapic-google-cloud-{service}-{version}/src', f'google-cloud-{service}/src')
-  s.copy(library / f'grpc-google-cloud-{service}-{version}/src', f'grpc-google-cloud-{service}-{version}/src')
-  s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'proto-google-cloud-{service}-{version}/src')
-
-  java.format_code(f'google-cloud-{service}/src')
-  java.format_code(f'grpc-google-cloud-{service}-{version}/src')
-  java.format_code(f'proto-google-cloud-{service}-{version}/src')
+      java.format_code('google-cloud-containeranalysis/src')
 
 java.common_templates()