feat(airbyte-ci): format: pick up .prettierc and .prettierignore (#46274

)
airbytehq · Sep 30, 2024 · cff3211 · cff3211
1 parent 94fd65e
commit cff3211
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,12 @@
 airbyte-integrations/bases/base-normalization/integration_tests/normalization_test_output
 airbyte-ci/connectors/pipelines/tests/test_changelog/result_files
 airbyte-integrations/bases/connector-acceptance-test/unit_tests/data/docs
+
+# Ignore manifest files in manifest-only connectors
+# This is done due to prettier being overly opinionated on the formatting of quotes
+# Ref: https://github.com/prettier/prettier/issues/973
+# And it not allowing rule opt outs
+# Ref: https://github.com/prettier/prettier/discussions/13925
+# Instead we rely on the contribution service to format these files
+# See: https://github.com/airbytehq/airbyte/blob/master/CONTRIBUTING.md#adding-a-new-connector
+airbyte-integrations/connectors/*/manifest.yaml
diff --git a/airbyte-ci/connectors/pipelines/README.md b/airbyte-ci/connectors/pipelines/README.md
@@ -851,6 +851,7 @@ airbyte-ci connectors --language=low-code migrate-to-manifest-only
 
 | Version | PR                                                         | Description                                                                                                                  |
 | ------- | ---------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- |
+| 4.36.1  |  | `airbyte-ci format js` respects `.prettierc` and `.prettierignore`                                                           |
 | 4.36.0  | [#44877](https://github.com/airbytehq/airbyte/pull/44877)  | Implement `--promote/rollback-release-candidate` in `connectors publish`.                                                    |
 | 4.35.6  | [#45632](https://github.com/airbytehq/airbyte/pull/45632)  | Add entry to format file ignore list (`destination-*/expected-spec.json`)                                                    |
 | 4.35.5  | [#45672](https://github.com/airbytehq/airbyte/pull/45672)  | Fix docs mount during publish                                                                                                |

diff --git a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/format/consts.py b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/format/consts.py
@@ -72,4 +72,5 @@ class Formatter(Enum):
     ],
     Formatter.PYTHON: ["pyproject.toml", "poetry.lock"],
     Formatter.LICENSE: [LICENSE_FILE_NAME],
+    Formatter.JS: [".prettierrc", ".prettierignore"],
 }
diff --git a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/format/containers.py b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/format/containers.py
@@ -109,6 +109,7 @@ def format_js_container(dagger_client: dagger.Client, js_code: dagger.Directory,
     return build_container(
         dagger_client,
         base_image=NODE_IMAGE,
+        warmup_dir=warmup_directory(dagger_client, Formatter.JS),
         dir_to_format=js_code,
         install_commands=[f"npm install -g [email protected] prettier@{prettier_version}"],
         cache_volume=dagger_client.cache_volume(cache_keys.get_prettier_cache_key(prettier_version)),

diff --git a/airbyte-ci/connectors/pipelines/pyproject.toml b/airbyte-ci/connectors/pipelines/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pipelines"
-version = "4.36.0"
+version = "4.36.1"
 description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines"
 authors = ["Airbyte <[email protected]>"]