Use client.config module for ConnectionConfig

ballerina-platform · Oct 11, 2022 · dbfac99 · dbfac99
1 parent ac7b88a
commit dbfac99
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 438 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
         steps:
             - uses: actions/checkout@v2
             - name: Ballerina Build
-              uses: ballerina-platform/ballerina-action/@master
+              uses: ballerina-platform/ballerina-action/@2201.2.1
               with:
                   args:
                       pack
@@ -24,7 +24,7 @@ jobs:
                   CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
                   WORKBOOK_PATH: ${{ secrets.WORKBOOK_PATH }}
             - name: Ballerina Push
-              uses: ballerina-platform/ballerina-action/@master
+              uses: ballerina-platform/ballerina-action/@2201.2.1
               with:
                   args:
                       push

diff --git a/excel/Ballerina.toml b/excel/Ballerina.toml
@@ -1,5 +1,5 @@
 [package]
-distribution = "2201.2.0"
+distribution = "2201.2.1"
 org= "ballerinax"
 name= "microsoft.excel"
 version= "2.3.0"

diff --git a/excel/Dependencies.toml b/excel/Dependencies.toml
@@ -45,9 +45,6 @@ dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "time"}
 ]
-modules = [
-	{org = "ballerina", packageName = "crypto", moduleName = "crypto"}
-]
 
 [[package]]
 org = "ballerina"
@@ -188,7 +185,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "log"
-version = "2.4.0"
+version = "2.4.1"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -287,16 +284,28 @@ dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
 
+[[package]]
+org = "ballerinax"
+name = "client.config"
+version = "1.0.1"
+dependencies = [
+	{org = "ballerina", name = "http"},
+	{org = "ballerina", name = "oauth2"}
+]
+modules = [
+	{org = "ballerinax", packageName = "client.config", moduleName = "client.config"}
+]
+
 [[package]]
 org = "ballerinax"
 name = "microsoft.excel"
 version = "2.3.0"
 dependencies = [
-	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "http"},
 	{org = "ballerina", name = "log"},
 	{org = "ballerina", name = "os"},
-	{org = "ballerina", name = "test"}
+	{org = "ballerina", name = "test"},
+	{org = "ballerinax", name = "client.config"}
 ]
 modules = [
 	{org = "ballerinax", packageName = "microsoft.excel", moduleName = "microsoft.excel"}

diff --git a/excel/Package.md b/excel/Package.md
@@ -8,7 +8,7 @@ This package provides the capability to perform CRUD operations in Microsoft Exc
 ### Compatibility
 |                     | Version            |
 |---------------------|--------------------|
-| Ballerina Language  | Swan Lake 2201.2.0 |
+| Ballerina Language  | Swan Lake 2201.2.1 |
 | Microsoft Graph API | v1.0               |
 
 ## Report issues

diff --git a/excel/client.bal b/excel/client.bal
@@ -15,6 +15,7 @@
 // under the License.
 
 import ballerina/http;
+import ballerinax/'client.config;
 
 # Ballerina Microsoft Excel connector provides the capability to access Microsoft Graph Excel API
 # It provides capability to perform perform CRUD (Create, Read, Update, and Delete) operations on 
@@ -33,23 +34,7 @@ public isolated client class Client {
     # + configuration - Configurations required to initialize the client
     # + return - An error on failure of initialization or else `()`
     public isolated function init(ConnectionConfig config) returns error? {
-        http:ClientConfiguration httpClientConfig = {
-            auth: let var authConfig = config.auth in (authConfig is BearerTokenConfig ?  authConfig : {...authConfig}),
-            httpVersion: config.httpVersion,
-            http1Settings: {...config.http1Settings},
-            http2Settings: config.http2Settings,
-            timeout: config.timeout,
-            forwarded: config.forwarded,
-            poolConfig: config.poolConfig,
-            cache: config.cache,
-            compression: config.compression,
-            circuitBreaker: config.circuitBreaker,
-            retryConfig: config.retryConfig,
-            responseLimits: config.responseLimits,
-            secureSocket: config.secureSocket,
-            proxy: config.proxy,
-            validation: config.validation
-        };
+        http:ClientConfiguration httpClientConfig = check config:constructHTTPClientConfig(config);
         self.excelClient = check new (BASE_URL, httpClientConfig);
     }