From 3ec8f594387ca856d262d669aca9fdc3130d4d41 Mon Sep 17 00:00:00 2001 From: AnkitCLI Date: Thu, 11 Jan 2024 20:14:04 +0530 Subject: [PATCH] addressed comments for version range --- ...thWrnglerNGrpby-cdap-data-pipeline (1).json | 18 +++++------------- ...se_HL7_Wrangler-cdap-data-pipeline (1).json | 14 ++++---------- .../parse_csv_wrangle-cdap-data-pipeline.json | 14 ++++---------- ...se_datetime_wrangle-cdap-data-pipeline.json | 14 ++++---------- ...fixedlength_wrangle-cdap-data-pipeline.json | 14 ++++---------- ...e_timestamp_wrangle-cdap-data-pipeline.json | 14 ++++---------- 6 files changed, 25 insertions(+), 63 deletions(-) diff --git a/wrangler-transform/src/e2e-test/resources/testData/Wrangler/BQ2BQwithWrnglerNGrpby-cdap-data-pipeline (1).json b/wrangler-transform/src/e2e-test/resources/testData/Wrangler/BQ2BQwithWrnglerNGrpby-cdap-data-pipeline (1).json index 9aea3d439..a304b24b5 100644 --- a/wrangler-transform/src/e2e-test/resources/testData/Wrangler/BQ2BQwithWrnglerNGrpby-cdap-data-pipeline (1).json +++ b/wrangler-transform/src/e2e-test/resources/testData/Wrangler/BQ2BQwithWrnglerNGrpby-cdap-data-pipeline (1).json @@ -3,7 +3,7 @@ "description": "Data Pipeline Application", "artifact": { "name": "cdap-data-pipeline", - "version": "6.10.0-SNAPSHOT", + "version": "[4.0.0, 5.0.0]", "scope": "SYSTEM" }, "config": { @@ -41,9 +41,7 @@ "type": "batchsource", "label": "BigQueryTable", "artifact": { - "name": "google-cloud", - "version": "0.24.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "google-cloud" }, "properties": { "useConnection": "false", @@ -80,9 +78,7 @@ "type": "transform", "label": "Wrangler", "artifact": { - "name": "wrangler-transform", - "version": "4.11.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "wrangler-transform" }, "properties": { "directives": "drop phonenumber\nuppercase :firstname\nset-type :zipcode integer \nfind-and-replace :streetAddress s/St./Street/Ig\nset-column :lastname_count string:length(lastname)\nfilter-rows-on regex-match lastname_count .*5.*\nfilter-rows-on condition-true zipcode == null || zipcode =~ \"^\\W*$\"", @@ -123,9 +119,7 @@ "type": "batchaggregator", "label": "Group By", "artifact": { - "name": "core-plugins", - "version": "2.13.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "core-plugins" }, "properties": { "groupByFields": "city,firstname,lastname,state,zipcode,id", @@ -162,9 +156,7 @@ "type": "batchsink", "label": "BigQuery2", "artifact": { - "name": "google-cloud", - "version": "0.24.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "google-cloud" }, "properties": { "useConnection": "false", diff --git a/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_HL7_Wrangler-cdap-data-pipeline (1).json b/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_HL7_Wrangler-cdap-data-pipeline (1).json index 550be7934..4e0980b23 100644 --- a/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_HL7_Wrangler-cdap-data-pipeline (1).json +++ b/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_HL7_Wrangler-cdap-data-pipeline (1).json @@ -3,7 +3,7 @@ "description": "Data Pipeline Application", "artifact": { "name": "cdap-data-pipeline", - "version": "6.10.0-SNAPSHOT", + "version": "[4.0.0, 5.0.0]", "scope": "SYSTEM" }, "config": { @@ -37,9 +37,7 @@ "type": "batchsource", "label": "BigQueryTable", "artifact": { - "name": "google-cloud", - "version": "0.24.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "google-cloud" }, "properties": { "useConnection": "false", @@ -76,9 +74,7 @@ "type": "transform", "label": "Wrangler", "artifact": { - "name": "wrangler-transform", - "version": "4.11.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "wrangler-transform" }, "properties": { "directives": "parse-as-hl7 :Body\nhash :Body MD5\nset-type :Body string \nkeep address,Body,Body_hl7_MSH_12,Body_hl7_MSH_9_1\nfind-and-replace address s/address1/test/g\nmask-shuffle :Body_hl7_MSH_9_1\nsend-to-error empty(address)\nrename :Body_hl7_MSH_12 :id ", @@ -119,9 +115,7 @@ "type": "batchsink", "label": "BigQuery2", "artifact": { - "name": "google-cloud", - "version": "0.24.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "google-cloud" }, "properties": { "useConnection": "false", diff --git a/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_csv_wrangle-cdap-data-pipeline.json b/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_csv_wrangle-cdap-data-pipeline.json index dfad86afe..46ab159fb 100644 --- a/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_csv_wrangle-cdap-data-pipeline.json +++ b/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_csv_wrangle-cdap-data-pipeline.json @@ -3,7 +3,7 @@ "description": "Data Pipeline Application", "artifact": { "name": "cdap-data-pipeline", - "version": "6.10.0-SNAPSHOT", + "version": "[4.0.0, 5.0.0]", "scope": "SYSTEM" }, "config": { @@ -37,9 +37,7 @@ "type": "batchsource", "label": "BigQueryTable", "artifact": { - "name": "google-cloud", - "version": "0.24.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "google-cloud" }, "properties": { "useConnection": "false", @@ -76,9 +74,7 @@ "type": "transform", "label": "Wrangler", "artifact": { - "name": "wrangler-transform", - "version": "4.11.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "wrangler-transform" }, "properties": { "directives": "parse-as-csv :body ',' false\nrename body_1 new_id\nquantize body_4 body_q 1:2=20,3:4=40\nset-type :body_4 integer \ncolumns-replace s/^new_//g\nfill-null-or-empty :body_3 'shubh'\nset-headers :abc\nchange-column-case uppercase\ncleanse-column-names\nsplit-to-rows :id '#'", @@ -119,9 +115,7 @@ "type": "batchsink", "label": "BigQuery2", "artifact": { - "name": "google-cloud", - "version": "0.24.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "google-cloud" }, "properties": { "useConnection": "false", diff --git a/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_datetime_wrangle-cdap-data-pipeline.json b/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_datetime_wrangle-cdap-data-pipeline.json index 99dc55803..089c1590e 100644 --- a/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_datetime_wrangle-cdap-data-pipeline.json +++ b/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_datetime_wrangle-cdap-data-pipeline.json @@ -3,7 +3,7 @@ "description": "Data Pipeline Application", "artifact": { "name": "cdap-data-pipeline", - "version": "6.10.0-SNAPSHOT", + "version": "[4.0.0, 5.0.0]", "scope": "SYSTEM" }, "config": { @@ -37,9 +37,7 @@ "type": "batchsource", "label": "BigQueryTable", "artifact": { - "name": "google-cloud", - "version": "0.24.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "google-cloud" }, "properties": { "useConnection": "false", @@ -257,9 +255,7 @@ "type": "transform", "label": "Wrangler", "artifact": { - "name": "wrangler-transform", - "version": "4.11.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "wrangler-transform" }, "properties": { "directives": "parse-as-datetime :timestamp \"yyyy-MM-dd'T'HH:mm:ssX'['z']'\"\ncurrent-datetime :create_date\ndatetime-to-timestamp :timestamp\nformat-datetime :create_date 'y'\nformat-date :timestamp yyyy-mm-dd\nrename timestamp timecolumn", @@ -301,9 +297,7 @@ "type": "batchsink", "label": "BigQuery2", "artifact": { - "name": "google-cloud", - "version": "0.24.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "google-cloud" }, "properties": { "useConnection": "false", diff --git a/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_fixedlength_wrangle-cdap-data-pipeline.json b/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_fixedlength_wrangle-cdap-data-pipeline.json index b89e245d5..9c0e77363 100644 --- a/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_fixedlength_wrangle-cdap-data-pipeline.json +++ b/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_fixedlength_wrangle-cdap-data-pipeline.json @@ -3,7 +3,7 @@ "description": "Data Pipeline Application", "artifact": { "name": "cdap-data-pipeline", - "version": "6.10.0-SNAPSHOT", + "version": "[4.0.0, 5.0.0]", "scope": "SYSTEM" }, "config": { @@ -37,9 +37,7 @@ "type": "batchsource", "label": "BigQueryTable", "artifact": { - "name": "google-cloud", - "version": "0.24.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "google-cloud" }, "properties": { "useConnection": "false", @@ -76,9 +74,7 @@ "type": "transform", "label": "Wrangler", "artifact": { - "name": "wrangler-transform", - "version": "4.11.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "wrangler-transform" }, "properties": { "directives": "parse-as-fixed-length :fixedlength 2,4,5,3\nsplit-url :Url\nwrite-as-csv :Url_protocol\nurl-encode :Url\nurl-decode :Url\nencode base32 :fixedlength\ndecode base32 :fixedlength_encode_base32\nsplit-to-columns :Url_query '='\nrename :fixedlength_2 :id\nfilter-rows-on condition-true fixedlength_4 !~ 'XYZ'", @@ -119,9 +115,7 @@ "type": "batchsink", "label": "BigQuery2", "artifact": { - "name": "google-cloud", - "version": "0.24.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "google-cloud" }, "properties": { "useConnection": "false", diff --git a/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_timestamp_wrangle-cdap-data-pipeline.json b/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_timestamp_wrangle-cdap-data-pipeline.json index 805e58cc6..99e119eb5 100644 --- a/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_timestamp_wrangle-cdap-data-pipeline.json +++ b/wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_timestamp_wrangle-cdap-data-pipeline.json @@ -3,7 +3,7 @@ "description": "Data Pipeline Application", "artifact": { "name": "cdap-data-pipeline", - "version": "6.10.0-SNAPSHOT", + "version": "[4.0.0, 5.0.0]", "scope": "SYSTEM" }, "config": { @@ -37,9 +37,7 @@ "type": "batchsource", "label": "BigQueryTable", "artifact": { - "name": "google-cloud", - "version": "0.24.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "google-cloud" }, "properties": { "useConnection": "false", @@ -76,9 +74,7 @@ "type": "transform", "label": "Wrangler", "artifact": { - "name": "wrangler-transform", - "version": "4.11.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "wrangler-transform" }, "properties": { "directives": "parse-timestamp :time\nparse-as-currency :price :newprice\nformat-as-currency :newprice :format_price\nparse-as-simple-date :create_date yyyy-MM-dd\nparse-as-simple-date :update_date yyyy-MM-dd\ndiff-date :create_date :update_date :diff_date\ntimestamp-to-datetime :update_date\nrename :newprice :id", @@ -119,9 +115,7 @@ "type": "batchsink", "label": "BigQuery2", "artifact": { - "name": "google-cloud", - "version": "0.24.0-SNAPSHOT", - "scope": "SYSTEM" + "name": "google-cloud" }, "properties": { "useConnection": "false",