From 2133cc41f15d4c2730b336f9a7ce4e0c70d119ac Mon Sep 17 00:00:00 2001 From: Danny Adams Date: Fri, 27 Jan 2023 10:23:00 -0500 Subject: [PATCH 1/4] Update to /graph/betasdk/kiota-lock.json Changes to JSON fields for compliance with parsing. --- src/internal/connector/graph/betasdk/kiota-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/internal/connector/graph/betasdk/kiota-lock.json b/src/internal/connector/graph/betasdk/kiota-lock.json index 1f2bc153a..441e18c55 100644 --- a/src/internal/connector/graph/betasdk/kiota-lock.json +++ b/src/internal/connector/graph/betasdk/kiota-lock.json @@ -30,7 +30,7 @@ "**/groups/**", "**/onenote/**" ], - "Necessary Sites Files": [ + "sitesFiles": [ "count_request_builder.go", "item_pages_count_request_builder.go", "item_pages_item_canvas_layout_horizontal_sections_count_request_builder.go", @@ -65,7 +65,7 @@ "item_sites_site_item_request_builder.go", "site_item_request_builder.go" ], - "Necessary Model Files":[ + "modelFiles":[ "base_item.go", "page_layout_type.go", "standard_web_partable.go", From 447ae1f3bb3a12e7baaf5209531e22f97f89a4bf Mon Sep 17 00:00:00 2001 From: Danny Adams Date: Fri, 27 Jan 2023 10:35:52 -0500 Subject: [PATCH 2/4] Updates to /graph/betasdk/kiota-lock.json Key/Value pair added for Beta version. --- src/internal/connector/graph/betasdk/kiota-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/internal/connector/graph/betasdk/kiota-lock.json b/src/internal/connector/graph/betasdk/kiota-lock.json index 441e18c55..21a111aef 100644 --- a/src/internal/connector/graph/betasdk/kiota-lock.json +++ b/src/internal/connector/graph/betasdk/kiota-lock.json @@ -4,6 +4,7 @@ "clientClassName": "BetaClient", "clientNamespaceName": "github.com/alcionai/corso/src/internal/connector/graph/betasdk", "language": "Go", + "betaVersion": "0.53.0", "usesBackingStore": false, "includeAdditionalData": true, "serializers": [ From 3228bfbe1e783f28688280d5256712bee9d09965 Mon Sep 17 00:00:00 2001 From: Danny Adams Date: Fri, 27 Jan 2023 10:37:42 -0500 Subject: [PATCH 3/4] Updates to /graph/betasdk/beta_client.go Comments updated for clarity on package setup. --- src/internal/connector/graph/betasdk/beta_client.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/internal/connector/graph/betasdk/beta_client.go b/src/internal/connector/graph/betasdk/beta_client.go index 7b0316b38..515e1de95 100644 --- a/src/internal/connector/graph/betasdk/beta_client.go +++ b/src/internal/connector/graph/betasdk/beta_client.go @@ -15,15 +15,17 @@ import ( // Details on how the Code was generated is present in `kioter-lock.json`. // NOTE: kiota gen file is altered to indicate what files are included in the created // -// Beta files use an adapter that allows for ASync() request. This feature is disabled in main. Generic Kiota adapters do not support. -// For the client, only calls that begin as client.SitesBy(siteID).Pages() have an endpoint. +// Changes to Sites Directory: +// Access files send requests with an adapter's with ASync() support. +// This feature is not enabled in v1.0. Manually changed in remaining files. +// Additionally, only calls that begin as client.SitesBy(siteID).Pages() have an endpoint. // // The use case specific to Pages(). All other requests should be routed to the /internal/connector/graph.Servicer -// -// Supported Pages models are located within the models subdirectory -// Supported Call source are located within the sites subdirectory // Specifics on `betaClient.SitesById(siteID).Pages` are located: sites/site_item_request_builder.go // +// Required model files are identified as `modelFiles` in kiota-lock.json. Directory -> betasdk/models +// Required access files are identified as `sitesFiles` in kiota-lock.json. Directory -> betasdk/sites +// // BetaClient minimal msgraph-beta-sdk-go for connecting to msgraph-beta-sdk-go // for retrieving `SharePoint.Pages`. Code is generated from kiota.dev. // requestAdapter is registered with the following the serializers: From 946767edcc6c89848e0cdbca6b7306d6937e9726 Mon Sep 17 00:00:00 2001 From: Danny Adams Date: Fri, 27 Jan 2023 10:50:46 -0500 Subject: [PATCH 4/4] Add file /graph/betasdk/beta_service.go --- .../connector/graph/betasdk/beta_service.go | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/internal/connector/graph/betasdk/beta_service.go diff --git a/src/internal/connector/graph/betasdk/beta_service.go b/src/internal/connector/graph/betasdk/beta_service.go new file mode 100644 index 000000000..aa65dc9c1 --- /dev/null +++ b/src/internal/connector/graph/betasdk/beta_service.go @@ -0,0 +1,20 @@ +package betasdk + +import ( + msgraphsdk "github.com/microsoftgraph/msgraph-sdk-go" +) + +// Service wraps BetaClient's functionality. +// Abstraction created to comply loosely with graph.Servicer +// methods for ease of switching between v1.0 and beta connnectors +type Service struct { + client *BetaClient +} + +func (s Service) Adapter() *msgraphsdk.GraphRequestAdapter { + return s.client.requestAdapter +} + +func (s Service) Client() *BetaClient { + return s.client +}