Source: Google Analytics 4 (GA4) - improve config validation and SAT

airbyte-config/init/src/main/resources/seed/source_definitions.yaml

@@ -622,7 +622,7 @@
 - name: Google Analytics 4 (GA4)
   sourceDefinitionId: 3cc2eafd-84aa-4dca-93af-322d9dfeec1a
   dockerRepository: airbyte/source-google-analytics-data-api
-  dockerImageTag: 0.0.3
+  dockerImageTag: 0.1.0
   documentationUrl: https://docs.airbyte.com/integrations/sources/google-analytics-v4
   icon: google-analytics.svg
   sourceType: api

airbyte-config/init/src/main/resources/seed/source_specs.yaml

@@ -5397,7 +5397,7 @@
         oauthFlowOutputParameters:
         - - "access_token"
         - - "refresh_token"
-- dockerImage: "airbyte/source-google-analytics-data-api:0.0.3"
+- dockerImage: "airbyte/source-google-analytics-data-api:0.1.0"
   spec:
     documentationUrl: "https://docs.airbyte.com/integrations/sources/google-analytics-v4"
     connectionSpecification:
@@ -5476,9 +5476,11 @@
                 airbyte_secret: true
         date_ranges_start_date:
           type: "string"
-          title: "Date Range Start Date"
-          description: "The start date. One of the values Ndaysago, yesterday, today\
-            \ or in the format YYYY-MM-DD"
+          title: "Start Date"
+          description: "The start date from which to replicate report data in the\
+            \ format YYYY-MM-DD. Data generated before this date will not be included\
+            \ in the report."
+          format: "date"
           order: 2
         custom_reports:
           order: 3
@@ -5499,14 +5501,16 @@
             \ causing inaccuracies in the returned results. We recommend setting this\
             \ to 1 unless you have a hard requirement to make the sync faster at the\
             \ expense of accuracy. The minimum allowed value for this field is 1,\
-            \ and the maximum is 364. "
+            \ and the maximum is 364."
           examples:
           - 30
           - 60
           - 90
           - 120
           - 200
           - 364
+          minimum: 1
+          maximum: 364
           default: 1
           order: 4
     supportsNormalization: false

airbyte-integrations/connectors/source-google-analytics-data-api/Dockerfile

@@ -28,5 +28,5 @@ COPY source_google_analytics_data_api ./source_google_analytics_data_api
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.0.3
+LABEL io.airbyte.version=0.1.0
 LABEL io.airbyte.name=airbyte/source-google-analytics-data-api

airbyte-integrations/connectors/source-google-analytics-data-api/acceptance-test-config.yml

@@ -1,31 +1,43 @@
 # See [Source Acceptance Tests](https://docs.airbyte.com/connector-development/testing-connectors/source-acceptance-tests-reference)
 # for more information about how to configure these tests
 connector_image: airbyte/source-google-analytics-data-api:dev
-tests:
+acceptance_tests:
   spec:
-    - spec_path: "source_google_analytics_data_api/spec.json"
+    tests:
+      - spec_path: "source_google_analytics_data_api/spec.json"
+        backward_compatibility_tests_config:
+          disable_for_version: "0.0.3"
   connection:
-    - config_path: "secrets/config.json"
-      status: "succeed"
-    - config_path: "integration_tests/invalid_config.json"
-      status: "failed"
+    tests:
+      - config_path: "secrets/config.json"
+        status: "succeed"
+      - config_path: "integration_tests/invalid_config.json"
+        status: "failed"
   discovery:
-    - config_path: "secrets/config.json"
-      backward_compatibility_tests_config:
-        disable_for_version: "0.0.2"
+    tests:
+      - config_path: "secrets/config.json"
+        backward_compatibility_tests_config:
+          disable_for_version: "0.0.2"
   basic_read:
-    - config_path: "secrets/config.json"
-      configured_catalog_path: "integration_tests/configured_catalog.json"
-      empty_streams: []
+    tests:
+      - config_path: "secrets/config.json"
+        configured_catalog_path: "integration_tests/configured_catalog.json"
   full_refresh:
-    - config_path: "secrets/config.json"
-      configured_catalog_path: "integration_tests/configured_catalog.json"
-      ignored_fields:
-        "daily_active_users": ["uuid"]
-        "weekly_active_users": ["uuid"]
-        "four_weekly_active_users": ["uuid"]
-        "devices": ["uuid"]
-        "locations": ["uuid"]
-        "pages": ["uuid"]
-        "traffic_sources": ["uuid"]
-        "website_overview": ["uuid"]
+    tests:
+      - config_path: "secrets/config.json"
+        configured_catalog_path: "integration_tests/configured_catalog.json"
+        ignored_fields:
+          "daily_active_users": ["uuid"]
+          "weekly_active_users": ["uuid"]
+          "four_weekly_active_users": ["uuid"]
+          "devices": ["uuid"]
+          "locations": ["uuid"]
+          "pages": ["uuid"]
+          "traffic_sources": ["uuid"]
+          "website_overview": ["uuid"]
+  incremental:
+    tests:
+      - config_path: "secrets/config.json"
+        configured_catalog_path: "integration_tests/configured_catalog.json"
+        future_state:
+          future_state_path: "integration_tests/abnormal_state.json"

airbyte-integrations/connectors/source-google-analytics-data-api/integration_tests/abnormal_state.json

@@ -0,0 +1,90 @@
+[
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_descriptor": {
+        "name": "daily_active_users"
+      },
+      "stream_state": {
+        "date": "20990101"
+      }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_descriptor": {
+        "name": "weekly_active_users"
+      },
+      "stream_state": {
+        "date": "20990101"
+      }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_descriptor": {
+        "name": "four_weekly_active_users"
+      },
+      "stream_state": {
+        "date": "20990101"
+      }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_descriptor": {
+        "name": "devices"
+      },
+      "stream_state": {
+        "date": "20990101"
+      }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_descriptor": {
+        "name": "locations"
+      },
+      "stream_state": {
+        "date": "20990101"
+      }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_descriptor": {
+        "name": "pages"
+      },
+      "stream_state": {
+        "date": "20990101"
+      }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_descriptor": {
+        "name": "traffic_sources"
+      },
+      "stream_state": {
+        "date": "20990101"
+      }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_descriptor": {
+        "name": "website_overview"
+      },
+      "stream_state": {
+        "date": "20990101"
+      }
+    }
+  }
+]

airbyte-integrations/connectors/source-google-analytics-data-api/integration_tests/configured_catalog.json

@@ -4,9 +4,10 @@
       "stream": {
         "name": "daily_active_users",
         "json_schema": {},
-        "supported_sync_modes": ["incremental"],
-        "source_defined_cursor": false,
-        "default_cursor_field": ["date"]
+        "supported_sync_modes": ["full_refresh", "incremental"],
+        "source_defined_cursor": true,
+        "default_cursor_field": ["date"],
+        "source_defined_primary_key": [["uuid"]]
       },
       "sync_mode": "incremental",
       "destination_sync_mode": "overwrite"
@@ -15,9 +16,10 @@
       "stream": {
         "name": "weekly_active_users",
         "json_schema": {},
-        "supported_sync_modes": ["incremental"],
-        "source_defined_cursor": false,
-        "default_cursor_field": ["date"]
+        "supported_sync_modes": ["full_refresh", "incremental"],
+        "source_defined_cursor": true,
+        "default_cursor_field": ["date"],
+        "source_defined_primary_key": [["uuid"]]
       },
       "sync_mode": "incremental",
       "destination_sync_mode": "overwrite"
@@ -26,9 +28,10 @@
       "stream": {
         "name": "four_weekly_active_users",
         "json_schema": {},
-        "supported_sync_modes": ["incremental"],
-        "source_defined_cursor": false,
-        "default_cursor_field": ["date"]
+        "supported_sync_modes": ["full_refresh", "incremental"],
+        "source_defined_cursor": true,
+        "default_cursor_field": ["date"],
+        "source_defined_primary_key": [["uuid"]]
       },
       "sync_mode": "incremental",
       "destination_sync_mode": "overwrite"
@@ -37,9 +40,10 @@
       "stream": {
         "name": "devices",
         "json_schema": {},
-        "supported_sync_modes": ["incremental"],
-        "source_defined_cursor": false,
-        "default_cursor_field": ["date"]
+        "supported_sync_modes": ["full_refresh", "incremental"],
+        "source_defined_cursor": true,
+        "default_cursor_field": ["date"],
+        "source_defined_primary_key": [["uuid"]]
       },
       "sync_mode": "incremental",
       "destination_sync_mode": "overwrite"
@@ -48,9 +52,10 @@
       "stream": {
         "name": "locations",
         "json_schema": {},
-        "supported_sync_modes": ["incremental"],
-        "source_defined_cursor": false,
-        "default_cursor_field": ["date"]
+        "supported_sync_modes": ["full_refresh", "incremental"],
+        "source_defined_cursor": true,
+        "default_cursor_field": ["date"],
+        "source_defined_primary_key": [["uuid"]]
       },
       "sync_mode": "incremental",
       "destination_sync_mode": "overwrite"
@@ -59,9 +64,10 @@
       "stream": {
         "name": "pages",
         "json_schema": {},
-        "supported_sync_modes": ["incremental"],
-        "source_defined_cursor": false,
-        "default_cursor_field": ["date"]
+        "supported_sync_modes": ["full_refresh", "incremental"],
+        "source_defined_cursor": true,
+        "default_cursor_field": ["date"],
+        "source_defined_primary_key": [["uuid"]]
       },
       "sync_mode": "incremental",
       "destination_sync_mode": "overwrite"
@@ -70,9 +76,10 @@
       "stream": {
         "name": "traffic_sources",
         "json_schema": {},
-        "supported_sync_modes": ["incremental"],
-        "source_defined_cursor": false,
-        "default_cursor_field": ["date"]
+        "supported_sync_modes": ["full_refresh", "incremental"],
+        "source_defined_cursor": true,
+        "default_cursor_field": ["date"],
+        "source_defined_primary_key": [["uuid"]]
       },
       "sync_mode": "incremental",
       "destination_sync_mode": "overwrite"
@@ -81,9 +88,10 @@
       "stream": {
         "name": "website_overview",
         "json_schema": {},
-        "supported_sync_modes": ["incremental"],
-        "source_defined_cursor": false,
-        "default_cursor_field": ["date"]
+        "supported_sync_modes": ["full_refresh", "incremental"],
+        "source_defined_cursor": true,
+        "default_cursor_field": ["date"],
+        "source_defined_primary_key": [["uuid"]]
       },
       "sync_mode": "incremental",
       "destination_sync_mode": "overwrite"

airbyte-integrations/connectors/source-google-analytics-data-api/source_google_analytics_data_api/defaults/custom_reports_schema.json

@@ -0,0 +1,26 @@
+{
+  "type": "array",
+  "items": {
+    "type": "object",
+    "required": ["name", "dimensions", "metrics"],
+    "properties": {
+      "name": {
+        "type": "string"
+      },
+      "dimensions": {
+        "type": "array",
+        "minItems": 1,
+        "items": {
+          "type": "string"
+        }
+      },
+      "metrics": {
+        "type": "array",
+        "minItems": 1,
+        "items": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}