changes made to show fields in upgrade.

data-integrations · Mar 20, 2024 · c19a90f · c19a90f
1 parent ecf6993
commit c19a90f
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 32 deletions.
diff --git a/docs/GoogleDrive-batchsink.md b/docs/GoogleDrive-batchsink.md
@@ -44,7 +44,8 @@ OAuth2 client credentials can be generated on Google Cloud
 [Credentials Page](https://console.cloud.google.com/apis/credentials)
 
 **OAuth Method:** The method used to get OAuth access tokens. The oauth access token can be directly provided,
-or a client id, client secret, and refresh token can be provided.
+or a client id, client secret, and refresh token can be provided. Access Token can be used if user wants to
+provide access token directly or oauthAccessToken macro.
 
 **Access Token:** Short lived access token for connect.
 

diff --git a/docs/GoogleDrive-batchsource.md b/docs/GoogleDrive-batchsource.md
@@ -59,7 +59,8 @@ OAuth2 client credentials can be generated on Google Cloud
 [Credentials Page](https://console.cloud.google.com/apis/credentials)
 
 **OAuth Method:** The method used to get OAuth access tokens. The oauth access token can be directly provided,
-or a client id, client secret, and refresh token can be provided.
+or a client id, client secret, and refresh token can be provided. Access Token can be used if user wants to
+provide access token directly or oauthAccessToken macro.
 
 **Access Token:** Short lived access token for connect.
 

diff --git a/docs/GoogleSheets-batchsink.md b/docs/GoogleSheets-batchsink.md
@@ -47,7 +47,8 @@ OAuth2 client credentials can be generated on Google Cloud
 [Credentials Page](https://console.cloud.google.com/apis/credentials)
 
 **OAuth Method:** The method used to get OAuth access tokens. The oauth access token can be directly provided,
-or a client id, client secret, and refresh token can be provided.
+or a client id, client secret, and refresh token can be provided. Access Token can be used if user wants to
+provide access token directly or oauthAccessToken macro.
 
 **Access Token:** Short lived access token for connect.
 

diff --git a/docs/GoogleSheets-batchsource.md b/docs/GoogleSheets-batchsource.md
@@ -56,7 +56,8 @@ OAuth2 client credentials can be generated on Google Cloud
 [Credentials Page](https://console.cloud.google.com/apis/credentials)
 
 **OAuth Method:** The method used to get OAuth access tokens. The oauth access token can be directly provided,
-or a client id, client secret, and refresh token can be provided.
+or a client id, client secret, and refresh token can be provided. Access Token can be used if user wants to
+provide access token directly or oauthAccessToken macro.
 
 **Access Token:** Short lived access token for connect.
 

diff --git a/src/main/java/io/cdap/plugin/google/common/GoogleAuthBaseConfig.java b/src/main/java/io/cdap/plugin/google/common/GoogleAuthBaseConfig.java
@@ -56,7 +56,7 @@ public abstract class GoogleAuthBaseConfig extends PluginConfig {
   public static final String SCHEMA = "schema";
   public static final String ACCESS_TOKEN = "accessToken";
   public static final String ACCESS_TOKEN_LABEL = "Access token";
-  public static final String OAUTH_METHOD = "oauthMethod";
+  public static final String OAUTH_METHOD = "oAuthMethod";
 
   private static final String IS_SET_FAILURE_MESSAGE_PATTERN = "'%s' property is empty or macro is not available.";
 
@@ -85,7 +85,7 @@ public abstract class GoogleAuthBaseConfig extends PluginConfig {
   @Description("The method used to get OAuth access tokens. "
     + "The oauth access token can be directly provided, "
     + "or a client id, client secret, and refresh token can be provided.")
-  private String oauthMethod;
+  private String oAuthMethod;
 
   @Nullable
   @Macro
@@ -314,8 +314,8 @@ public void setRefreshToken(String refreshToken) {
     this.refreshToken = refreshToken;
   }
 
-  public void setOauthMethod(String oauthMethod) {
-    this.oauthMethod = oauthMethod;
+  public void setoAuthMethod(String oAuthMethod) {
+    this.oAuthMethod = oAuthMethod;
   }
 
   public void setAccessToken(String accessToken) {
@@ -383,13 +383,13 @@ public Boolean isServiceAccountFilePath() {
   }
 
   public OAuthMethod getOAuthMethod() {
-    if (oauthMethod == null) {
+    if (oAuthMethod == null) {
       return OAuthMethod.REFRESH_TOKEN;
     }
     try {
-      return OAuthMethod.valueOf(oauthMethod.toUpperCase());
+      return OAuthMethod.valueOf(oAuthMethod.toUpperCase());
     } catch (IllegalArgumentException e) {
-      throw new IllegalArgumentException("Invalid oauth method " + oauthMethod);
+      throw new IllegalArgumentException("Invalid oAuth method " + oAuthMethod);
     }
   }
 }
diff --git a/src/main/java/io/cdap/plugin/google/drive/source/GoogleDriveSourceConfig.java b/src/main/java/io/cdap/plugin/google/drive/source/GoogleDriveSourceConfig.java
@@ -368,7 +368,7 @@ public static GoogleDriveSourceConfig of(JsonObject properties) throws IOExcepti
       googleDriveSourceConfig.setAccessToken(properties.get(GoogleDriveSourceConfig.ACCESS_TOKEN).getAsString());
     }
     if (properties.has(GoogleDriveSourceConfig.OAUTH_METHOD)) {
-      googleDriveSourceConfig.setOauthMethod(properties.get(GoogleDriveSourceConfig.OAUTH_METHOD).getAsString());
+      googleDriveSourceConfig.setoAuthMethod(properties.get(GoogleDriveSourceConfig.OAUTH_METHOD).getAsString());
     }
     return googleDriveSourceConfig;
   }

diff --git a/src/main/java/io/cdap/plugin/google/sheets/source/GoogleSheetsSourceConfig.java b/src/main/java/io/cdap/plugin/google/sheets/source/GoogleSheetsSourceConfig.java
@@ -1261,10 +1261,10 @@ public static GoogleSheetsSourceConfig of(JsonObject properties) throws IOExcept
     }
 
     if (properties.has(GoogleSheetsSourceConfig.OAUTH_METHOD)) {
-      googleSheetsSourceConfig.setOauthMethod(
+      googleSheetsSourceConfig.setoAuthMethod(
         properties.get(GoogleSheetsSourceConfig.OAUTH_METHOD).getAsString());
     }
-    
+
     if (properties.has(GoogleSheetsSourceConfig.ACCESS_TOKEN)) {
       googleSheetsSourceConfig.setAccessToken(
         properties.get(GoogleSheetsSourceConfig.ACCESS_TOKEN).getAsString());

diff --git a/src/test/java/io/cdap/plugin/google/common/GoogleAuthBaseConfigTest.java b/src/test/java/io/cdap/plugin/google/common/GoogleAuthBaseConfigTest.java
@@ -90,7 +90,7 @@ public void testValidationOauthWithoutAccessToken() {
     GoogleDriveSourceConfig config = new GoogleDriveSourceConfig("ref");
     config.setReferenceName("validationErrorFilePath");
     config.setAuthType("oAuth2");
-    config.setOauthMethod(OAuthMethod.ACCESS_TOKEN.name());
+    config.setoAuthMethod(OAuthMethod.ACCESS_TOKEN.name());
     config.setModificationDateRange("today");
     config.getBodyFormat("string");
     config.setStartDate("today");
@@ -108,7 +108,7 @@ public void testValidationOauthWithoutRefreshToken() {
     GoogleDriveSourceConfig config = new GoogleDriveSourceConfig(null);
     config.setReferenceName("validationErrorFilePath");
     config.setAuthType("oAuth2");
-    config.setOauthMethod(OAuthMethod.REFRESH_TOKEN.name());
+    config.setoAuthMethod(OAuthMethod.REFRESH_TOKEN.name());
     config.setModificationDateRange("today");
     config.getBodyFormat("string");
     config.setStartDate("today");

diff --git a/widgets/GoogleDrive-batchsink.json b/widgets/GoogleDrive-batchsink.json
@@ -57,7 +57,7 @@
           }
         },
         {
-          "name": "oauthMethod",
+          "name": "oAuthMethod",
           "label": "OAuth Method",
           "widget-type": "radio-group",
           "widget-attributes": {
@@ -144,15 +144,15 @@
       },
       "show": [
         {
-          "name": "oauthMethod",
+          "name": "oAuthMethod",
           "type": "property"
         }
       ]
     },
     {
       "name": "Authenticate with OAuth2 Access Token",
       "condition": {
-        "expression": "oauthMethod == 'ACCESS_TOKEN' && authType == 'oAuth2'"
+        "expression": "oAuthMethod == 'ACCESS_TOKEN' && authType == 'oAuth2'"
       },
       "show": [
         {
@@ -164,7 +164,7 @@
     {
       "name": "Authenticate with OAuth2 Refresh Token",
       "condition": {
-        "expression": "oauthMethod == 'REFRESH_TOKEN' && authType == 'oAuth2'"
+        "expression": "oAuthMethod == null || (oAuthMethod != 'ACCESS_TOKEN' && authType == 'oAuth2')"
       },
       "show": [
         {

diff --git a/widgets/GoogleDrive-batchsource.json b/widgets/GoogleDrive-batchsource.json
@@ -312,7 +312,7 @@
           }
         },
         {
-          "name": "oauthMethod",
+          "name": "oAuthMethod",
           "label": "OAuth Method",
           "widget-type": "radio-group",
           "widget-attributes": {
@@ -517,15 +517,15 @@
       },
       "show": [
         {
-          "name": "oauthMethod",
+          "name": "oAuthMethod",
           "type": "property"
         }
       ]
     },
     {
       "name": "Authenticate with OAuth2 Access Token",
       "condition": {
-        "expression": "oauthMethod == 'ACCESS_TOKEN' && authType == 'oAuth2'"
+        "expression": "oAuthMethod == 'ACCESS_TOKEN' && authType == 'oAuth2'"
       },
       "show": [
         {
@@ -537,7 +537,7 @@
     {
       "name": "Authenticate with OAuth2 Refresh Token",
       "condition": {
-        "expression": "oauthMethod == 'REFRESH_TOKEN' && authType == 'oAuth2'"
+        "expression": "oAuthMethod == null || (oAuthMethod != 'ACCESS_TOKEN' && authType == 'oAuth2')"
       },
       "show": [
         {

diff --git a/widgets/GoogleSheets-batchsink.json b/widgets/GoogleSheets-batchsink.json
@@ -116,7 +116,7 @@
           "name": "serviceAccountJSON"
         },
         {
-          "name": "oauthMethod",
+          "name": "oAuthMethod",
           "label": "OAuth Method",
           "widget-type": "radio-group",
           "widget-attributes": {
@@ -267,15 +267,15 @@
       },
       "show": [
         {
-          "name": "oauthMethod",
+          "name": "oAuthMethod",
           "type": "property"
         }
       ]
     },
     {
       "name": "Authenticate with OAuth2 Access Token",
       "condition": {
-        "expression": "oauthMethod == 'ACCESS_TOKEN' && authType == 'oAuth2'"
+        "expression": "oAuthMethod == 'ACCESS_TOKEN' && authType == 'oAuth2'"
       },
       "show": [
         {
@@ -287,7 +287,7 @@
     {
       "name": "Authenticate with OAuth2 Refresh Token",
       "condition": {
-        "expression": "oauthMethod == 'REFRESH_TOKEN' && authType == 'oAuth2'"
+        "expression": "oAuthMethod == null || (oAuthMethod != 'ACCESS_TOKEN' && authType == 'oAuth2')"
       },
       "show": [
         {

diff --git a/widgets/GoogleSheets-batchsource.json b/widgets/GoogleSheets-batchsource.json
@@ -144,7 +144,7 @@
           "name": "serviceAccountJSON"
         },
         {
-          "name": "oauthMethod",
+          "name": "oAuthMethod",
           "label": "OAuth Method",
           "widget-type": "radio-group",
           "widget-attributes": {
@@ -434,15 +434,15 @@
       },
       "show": [
         {
-          "name": "oauthMethod",
+          "name": "oAuthMethod",
           "type": "property"
         }
       ]
     },
     {
       "name": "Authenticate with OAuth2 Access Token",
       "condition": {
-        "expression": "oauthMethod == 'ACCESS_TOKEN' && authType == 'oAuth2'"
+        "expression": "oAuthMethod == 'ACCESS_TOKEN' && authType == 'oAuth2'"
       },
       "show": [
         {
@@ -454,7 +454,7 @@
     {
       "name": "Authenticate with OAuth2 Refresh Token",
       "condition": {
-        "expression": "oauthMethod == 'REFRESH_TOKEN' && authType == 'oAuth2'"
+        "expression": "oAuthMethod == null || (oAuthMethod != 'ACCESS_TOKEN' && authType == 'oAuth2')"
       },
       "show": [
         {