From 0d56779186c25c021a6158f88ad7533fb17cb089 Mon Sep 17 00:00:00 2001
From: priyabhatnagar <priya.bhatnagar@cloudsufi.com>
Date: Mon, 9 Oct 2023 15:16:48 +0530
Subject: [PATCH] Removed Issue tag Plugin-1669 in Runtime scenarios and test
 runner file, updated correct conn string, removed space in yml, removed
 verify goal in pom. changed sql connector java version to run in github
 actions and bqmt secret updated

---
 .github/workflows/e2e.yml                                 | 8 +++-----
 pom.xml                                                   | 4 +---
 ...atabaseTableToBigQueryMultiTableSink_WithMacro.feature | 4 ++--
 .../MultipleDatabaseTableToBiqQueryMultiTableSink.feature | 4 ++--
 .../plugin/bigquerymultitable/runners/TestRunner.java     | 3 +--
 src/e2e-test/resources/pluginParameters.properties        | 2 +-
 6 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index db8598b9ce..812e64ffea 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -79,7 +79,7 @@ jobs:
                         MYSQL_USERNAME:cdapio-github-builds/MYSQL_USERNAME
                         MYSQL_PASSWORD:cdapio-github-builds/MYSQL_PASSWORD
                         MYSQL_PORT:cdapio-github-builds/MYSQL_PORT
-                        CONNECTION_STRING:cdapio-github-builds/CONNECTION_STRING
+                        BQMT_CONNECTION_STRING:cdapio-github-builds/BQMT_CONNECTION_STRING
 
       - name: Run required e2e tests
         if: github.event_name != 'workflow_dispatch' && github.event_name != 'push' && steps.filter.outputs.e2e-test == 'false'
@@ -89,7 +89,7 @@ jobs:
           MYSQL_USERNAME: ${{ steps.secrets.outputs.MYSQL_USERNAME }}
           MYSQL_PASSWORD: ${{ steps.secrets.outputs.MYSQL_PASSWORD }}
           MYSQL_PORT: ${{ steps.secrets.outputs.MYSQL_PORT }}
-          CONNECTION_STRING: ${{ steps.secrets.outputs.CONNECTION_STRING }}
+          BQMT_CONNECTION_STRING: ${{ steps.secrets.outputs.BQMT_CONNECTION_STRING }}
 
       - name: Run all e2e tests
         if: github.event_name == 'workflow_dispatch' || github.event_name == 'push' || steps.filter.outputs.e2e-test == 'true'
@@ -99,7 +99,7 @@ jobs:
           MYSQL_USERNAME: ${{ steps.secrets.outputs.MYSQL_USERNAME }}
           MYSQL_PASSWORD: ${{ steps.secrets.outputs.MYSQL_PASSWORD }}
           MYSQL_PORT: ${{ steps.secrets.outputs.MYSQL_PORT }}
-          CONNECTION_STRING: ${{ steps.secrets.outputs.CONNECTION_STRING }}
+          BQMT_CONNECTION_STRING: ${{ steps.secrets.outputs.BQMT_CONNECTION_STRING }}
 
       - name: Upload report 
         uses: actions/upload-artifact@v3
@@ -107,14 +107,12 @@ jobs:
         with:
           name: Cucumber report - ${{ matrix.tests }}
           path: ./plugin/target/cucumber-reports
-
       - name: Upload debug files 
         uses: actions/upload-artifact@v3
         if: always()
         with:
           name: Debug files - ${{ matrix.tests }}
           path: ./**/target/e2e-debug
-
       - name: Upload files to GCS
         uses: google-github-actions/upload-cloud-storage@v0
         if: always()
diff --git a/pom.xml b/pom.xml
index 303c7d0ead..40b74d7255 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   ~ Copyright © 2016-2019 Cask Data, Inc.
   ~
@@ -1195,7 +1194,6 @@
           <execution>
             <goals>
               <goal>integration-test</goal>
-              <goal>verify</goal>
             </goals>
           </execution>
         </executions>
@@ -1246,7 +1244,7 @@
         <dependency>
           <groupId>mysql</groupId>
           <artifactId>mysql-connector-java</artifactId>
-          <version>8.0.19</version>
+          <version>8.0.25</version>
           <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/e2e-test/features/bigquerymultitable/MultipleDatabaseTableToBigQueryMultiTableSink_WithMacro.feature b/src/e2e-test/features/bigquerymultitable/MultipleDatabaseTableToBigQueryMultiTableSink_WithMacro.feature
index e763f77a7f..11ff2676ac 100644
--- a/src/e2e-test/features/bigquerymultitable/MultipleDatabaseTableToBigQueryMultiTableSink_WithMacro.feature
+++ b/src/e2e-test/features/bigquerymultitable/MultipleDatabaseTableToBigQueryMultiTableSink_WithMacro.feature
@@ -15,7 +15,7 @@
 @BQMT_SINK
 Feature: BigQueryMultiTable sink -Verification of Multiple Database Tables to BigQueryMultiTable successful data transfer using macros
 
-  @MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required @PLUGIN-1669
+  @MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required
   Scenario:Verify data is getting transferred from Multiple Database Tables to BQMT sink with all datatypes using macros
     Given Open Datafusion Project to configure pipeline
     When Expand Plugin group in the LHS plugins list: "Source"
@@ -71,7 +71,7 @@ Feature: BigQueryMultiTable sink -Verification of Multiple Database Tables to Bi
     Then Verify the pipeline status is "Succeeded"
     Then Validate the values of records transferred to BQMT sink is equal to the value from source MultiDatabase table
 
-  @MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required @PLUGIN-1669
+  @MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required
   Scenario:Verify data is getting transferred from Multiple Database Tables to BQMT sink with split field using macros
     Given Open Datafusion Project to configure pipeline
     When Expand Plugin group in the LHS plugins list: "Source"
diff --git a/src/e2e-test/features/bigquerymultitable/MultipleDatabaseTableToBiqQueryMultiTableSink.feature b/src/e2e-test/features/bigquerymultitable/MultipleDatabaseTableToBiqQueryMultiTableSink.feature
index 056c39bd19..5548177e0a 100644
--- a/src/e2e-test/features/bigquerymultitable/MultipleDatabaseTableToBiqQueryMultiTableSink.feature
+++ b/src/e2e-test/features/bigquerymultitable/MultipleDatabaseTableToBiqQueryMultiTableSink.feature
@@ -15,7 +15,7 @@
 @BQMT_SINK
 Feature: BigQueryMultiTable sink -Verification of MultipleDatabaseTable to BigQueryMultiTable successful data transfer
 
-  @MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required @PLUGIN-1669
+  @MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required
   Scenario:Verify data is getting transferred from Multiple Database Tables to BQMT sink with all datatypes
     Given Open Datafusion Project to configure pipeline
     When Expand Plugin group in the LHS plugins list: "Source"
@@ -58,7 +58,7 @@ Feature: BigQueryMultiTable sink -Verification of MultipleDatabaseTable to BigQu
     Then Verify the pipeline status is "Succeeded"
     Then Validate the values of records transferred to BQMT sink is equal to the value from source MultiDatabase table
 
-  @MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required @PLUGIN-1669
+  @MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required
   Scenario:Verify data is getting transferred from Multiple Database Tables to BQMT sink with split field
     Given Open Datafusion Project to configure pipeline
     When Expand Plugin group in the LHS plugins list: "Source"
diff --git a/src/e2e-test/java/io/cdap/plugin/bigquerymultitable/runners/TestRunner.java b/src/e2e-test/java/io/cdap/plugin/bigquerymultitable/runners/TestRunner.java
index 5a7927d06c..7807102f3d 100644
--- a/src/e2e-test/java/io/cdap/plugin/bigquerymultitable/runners/TestRunner.java
+++ b/src/e2e-test/java/io/cdap/plugin/bigquerymultitable/runners/TestRunner.java
@@ -27,8 +27,7 @@
   features = {"src/e2e-test/features"},
   glue = {"io.cdap.plugin.bigquerymultitable.stepsdesign", "io.cdap.plugin.gcs.stepsdesign", "stepsdesign",
     "io.cdap.plugin.common.stepsdesign"},
-  tags = {"@BQMT_SINK and not @PLUGIN-1669"},
-  //TODO: Enable test once issue is fixed https://cdap.atlassian.net/browse/PLUGIN-1669
+  tags = {"@BQMT_SINK"},
   monochrome = true,
   plugin = {"pretty", "html:target/cucumber-html-report/bigquerymultitable",
     "json:target/cucumber-reports/cucumber-bigquerymultitable.json",
diff --git a/src/e2e-test/resources/pluginParameters.properties b/src/e2e-test/resources/pluginParameters.properties
index 56cce3fb9f..241e6536cb 100644
--- a/src/e2e-test/resources/pluginParameters.properties
+++ b/src/e2e-test/resources/pluginParameters.properties
@@ -238,7 +238,7 @@ host=MYSQL_HOST
 user=MYSQL_USERNAME
 pass=MYSQL_PASSWORD
 port=MYSQL_PORT
-connectionString=CONNECTION_STRING
+connectionString=BQMT_CONNECTION_STRING
 mySQLSourceTable=dummy
 sourceTable=dummy
 tableNameField=tableName