Merge branch 'main' into ipv6-dual-stack-sec-group-rules

packages/@aws-cdk/aws-glue-alpha/lib/connection.ts

@@ -28,6 +28,16 @@ export class ConnectionType {
    */
   public static readonly MONGODB = new ConnectionType('MONGODB');
 
+  /**
+   * Designates a connection used for view validation by Amazon Redshift.
+   */
+  public static readonly VIEW_VALIDATION_REDSHIFT = new ConnectionType('VIEW_VALIDATION_REDSHIFT');
+
+  /**
+   * Designates a connection used for view validation by Amazon Athena.
+   */
+  public static readonly VIEW_VALIDATION_ATHENA = new ConnectionType('VIEW_VALIDATION_ATHENA');
+
   /**
    * Designates a network connection to a data source within an Amazon Virtual Private Cloud environment (Amazon VPC).
    */
@@ -45,6 +55,106 @@ export class ConnectionType {
    */
   public static readonly CUSTOM = new ConnectionType('CUSTOM');
 
+  /**
+   * Designates a connection to Facebook Ads.
+   */
+  public static readonly FACEBOOKADS = new ConnectionType('FACEBOOKADS');
+
+  /**
+   * Designates a connection to Google Ads.
+   */
+  public static readonly GOOGLEADS = new ConnectionType('GOOGLEADS');
+
+  /**
+   * Designates a connection to Google Sheets.
+   */
+  public static readonly GOOGLESHEETS = new ConnectionType('GOOGLESHEETS');
+
+  /**
+   * Designates a connection to Google Analytics 4.
+   */
+  public static readonly GOOGLEANALYTICS4 = new ConnectionType('GOOGLEANALYTICS4');
+
+  /**
+   * Designates a connection to HubSpot.
+   */
+  public static readonly HUBSPOT = new ConnectionType('HUBSPOT');
+
+  /**
+   * Designates a connection to Instagram Ads.
+   */
+  public static readonly INSTAGRAMADS = new ConnectionType('INSTAGRAMADS');
+
+  /**
+   * Designates a connection to Intercom.
+   */
+  public static readonly INTERCOM = new ConnectionType('INTERCOM');
+
+  /**
+   * Designates a connection to Jira Cloud.
+   */
+  public static readonly JIRACLOUD = new ConnectionType('JIRACLOUD');
+
+  /**
+   * Designates a connection to Adobe Marketo Engage.
+   */
+  public static readonly MARKETO = new ConnectionType('MARKETO');
+
+  /**
+   * Designates a connection to Oracle NetSuite.
+   */
+  public static readonly NETSUITEERP = new ConnectionType('NETSUITEERP');
+
+  /**
+   * Designates a connection to Salesforce using OAuth authentication.
+   */
+  public static readonly SALESFORCE = new ConnectionType('SALESFORCE');
+
+  /**
+   * Designates a connection to Salesforce Marketing Cloud.
+   */
+  public static readonly SALESFORCEMARKETINGCLOUD = new ConnectionType('SALESFORCEMARKETINGCLOUD');
+
+  /**
+   * Designates a connection to Salesforce Marketing Cloud Account Engagement (MCAE).
+   */
+  public static readonly SALESFORCEPARDOT = new ConnectionType('SALESFORCEPARDOT');
+
+  /**
+   * Designates a connection to SAP OData.
+   */
+  public static readonly SAPODATA = new ConnectionType('SAPODATA');
+
+  /**
+   * Designates a connection to ServiceNow.
+   */
+  public static readonly SERVICENOW = new ConnectionType('SERVICENOW');
+
+  /**
+   * Designates a connection to Slack.
+   */
+  public static readonly SLACK = new ConnectionType('SLACK');
+
+  /**
+   * Designates a connection to Snapchat Ads.
+   */
+  public static readonly SNAPCHATADS = new ConnectionType('SNAPCHATADS');
+
+  /**
+   * Designates a connection to Stripe.
+   */
+  public static readonly STRIPE = new ConnectionType('STRIPE');
+
+  /**
+   * Designates a connection to Zendesk.
+   */
+  public static readonly ZENDESK = new ConnectionType('ZENDESK');
+
+  /**
+   * Designates a connection to Zoho CRM.
+   */
+  public static readonly ZOHOCRM = new ConnectionType('ZOHOCRM');
+
   /**
    * The name of this ConnectionType, as expected by Connection resource.
    */
@@ -169,7 +279,7 @@ export class Connection extends cdk.Resource implements IConnection {
     return new Import(scope, id);
   }
 
-  private static buildConnectionArn(scope: constructs.Construct, connectionName: string) : string {
+  private static buildConnectionArn(scope: constructs.Construct, connectionName: string): string {
     return cdk.Stack.of(scope).formatArn({
       service: 'glue',
       resource: 'connection',
@@ -187,7 +297,7 @@ export class Connection extends cdk.Resource implements IConnection {
    */
   public readonly connectionName: string;
 
-  private readonly properties: {[key: string]: string};
+  private readonly properties: { [key: string]: string };
 
   constructor(scope: constructs.Construct, id: string, props: ConnectionProps) {
     super(scope, id, {

tools/@aws-cdk/cdk-build-tools/bin/cdk-package.ts

@@ -24,6 +24,7 @@ async function main() {
     })
     .option('pre-only', { type: 'boolean', default: false, desc: 'run pre package steps only' })
     .option('post-only', { type: 'boolean', default: false, desc: 'run post package steps only' })
+    .option('private', { type: 'boolean', default: false, desc: 'Also package private packages for local usage' })
     .argv;
 
   if (args['pre-only'] && args['post-only']) {
@@ -43,8 +44,9 @@ async function main() {
   const outdir = 'dist';
 
   // if this is a private module, don't package
-  if (isPrivate()) {
-    process.stdout.write('No packaging for private modules.\n');
+  const packPrivate = args.private || options.private;
+  if (isPrivate() && !packPrivate) {
+    process.stdout.write('No packaging for private modules.\nUse --private to force packing private packages for local testing.\n');
     return;
   }
 

tools/@aws-cdk/cdk-build-tools/lib/package-info.ts

@@ -205,6 +205,12 @@ export interface CDKPackageOptions {
    * Should this package be bundled. (and if so, how)
    */
   bundle?: Omit<BundleProps, 'packageDir'>;
+
+  /**
+   * Also package private packages for local usage.
+   * @default false
+   */
+  private?: boolean;
 }
 
 /**