Merge branch 'master' into ddavydov/#1058-source-mailchimp-stream-sta…

…te-issue-second-try

.pre-commit-config.yaml

@@ -6,7 +6,8 @@ repos:
     rev: v0.8.8
     hooks:
       - id: licenseheaders
-        args: ["--tmpl=LICENSE_SHORT", "--ext=py", "-f"]
+        args:
+          ["--tmpl=LICENSE_SHORT", "--ext=py", "-x=**/models/__init__.py", "-f"]
   - repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:

airbyte-cdk/python/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.16.2
+Fix the naming of OAuthAuthenticator
+
 ## 0.16.1
 Include declarative_component_schema.yaml in the publish to PyPi
 

airbyte-cdk/python/README.md

@@ -66,6 +66,13 @@ pip install -e ".[dev]" # [dev] installs development-only dependencies
 * Perform static type checks using `mypy airbyte_cdk`. `MyPy` configuration is in `.mypy.ini`.
 * The `type_check_and_test.sh` script bundles both type checking and testing in one convenient command. Feel free to use it!
 
+##### Autogenerated files
+If the iteration you are working on includes changes to the models, you might want to regenerate them. In order to do that, you can run:
+```commandline
+SUB_BUILD=CONNECTORS_BASE ./gradlew format --scan --info --stacktrace
+```
+This will generate the files based on the schemas, add the license information and format the code. If you want to only do the former and rely on pre-commit to the others, you can run the appropriate generation command i.e. `./gradlew generateProtocolClassFiles` or `./gradlew generateComponentManifestClassFiles`.
+
 #### Testing
 
 All tests are located in the `unit_tests` directory. Run `pytest --cov=airbyte_cdk unit_tests/` to run them. This also presents a test coverage report.

airbyte-cdk/python/airbyte_cdk/sources/declarative/declarative_component_schema.yaml

@@ -363,8 +363,8 @@ definitions:
       $options:
         type: object
         additionalProperties: true
-  DeclarativeOauth2Authenticator:
-    description: Authenticator for requests using Oauth authentication
+  OAuthAuthenticator:
+    description: Authenticator for requests using OAuth 2.0 authentication
     type: object
     required:
       - type
@@ -375,7 +375,7 @@ definitions:
     properties:
       type:
         type: string
-        enum: [DeclarativeOauth2Authenticator]
+        enum: [OAuthAuthenticator]
       client_id:
         type: string
       client_secret:
@@ -580,7 +580,7 @@ definitions:
           - "$ref": "#/definitions/BasicHttpAuthenticator"
           - "$ref": "#/definitions/BearerAuthenticator"
           - "$ref": "#/definitions/CustomAuthenticator"
-          - "$ref": "#/definitions/DeclarativeOauth2Authenticator"
+          - "$ref": "#/definitions/OAuthAuthenticator"
           - "$ref": "#/definitions/NoAuth"
           - "$ref": "#/definitions/SessionTokenAuthenticator"
       error_handler:

airbyte-cdk/python/airbyte_cdk/sources/declarative/models/__init__.py

@@ -0,0 +1,2 @@
+# generated by generate-component-manifest-files
+from .declarative_component_schema import *