chore: correcting the ConnectorLabel + refac + tests

src/microsoftsharepointonline/profile.ts

@@ -5,6 +5,7 @@ SPDX-License-Identifier: Apache-2.0
 import { CfnConnectorProfile } from 'aws-cdk-lib/aws-appflow';
 import { Construct } from 'constructs';
 import { MicrosoftSharepointOnlineConnectorType } from './type';
+import { MicrosoftSharepointOnlineTokenUrlBuilder } from './util';
 import { ConnectorAuthenticationType } from '../core/connectors/connector-authentication-type';
 import { ConnectorProfileBase, ConnectorProfileProps } from '../core/connectors/connector-profile';
 import { OAuth2GrantType as OAuthGrantType } from '../core/connectors/oauth2-granttype';
@@ -38,7 +39,7 @@ export interface MicrosoftSharepointOnlineOAuthSettings {
 
   readonly flow?: MicrosoftSharepointOnlineOAuthFlow;
 
-  readonly endpoints: MicrosoftSharepointOnlineOAuthEndpointsSettings;
+  readonly endpoints?: MicrosoftSharepointOnlineOAuthEndpointsSettings;
 }
 
 export class MicrosoftSharepointOnlineConnectorProfile extends ConnectorProfileBase {
@@ -51,6 +52,8 @@ export class MicrosoftSharepointOnlineConnectorProfile extends ConnectorProfileB
     return this._fromConnectorProfileAttributes(scope, id, { name }) as MicrosoftSharepointOnlineConnectorProfile;
   }
 
+  private static readonly defaultTokenEndpoint = MicrosoftSharepointOnlineTokenUrlBuilder.build();
+
   constructor(scope: Construct, id: string, props: MicrosoftSharepointOnlineConnectorProfileProps) {
     super(scope, id, props, MicrosoftSharepointOnlineConnectorType.instance);
   }
@@ -66,7 +69,7 @@ export class MicrosoftSharepointOnlineConnectorProfile extends ConnectorProfileB
           oAuth2GrantType: OAuthGrantType.AUTHORIZATION_CODE,
           // INFO: even if we provide only the access token this property is required
           // TODO: think about if this is correct. token can be IResolvable
-          tokenUrl: properties.oAuth.endpoints?.token,
+          tokenUrl: properties.oAuth.endpoints?.token ?? MicrosoftSharepointOnlineConnectorProfile.defaultTokenEndpoint,
         },
       },
     };

src/microsoftsharepointonline/source.ts

@@ -2,6 +2,7 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
+import { Fn } from 'aws-cdk-lib';
 import { CfnFlow } from 'aws-cdk-lib/aws-appflow';
 import { IConstruct } from 'constructs';
 import { MicrosoftSharepointOnlineConnectorProfile } from './profile';
@@ -10,13 +11,18 @@ import { ConnectorType } from '../core/connectors/connector-type';
 import { IFlow } from '../core/flows';
 import { ISource } from '../core/vertices';
 
+export interface MicrosoftSharepointObject {
+  readonly site: string;
+  readonly drives: string[];
+}
+
 /**
  * Properties of a Google Analytics v4 Source
  */
 export interface MicrosoftSharepointOnlineSourceProps {
   readonly profile: MicrosoftSharepointOnlineConnectorProfile;
   readonly apiVersion: string;
-  readonly object: string;
+  readonly object: MicrosoftSharepointObject;
 }
 
 /**
@@ -44,9 +50,17 @@ export class MicrosoftSharepointOnlineSource implements ISource {
   }
 
   private buildSourceConnectorProperties(): CfnFlow.SourceConnectorPropertiesProperty {
+
+    if (this.props.object.drives.length < 1) {
+      throw new Error('At least one drive must be specified');
+    }
+
     return {
       customConnector: {
-        entityName: this.props.object,
+        entityName: this.props.object.site,
+        customProperties: {
+          subEntities: `["${Fn.join('","', this.props.object.drives)}"]`,
+        },
       },
     };
   }

src/microsoftsharepointonline/type.ts

@@ -19,6 +19,6 @@ export class MicrosoftSharepointOnlineConnectorType extends ConnectorType {
   private static actualInstance: ConnectorType;
 
   constructor() {
-    super('MS_SharePoint_Connector', true);
+    super('MicrosoftSharePointOnline', true);
   }
 }

src/microsoftsharepointonline/util.ts

@@ -3,8 +3,8 @@ Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 export class MicrosoftSharepointOnlineTokenUrlBuilder {
-  public static buildFromTenant(tenantId: string) {
-    return `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`;
+  public static build(tenantId?: string) {
+    return `https://login.microsoftonline.com/${tenantId ?? 'common'}/oauth2/v2.0/token`;
   }
 }
 

test/integ/ondemand-microsoftsharepointonline-to-s3.integ.snapshot/TestStack.assets.json

@@ -0,0 +1,32 @@
+{
+  "version": "32.0.0",
+  "files": {
+    "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89": {
+      "source": {
+        "path": "asset.350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89",
+        "packaging": "zip"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "350185a1069fa20a23a583e20c77f6844218bd73097902362dc94f1a108f5d89.zip",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    },
+    "6b57b7d92e5a078619ebade6f916f2f97a85517dd96d351c12af4d3b69ccaa6c": {
+      "source": {
+        "path": "TestStack.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "6b57b7d92e5a078619ebade6f916f2f97a85517dd96d351c12af4d3b69ccaa6c.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}