refactor according to code review

googleapis · Oct 13, 2023 · 7c32834 · 7c32834
1 parent 8ff3538
commit 7c32834
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/synthtool/gcp/partials.py b/synthtool/gcp/partials.py
@@ -34,10 +34,9 @@ def load_partials(files: List[str] = []) -> Dict:
     deprecation_warning: a warning to indicate that the library has been
         deprecated and a pointer to an alternate option
     """
-    files = (files or []) + _DEFAULT_PARTIAL_FILES
     result: Dict[str, Dict] = {}
     cwd_path = Path(os.getcwd())
-    for file in files:
+    for file in files + _DEFAULT_PARTIAL_FILES:
         partials_file = cwd_path / file
         if os.path.exists(partials_file):
             with open(partials_file) as f:

diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg
@@ -37,6 +37,6 @@ env_vars: {
 }
 
 {% if 'partials' in metadata
-  and 'integration' in metadata['partials'] -%}
-{{ metadata['partials']['integration'] }}
+  and 'integration_append' in metadata['partials'] -%}
+{{ metadata['partials']['integration_append'] }}
 {%- endif -%}
diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/java11-integration.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/java11-integration.cfg
@@ -37,6 +37,6 @@ env_vars: {
 }
 
 {% if 'partials' in metadata
-  and 'integration' in metadata['partials'] -%}
-{{ metadata['partials']['integration'] }}
+  and 'integration_append' in metadata['partials'] -%}
+{{ metadata['partials']['integration_append'] }}
 {%- endif -%}
diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/integration.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/integration.cfg
@@ -33,6 +33,6 @@ env_vars: {
 }
 
 {% if 'partials' in metadata
-  and 'integration' in metadata['partials'] -%}
-{{ metadata['partials']['integration'] }}
+  and 'integration_append' in metadata['partials'] -%}
+{{ metadata['partials']['integration_append'] }}
 {%- endif -%}
diff --git a/tests/fixtures/java_templates/partials_test/.integration-partials.yaml b/tests/fixtures/java_templates/partials_test/.integration-partials.yaml
@@ -1,4 +1,4 @@
-integration: |
+integration_append: |
   env_vars: {
     key: "INTEGRATION_TEST_ARGS"
     value: "-P bigtable-emulator-it"