Skip to content

Commit 06505be

Browse files
authored
Merge branch 'data-integrations:develop' into GoogleBigQSource
2 parents 6aeccd4 + 3fa80a2 commit 06505be

28 files changed

Lines changed: 454 additions & 49 deletions

docs/BigQueryExecute-action.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ cache that will be flushed whenever tables in the query are modified.
6262
It is only applicable when users choose to store the query results in a BigQuery table.
6363
More information can be found [here](https://cloud.google.com/data-fusion/docs/how-to/customer-managed-encryption-keys)
6464

65+
**Destination Table Write Preference**: Provides the following options as write preferences for the destination table:
66+
* **Write if Empty**: Only write if the table is empty
67+
* **Append to Table**: Add results to existing data. Schema should match.
68+
* **Overwrite Table**: Replace all existing data. Schema will also be overriden.
69+
6570
**Row As Arguments**: Row as arguments. For example, if the query is 'select min(id) as min_id, max(id) as max_id from my_dataset.my_table',
6671
an arguments for 'min_id' and 'max_id' will be set based on the query results. Plugins further down the pipeline can then
6772
reference these values with macros ${min_id} and ${max_id}.

src/e2e-test/features/bigquery/sink/GCSToBigQuery_WithMacro.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Feature: BigQuery sink - Verification of GCS to BigQuery successful data transfe
5656
Then Close the pipeline logs
5757
Then Close the preview
5858
Then Deploy the pipeline
59-
Then Run the Pipeline in Runtime
59+
Then Click on the Runtime Arguments Dropdown button
6060
Then Enter runtime argument value "projectId" for key "gcsProjectId"
6161
Then Enter runtime argument value "serviceAccountType" for key "serviceAccountType"
6262
Then Enter runtime argument value "serviceAccount" for key "serviceAccount"

src/e2e-test/features/bigquery/source/BigQueryToGCS_WithMacro.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Feature: BigQuery source - Verification of BigQuery to GCS successful data trans
5151
Then Click on preview data for GCS sink
5252
Then Close the preview data
5353
Then Deploy the pipeline
54-
Then Run the Pipeline in Runtime
54+
Then Click on the Runtime Arguments Dropdown button
5555
Then Enter runtime argument value "projectId" for key "bqProjectId"
5656
Then Enter runtime argument value "projectId" for key "bqDatasetProjectId"
5757
Then Enter runtime argument value "serviceAccountType" for key "serviceAccountType"

src/e2e-test/features/bigqueryexecute/BQExecute_WithMacro.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Feature: BigQueryExecute - Verify data transfer using BigQuery Execute plugin wi
1919
Then Validate "BigQuery Execute" plugin properties
2020
Then Close the Plugin Properties page
2121
Then Save and Deploy Pipeline
22-
Then Run the Pipeline in Runtime
22+
Then Click on the Runtime Arguments Dropdown button
2323
Then Enter runtime argument value "projectId" for key "bqeProjectId"
2424
Then Enter runtime argument value "bqExecuteQuery" for key "bqeSQl"
2525
Then Enter runtime argument value "projectId" for key "bqeDatasetProjectId"

src/e2e-test/features/bigtable/BigTableToBigTable.feature

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Feature: BigTable source - Verification of BigTable to BigTable Successful Data
4242
Then Close the Plugin Properties page
4343
Then Save the pipeline
4444
Then Deploy the pipeline
45-
Then Run the Pipeline in Runtime
45+
Then Click on the Runtime Arguments Dropdown button
4646
Then Enter runtime argument value "cbtSourceOutputSchema" for key "macroKeyString"
4747
Then Run the Pipeline in Runtime with runtime arguments
4848
Then Wait till pipeline is in running state
@@ -79,7 +79,7 @@ Feature: BigTable source - Verification of BigTable to BigTable Successful Data
7979
Then Close the Plugin Properties page
8080
Then Save the pipeline
8181
Then Deploy the pipeline
82-
Then Run the Pipeline in Runtime
82+
Then Click on the Runtime Arguments Dropdown button
8383
Then Enter runtime argument value "cbtSourceOutputSchema" for key "macroKeyString"
8484
Then Run the Pipeline in Runtime with runtime arguments
8585
Then Wait till pipeline is in running state
@@ -115,7 +115,7 @@ Feature: BigTable source - Verification of BigTable to BigTable Successful Data
115115
Then Close the Plugin Properties page
116116
Then Save the pipeline
117117
Then Deploy the pipeline
118-
Then Run the Pipeline in Runtime
118+
Then Click on the Runtime Arguments Dropdown button
119119
Then Enter runtime argument value "cbtSourceOutputSchema" for key "macroKeyString"
120120
Then Run the Pipeline in Runtime with runtime arguments
121121
Then Wait till pipeline is in running state

src/e2e-test/features/gcs/source/GCSSourceError.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Feature: GCS source - Verify GCS Source plugin error scenarios
1111
| property |
1212
| path |
1313
| format |
14+
| referenceName |
1415

1516
Scenario: To verify Error message for invalid bucket name
1617
Given Open Datafusion Project to configure pipeline

src/e2e-test/features/gcs/source/GCSSourceToBigQuery.feature

Lines changed: 265 additions & 0 deletions
Large diffs are not rendered by default.

src/e2e-test/features/gcscopy/GCSCopy_WithMacro.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Feature:GCSCopy - Verification of successful objects copy from one bucket to ano
2929
Then Validate "GCS Copy" plugin properties
3030
Then Close the Plugin Properties page
3131
Then Save and Deploy Pipeline
32-
Then Run the Pipeline in Runtime
32+
Then Click on the Runtime Arguments Dropdown button
3333
Then Enter runtime argument value "projectId" for key "projectId"
3434
Then Enter runtime argument value "gcsCsvFile" for GCSCopy property sourcePath key "SourcePath"
3535
Then Enter runtime argument value for GCSCopy property destination path key "DestPath"

src/e2e-test/features/gcscreate/GCSCreate.feature

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,26 @@ Feature: GCSCreate - Verification of GCS Create plugin
2424
Then Verify that the object "gcsCreateObject2" created successfully
2525

2626
@GCS_CSV_TEST @GCSCreate_Required
27-
Scenario: Verify the pipeline with GCSCreate should fail on second run when fail if objects exists is true
27+
Scenario: Verify that pipeline with GCSCreate failed when fail if objects exists property set to true
2828
Given Open Datafusion Project to configure pipeline
2929
When Expand Plugin group in the LHS plugins list: "Conditions and Actions"
3030
When Select plugin: "GCS Create" from the plugins list as: "Conditions and Actions"
3131
When Navigate to the properties page of plugin: "GCS Create"
3232
Then Enter the GCS Create property projectId "projectId"
33-
Then Enter the GCS Create property objects to create as path "gcsCreateObject1"
33+
Then Enter the GCS Create property objects to create as path "gcsCsvFile"
3434
Then Select GCS Create property fail if objects exists as "true"
3535
Then Override Service account details if set in environment variables
3636
Then Validate "GCS Create" plugin properties
3737
Then Close the GCS Create properties
3838
Then Save and Deploy Pipeline
3939
Then Run the Pipeline in Runtime
4040
Then Wait till pipeline is in running state
41-
Then Verify the pipeline status is "Succeeded"
42-
Then Run the Pipeline in Runtime
43-
Then Wait for pipeline to be in status: "Failed" with a timeout of 240 seconds
4441
Then Open and capture logs
4542
Then Verify the pipeline status is "Failed"
4643
Then Close the pipeline logs
4744

4845
@GCS_CSV_TEST @GCSCreate_Required
49-
Scenario: Verify the pipeline with GCSCreate should not fail on second run when fail if objects exists is false
46+
Scenario: Verify that pipeline with GCSCreate succeeded when fail if objects exists property set to false
5047
Given Open Datafusion Project to configure pipeline
5148
When Expand Plugin group in the LHS plugins list: "Conditions and Actions"
5249
When Select plugin: "GCS Create" from the plugins list as: "Conditions and Actions"
@@ -60,9 +57,6 @@ Feature: GCSCreate - Verification of GCS Create plugin
6057
Then Save and Deploy Pipeline
6158
Then Run the Pipeline in Runtime
6259
Then Wait till pipeline is in running state
63-
Then Verify the pipeline status is "Succeeded"
64-
Then Run the Pipeline in Runtime
65-
Then Wait for pipeline to be in status: "Succeeded" with a timeout of 240 seconds
6660
Then Open and capture logs
6761
Then Verify the pipeline status is "Succeeded"
6862
Then Close the pipeline logs

src/e2e-test/features/gcscreate/GCSCreate_WithMacro.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Feature: GCSCreate - Verification of GCS Create plugin with macro arguments
1717
Then Validate "GCS Create" plugin properties
1818
Then Close the GCS Create properties
1919
Then Save and Deploy Pipeline
20-
Then Run the Pipeline in Runtime
20+
Then Click on the Runtime Arguments Dropdown button
2121
Then Enter runtime argument value "projectId" for key "gcsCreateProjectId"
2222
Then Enter runtime argument value "gcsCreateObject1" for GCSCreate property key "gcsCreateObjectsToCreate"
2323
Then Enter runtime argument value "true" for GCSCreate property key "gcsCreateFailIfObjectExists"

0 commit comments

Comments
 (0)