Merge branch 'master' into DOC-181_adjust_clarification

stayseesong · web-flow · commit c4280ec0aa28 · 2021-05-26T16:03:25.000-07:00
diff --git a/src/_data/catalog/overrides-list.yml b/src/_data/catalog/overrides-list.yml
@@ -0,0 +1,3 @@
+items:
+  - hubspot
+  - iterable
diff --git a/src/_data/catalog/overrides.yml b/src/_data/catalog/overrides.yml
@@ -1,3 +1,5 @@
+# This file is manually generated. When you add or remove an item, add or remove
+# it from the `overrides-list.yml` too.
 items:
 - slug: hubspot
   components:
@@ -13,7 +15,7 @@ items:
       mobile: true
       server: true
     summary: >-
-      accepts data from any Segment mobile or server source in cloud mode. 
+      accepts data from any Segment mobile or server source in cloud mode.
       It does not accept data from a web source, and does not offer device-mode connections.
     cmode_type: mixed
     case: '6'
@@ -33,4 +35,4 @@ items:
     summary: >-
       accepts cloud-mode data from all Segment source types. It does not offer device-mode connections.
     cmode_type: mixed
-    case: '5'
+    case: '5'
diff --git a/src/_data/catalog/warehouse.yml b/src/_data/catalog/warehouse.yml
@@ -1,28 +1,27 @@
 # Manually generated
 items:
-- display_name: Redshift
-  slug: redshift
-  name: catalog/warehouses/redshift
-  description: ''
-  url: connections/storage/catalog/redshift
+- display_name: Amazon S3
+  slug: amazon-s3
+  name: catalog/warehouses/amazon-s3
+  description: >-
+    Our Amazon S3 copies our log files of your raw API calls from our S3 bucket
+    to yours, where you can then perform custom analysis on them.
+  url: connections/storage/catalog/amazon-s3
   status: PUBLIC
   logo:
-    url: 'https://d3hotuclm6if1r.cloudfront.net/logos/redshift-default.svg'
+    url: 'https://d3hotuclm6if1r.cloudfront.net/logos/amazon-s3-default.svg'
   mark:
-    url: ''
-  categories:
-    - Warehouses
-
-- display_name: Segment Data Lakes
-  slug: data-lakes
-  name: catalog/warehouse/data-lakes
+    url: 'https://cdn.filepicker.io/api/file/R1EKddJ1SnGECiHtdUlY'
+- display_name: Azure Synapse Analytics Warehouse
+  slug: azuresqldw
+  name: catalog/warehouses/azuresqldw
   description: ''
-  url: connections/storage/catalog/data-lakes
-  status: PUBLIC_BETA
+  url: connections/storage/catalog/azuresqldw
+  status: PUBLIC
   logo:
-    url: 'https://cdn.filepicker.io/api/file/YR7dKXAiQWyYvBiVOZNX'
+    url: 'https://cdn.filepicker.io/api/file/VKbuWjNjQPKOnOWijFe4'
   mark:
-    url: 'https://cdn.filepicker.io/api/file/zKQw43MuQjmTtXBXs4VL'
+    url: 'https://cdn.filepicker.io/api/file/EUJvt69Q7qMqCvGrVtiu'
   categories:
     - Warehouses
 - display_name: BigQuery
@@ -37,6 +36,30 @@ items:
     url: 'https://cdn.filepicker.io/api/file/Vk6iFlMvQeynbg30ZEtt'
   categories:
     - Warehouses
+- display_name: Google Cloud Storage
+  slug: google-cloud-storage
+  name: catalog/warehouses/google-cloud-storage
+  description: ''
+  url: connections/storage/catalog/google-cloud-storage
+  status: PUBLIC_BETA
+  logo:
+    url: 'https://cdn.filepicker.io/api/file/G6kRHZtSoaEslLkENhPC'
+  mark:
+    url: ''
+  categories:
+    - Warehouses
+- display_name: IBM Db2 Warehouse
+  slug: db2
+  name: catalog/warehouses/db2
+  description: ''
+  url: connections/storage/catalog/db2
+  status: PUBLIC
+  logo:
+    url: 'https://image.ibb.co/i4rS3K/IBM_Db2_logotype_pos_RGB.jpg'
+  mark:
+    url: ''
+  categories:
+    - Warehouses
 - display_name: Postgres
   slug: postgres
   name: catalog/warehouses/postgres
@@ -49,54 +72,42 @@ items:
     url: ''
   categories:
     - Warehouses
-- display_name: Snowflake
-  slug: snowflake
-  name: catalog/warehouses/snowflake
+- display_name: Redshift
+  slug: redshift
+  name: catalog/warehouses/redshift
   description: ''
-  url: connections/storage/catalog/snowflake
+  url: connections/storage/catalog/redshift
   status: PUBLIC
   logo:
-    url: 'https://cdn.filepicker.io/api/file/JrQWOYvMRRCVvSHp4HL0'
+    url: 'https://d3hotuclm6if1r.cloudfront.net/logos/redshift-default.svg'
   mark:
-    url: 'https://cdn.filepicker.io/api/file/OBhrGoCRKaSyvAhDX3fw'
+    url: ''
   categories:
     - Warehouses
-- display_name: IBM Db2 Warehouse
-  slug: db2
-  name: catalog/warehouses/db2
+- display_name: Segment Data Lakes
+  slug: data-lakes
+  name: catalog/warehouse/data-lakes
   description: ''
-  url: connections/storage/catalog/db2
-  status: PUBLIC
+  url: connections/storage/catalog/data-lakes
+  status: PUBLIC_BETA
   logo:
-    url: 'https://image.ibb.co/i4rS3K/IBM_Db2_logotype_pos_RGB.jpg'
+    url: 'https://cdn.filepicker.io/api/file/YR7dKXAiQWyYvBiVOZNX'
   mark:
-    url: ''
+    url: 'https://cdn.filepicker.io/api/file/zKQw43MuQjmTtXBXs4VL'
   categories:
     - Warehouses
-- display_name: Azure Synapse Analytics Warehouse
-  slug: azuresqldw
-  name: catalog/warehouses/azuresqldw
+- display_name: Snowflake
+  slug: snowflake
+  name: catalog/warehouses/snowflake
   description: ''
-  url: connections/storage/catalog/azuresqldw
+  url: connections/storage/catalog/snowflake
   status: PUBLIC
   logo:
-    url: 'https://cdn.filepicker.io/api/file/VKbuWjNjQPKOnOWijFe4'
+    url: 'https://cdn.filepicker.io/api/file/JrQWOYvMRRCVvSHp4HL0'
   mark:
-    url: 'https://cdn.filepicker.io/api/file/EUJvt69Q7qMqCvGrVtiu'
+    url: 'https://cdn.filepicker.io/api/file/OBhrGoCRKaSyvAhDX3fw'
   categories:
     - Warehouses
-- display_name: Amazon S3
-  slug: amazon-s3
-  name: catalog/warehouses/amazon-s3
-  description: >-
-    Our Amazon S3 copies our log files of your raw API calls from our S3 bucket
-    to yours, where you can then perform custom analysis on them.
-  url: connections/storage/catalog/amazon-s3
-  status: PUBLIC
-  logo:
-    url: 'https://d3hotuclm6if1r.cloudfront.net/logos/amazon-s3-default.svg'
-  mark:
-    url: 'https://cdn.filepicker.io/api/file/R1EKddJ1SnGECiHtdUlY'
 
   settings:
   - name: bucket
diff --git a/src/_layouts/default.html b/src/_layouts/default.html
@@ -46,14 +46,15 @@
   {%- endif -%}
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"/>
   <link rel="icon" href="https://segment.com/favicon.ico">
+  
   {%- if jekyll.environment == "production" -%}
     {%- assign hostname = "https://segment.com" -%}
   {%- elsif jekyll.environment == "staging" -%}
     {%- assign hostname = "https://segment.build" -%}
   {%- else -%}
     {%- assign hostname = "" -%}
   {%- endif -%}
-  <link rel="canonical" href="{{hostname}}/docs{{page.url}}" />
+  <link rel="canonical" href="{{site.url}}/docs{{page.url}}" />
   <meta name="application-name" content="Segment">
   <meta name="theme-color" content="#00386C">
   <meta charset="utf-8">
diff --git a/src/connections/destinations/category-compare.md b/src/connections/destinations/category-compare.md
@@ -3,6 +3,7 @@ title: Destination comparison by category
 ---
 
 This page collates information about each destination, organized by category for better comparison shopping.
+{% assign overridesList = site.data.catalog.overrides-list.items %}
 
 {% for category in site.data.catalog.destination_categories.items %}
 
@@ -27,12 +28,21 @@ This page collates information about each destination, organized by category for
 {% unless destination.connection_modes.cloud.web == false and destination.connection_modes.cloud.mobile == false and destination.connection_modes.cloud.server == false and destination.connection_modes.device.web == false and destination.connection_modes.device.mobile == false  %}
 <tr>
   <td>**[{{ destination.display_name }}](/docs/{{ destination.url }})**</td>
-  <td style="border-left: 1px solid gray;">{% if destination.connection_modes.cloud.web %}✅{% else %}⬜️{% endif %} </td>
+  {% if overridesList contains destination.slug %}{% assign thisDestname = destination.slug %}{% assign thisDest = site.data.catalog.overrides.items | where: "slug", thisDestname | first%}
+  <td style="border-left: 1px solid gray;">
+  {% if thisDest.connection_modes.cloud.web %}✅{% else %}⬜️{% endif %} </td>
+  <td>{% if thisDest.connection_modes.cloud.mobile %}✅{% else %}⬜️{% endif %} </td>
+  <td>{% if thisDest.connection_modes.cloud.server %}✅{% else %}⬜️{% endif %} </td>
+  <td style="border-left: 1px solid gray;">{% if thisDest.connection_modes.device.web %}✅{% else %}⬜️{% endif %} </td>
+  <td>{% if thisDest.connection_modes.device.mobile %}✅{% else %}⬜️{% endif %} </td>
+  {% else %}
+  <td style="border-left: 1px solid gray;">
+  {% if destination.connection_modes.cloud.web %}✅{% else %}⬜️{% endif %} </td>
   <td>{% if destination.connection_modes.cloud.mobile %}✅{% else %}⬜️{% endif %} </td>
   <td>{% if destination.connection_modes.cloud.server %}✅{% else %}⬜️{% endif %} </td>
   <td style="border-left: 1px solid gray;">{% if destination.connection_modes.device.web %}✅{% else %}⬜️{% endif %} </td>
   <td>{% if destination.connection_modes.device.mobile %}✅{% else %}⬜️{% endif %} </td>
-</tr>
+  {%endif%}</tr>
 {% endunless %}
 {% endif %}
 {% endfor %}
diff --git a/src/connections/destinations/cmodes-compare.md b/src/connections/destinations/cmodes-compare.md
@@ -7,6 +7,7 @@ title: Destinations Connection Modes comparison
 
 > success ""
 > Comparison shopping? Check out the [destination connection modes by category](/docs/connections/destinations/category-compare/).
+{% assign overridesList = site.data.catalog.overrides-list.items %}
 
 <table>
 <tr>
@@ -26,12 +27,23 @@ title: Destinations Connection Modes comparison
 {% unless destination.connection_modes.cloud.web == false and destination.connection_modes.cloud.mobile == false and destination.connection_modes.device.web == false and destination.connection_modes.device.mobile == false and destination.connection_modes.cloud.server == false %}
 <tr>
   <td>[{{ destination.display_name }}](/docs/{{ destination.url }}){% if destination.status == "PUBLIC_BETA" %}&nbsp;ℹ️{% endif %}</td>
-  <td style="border-left: 1px solid gray;">{% if destination.connection_modes.cloud.web %}✅{% else %}⬜️{% endif %} </td>
+  {% if overridesList contains destination.slug %}{% assign thisDestname = destination.slug %}{% assign thisDest = site.data.catalog.overrides.items | where: "slug", thisDestname | first%}
+  <td style="border-left: 1px solid gray;">
+  {% if thisDest.connection_modes.cloud.web %}✅{% else %}⬜️{% endif %} </td>
+  <td>{% if thisDest.connection_modes.cloud.mobile %}✅{% else %}⬜️{% endif %} </td>
+  <td>{% if thisDest.connection_modes.cloud.server %}✅{% else %}⬜️{% endif %} </td>
+  <td style="border-left: 1px solid gray;">{% if thisDest.connection_modes.device.web %}✅{% else %}⬜️{% endif %} </td>
+  <td>{% if thisDest.connection_modes.device.mobile %}✅{% else %}⬜️{% endif %} </td>
+  {% else %}
+  <td style="border-left: 1px solid gray;">
+  {% if destination.connection_modes.cloud.web %}✅{% else %}⬜️{% endif %} </td>
   <td>{% if destination.connection_modes.cloud.mobile %}✅{% else %}⬜️{% endif %} </td>
   <td>{% if destination.connection_modes.cloud.server %}✅{% else %}⬜️{% endif %} </td>
   <td style="border-left: 1px solid gray;">{% if destination.connection_modes.device.web %}✅{% else %}⬜️{% endif %} </td>
   <td>{% if destination.connection_modes.device.mobile %}✅{% else %}⬜️{% endif %} </td>
+{%endif%}
 </tr>
+
 {% endunless %}
 {% endfor %}
 </table>
diff --git a/src/connections/destinations/index.md b/src/connections/destinations/index.md
@@ -18,22 +18,23 @@ Segment has five types of sources: Web (Analytics.js), Mobile, Server, and Cloud
 
 ## Method Compatibility
 
-Not all destinations can accept data from specific method types. Wondering which ones are which? Check out the [Destinations Methods matrix](/docs/connections/destinations/methods-compare/).
+Not all destinations can accept data from specific method types. Wondering which ones are which? Look for the "Quick Info" box at the top of the destination's documentation page, or check out the [Destinations Methods matrix](/docs/connections/destinations/methods-compare/).
 
 ## Source Compatibility
 
-Many destinations can accept data from all types of sources, but some are only compatible with specific source types (for example, web only, or server only). To find out which source types a specific destination can accept data from, check the documentation for that destination for a "Supported Sources and Connection Modes" section.
+Many destinations can accept data from all types of sources, but some are only compatible with specific source types (for example, web only, or server only). To find out which source types a specific destination can accept data from, check the documentation for that destination for a "Quick info" box, or a "Supported Sources and Connection Modes" section.
 
 {% include components/reference-button.html href="/docs/connections/destinations/category-compare/" icon="guides.svg" title="Destinations Compatibility Matrix" description="Wondering which destinations take which data? Check out the Destination connection modes list by category." %}
 
+
 ## Connection Modes
 
 {% include content/connection-modes-intro.md %}
 
 
 ### When should I use Device-mode? When should I use Cloud-mode?
 
-There are two main things we consider when we decide to build Device- or Cloud-Modes (or both!) for a destination partner
+There are two main things we consider when Segment decides to use Device- or Cloud-Modes (or both!) for a destination partner
 
 #### 1. Anonymous Attribution Methodology
 
diff --git a/src/connections/sources/catalog/libraries/website/javascript/index.md b/src/connections/sources/catalog/libraries/website/javascript/index.md
@@ -698,3 +698,33 @@ Analytics.js uses `localstorage` cookies if you have retries enabled, to keep tr
 For more information, visit the [Segment localstorage-retry library](https://github.com/segmentio/localstorage-retry).
 
 You can set the `debug` cookie to `analytics.js` to log debug messages from Analytics.js to the console.
+
+## Open source libraries
+
+Analytics.js 2.0 includes the following open source components:
+
+**uuid v2.0.0** ([https://github.com/lukeed/uuid](https://github.com/lukeed/uuid))
+Copyright Luke Edwards <[luke.edwards05@gmail.com](mailto:luke.edwards05@gmail.com)> ([lukeed.com](https://lukeed.com/))
+License: MIT License, available here: [https://github.com/lukeed/uuid/blob/master/license](https://github.com/lukeed/uuid/blob/master/license)
+
+**component-url v0.2.1** ([https://github.com/component/url](https://github.com/component/url))
+Copyright (c) 2014 Component 
+License: MIT License, available here: [https://github.com/component/url/blob/master/Readme.md](https://github.com/component/url/blob/master/Readme.md)
+
+**dset v2.0.1** ([https://github.com/lukeed/dset](https://github.com/lukeed/dset))
+Copyright (c) Luke Edwards <[luke.edwards05@gmail.com](mailto:luke.edwards05@gmail.com)> ([lukeed.com](https://lukeed.com/))
+License: MIT License, available here: [https://github.com/lukeed/dset/blob/master/license](https://github.com/lukeed/dset/blob/master/license)
+
+**js-cookie v2.2.1**
+Copyright (c) 2018 Copyright 2018 Klaus Hartl, Fagner Brack, GitHub Contributors
+ 	License: MIT License, available here: [https://github.com/js-cookie/js-cookie/blob/master/LICENSE](https://github.com/js-cookie/js-cookie/blob/master/LICENSE)
+
+**md5 v2.3.0** ([https://github.com/pvorb/node-md5](https://github.com/pvorb/node-md5))
+Copyright (c) 2011-2012, Paul Vorbach.
+Copyright (c) 2009, Jeff Mott.
+License: BSD-3-Clause “New” or “Revised” License, available at: 
+[https://github.com/pvorb/node-md5/blob/master/LICENSE](https://github.com/pvorb/node-md5/blob/master/LICENSE)
+
+**unfetch v4.1.0** ([https://github.com/developit/unfetch](https://github.com/developit/unfetch))
+Copyright (c) 2017 Jason Miller
+License: MIT License, available at: [https://github.com/developit/unfetch/blob/master/LICENSE.md](https://github.com/developit/unfetch/blob/master/LICENSE.md)
diff --git a/src/connections/sources/catalog/libraries/website/javascript/upgrade-to-ajs2.md b/src/connections/sources/catalog/libraries/website/javascript/upgrade-to-ajs2.md
@@ -31,4 +31,19 @@ Analytics.js sources will upgrade to Analytics.js 2.0 on the date below, accordi
 
 ## Revert to Analytics.js Classic
 
-Once a source moves to Analytics.js 2.0, you can follow the steps above in [Manual migration](#manual-migration) back to  roll back to Analytics.js Classic.
+Once a source moves to Analytics.js 2.0, you can follow the steps above in [Manual migration](#manual-migration) back to  roll back to Analytics.js Classic.
+
+## Cases that require additional intervention
+
+There are two cases where upgrading to Analytics.js 2.0 requires manual effort beyond enabling the Analytics.js 2.0 toggle.
+
+### When using in-domain instrumentation CDN aliasing
+
+If the source you intend to upgrade uses the in-domain instrumentation as well as a custom "Alias for analytics.js", then you should update the AJS snippet to the latest version (4.13.2 or higher) before you toggle on Analytics.js 2.0. 
+
+### When using a strict content security policy on the page 
+
+Analytics.js 2.0 asynchronously loads different pieces of the library as needed. If the source you're upgrading uses a strict Content Security Policy (CSP) that allows Javascript to be downloaded from specific locations, then you need to update the CSP to account for all the pieces used for Analytics.js 2.0. Therefore, beyond allowing the main analytics.min.js script, you should allow the following paths in your CSP: 
+- `https://cdn.segment.com/v1/projects/<WRITE_KEY>/settings`
+- `https://cdn.segment.com/analytics-next/bundles/*` 
+- `https://cdn.segment.com/next-integrations/integrations/*`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+items:`
	`2`	`+ - hubspot`
	`3`	`+ - iterable`