Merge branch 'master' into graphql-custom-filters

Author: keharper

src/_data/toc/contributor-guide.yml

@@ -14,6 +14,10 @@ pages:
           url: /contributor-guide/backward-compatible-development/
           versionless: true
 
+        - label: Pull Request Tests
+          url: /contributor-guide/pull-request-tests.html
+          versionless: true
+
     - label: Docs Contributions
       children:
         - label: Contribution Guidelines

src/_data/toc/software-update-guide.yml

@@ -21,6 +21,28 @@ pages:
         - label: Update and upgrade checklist
           url: /comp-mgr/prereq/prereq_compman-checklist.html
 
+    - label: Safe Upgrade Tool
+      url: /safe-upgrade-tool/introduction.html
+      versionless: true
+      edition: ee-only
+      children:
+
+        - label: Prerequisites
+          url: /safe-upgrade-tool/prerequisites.html
+          versionless: true
+
+        - label: Install
+          url: /safe-upgrade-tool/install.html
+          versionless: true
+
+        - label: Run the tool
+          url: /safe-upgrade-tool/run.html
+          versionless: true
+
+        - label: Developer information
+          url: /safe-upgrade-tool/developer.html
+          versionless: true
+
     - label: Magento Marketplace example
       url: /comp-mgr/marketplace/marketplace.html
       include_versions: ["2.3"]

src/_data/var.yml

@@ -31,7 +31,7 @@ mcp-package: magento/magento-cloud-patches
 mcp-release: 1.0.8
 mcd-package: magento/magento-cloud-docker
 mcd-prod: Magento Cloud Docker
-mcd-release: 1.2.0
+mcd-release: 1.2.1
 mcc-prod: Magento Cloud Components
 mcc-package: magento/magento-cloud-components
 mcc-release: 1.0.7

src/_data/whats-new.yml

@@ -4,8 +4,47 @@ description: This page contains recent changes that we think you'd like to know
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: "/whats-new.html"
 thread: "/whatsnew-feed.xml"
-updated: Wed Dec 16 16:19:47 2020
+updated: Mon Jan 18 15:45:43 2021
 entries:
+- description: SendGrid DKIM signatures are available only on Magento Commerce Cloud
+    Pro projects.  For more information on SendGrid, see https://devdocs.magento.com/cloud/project/sendgrid.html.
+  versions: 2.4.x
+  type: Major Update
+  date: January 14, 2021
+  link: https://github.com/magento/devdocs/pull/8440
+  contributor: bdenham
+  profile: https://github.com/bdenham
+- description: New Relic Alerts now include Redis and MariaDB. See https://devdocs.magento.com/cloud/project/new-relic.html#monitor-performance-with-managed-alerts.
+  versions: 2.4.x
+  type: Major Update
+  date: January 12, 2021
+  link: https://github.com/magento/devdocs/pull/8503
+  contributor: bdenham
+  profile: https://github.com/bdenham
+- description: Added a [legal disclaimer](https://devdocs.magento.com/compliance/privacy/pi-data-reference-m2.html#customer-data)
+    to references of the `date_of_birth` attribute of the `customer` database entity.
+  versions: 2.3.x, 2.4.x
+  type: Major Update
+  date: January 8, 2021
+  link: https://github.com/magento/devdocs/pull/8488
+  contributor: jeff-matthews
+  profile: https://github.com/jeff-matthews
+- description: Published release notes for [Cloud Docker 1.2.1](https://devdocs.magento.com/cloud/release-notes/mcd-release-notes.html#v121).
+  versions: 2.4.x
+  type: Major Update
+  date: December 22, 2020
+  link: https://github.com/magento/devdocs/pull/8429
+  contributor: bdenham
+  profile: https://github.com/bdenham
+- description: Added a new topic with instructions for [reverting from a split database
+    to a single database](https://devdocs.magento.com/guides/v2.4/config-guide/revert-split-database.html)
+    implementation.
+  versions: 2.3.x, 2.4.x
+  type: New Topic
+  date: December 21, 2020
+  link: https://github.com/magento/devdocs/pull/8422
+  contributor: jeff-matthews
+  profile: https://github.com/jeff-matthews
 - description: Added an [example](https://devdocs.magento.com/guides/v2.4/javascript-dev-guide/javascript/requirejs.html)
     of overwriting a Knockout JS .html template file in the `requirejs-config.js`
     file.
@@ -1620,7 +1659,7 @@ entries:
   type: Technical
   date: April 9, 2020
   link: https://github.com/magento/devdocs/pull/7016
-- description: Fixed a config entry in the the [Custom import entity](https://devdocs.magento.com/guides/v2.3/ext-best-practices/tutorials/custom-import-entity.html)
+- description: Fixed a config entry in the [Custom import entity](https://devdocs.magento.com/guides/v2.3/ext-best-practices/tutorials/custom-import-entity.html)
     topic.
   versions: 2.3.x
   type: Technical

src/_includes/cloud/enable-ssh.md

@@ -38,34 +38,23 @@ If the directory does not exist or has no SSH key files, you must generate at le
 
 If you have at least one SSH key in your directory, add the key to your Magento and GitHub accounts:
 
--  [Add an SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/)
+-  [Add an SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/) and [test the SSH connection](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/testing-your-ssh-connection).
 -  [Add your public SSH key to your Magento account](#ssh-add-to-account)
 
-### Test the SSH keys {#test}
-
-After adding the SSH keys, test the SSH connection to GitHub:
-
-1. In the terminal, enter the following command:
-
-   ```bash
-   ssh -T [email protected]
-   ```
-
-1. You may see a warning that the authenticity of the host can't be established followed by an RSA fingerprint. Enter `yes` to continue.
-
-1. If successful, you should receive a success message. If you receive a permission denied error, see [Error: Permission denied (publickey)](https://help.github.com/articles/error-permission-denied-publickey) troubleshooting on GitHub.
-
 ## Add a public SSH key to your Magento account {#ssh-add-to-account}
 
 You can add SSH keys to your account in any of the following ways:
 
 -  Using the [{{site.data.var.ece}} CLI](#add-key-cli)
 -  Using the [{{site.data.var.ece}} Web Interface](#add-key-web)
+-  Using the [{{site.data.var.ece}} Cloud account Dashboard](#add-key-cloud)
+
+After you add a key, you must [redeploy active Cloud environments](#update-cloud-environments-with-a-new-ssh-key) to upload the key.
 
 ### Add your SSH key using the CLI {#add-key-cli}
 
 {:.procedure}
-To add an SSH key using the CLI:
+To add an SSH key using the [Magento Cloud CLI]({{site.baseurl}}/cloud/reference/cli-ref-topic.html):
 
 1. Open a terminal application on your local workstation.
 
@@ -118,8 +107,23 @@ To add an SSH key using the Project Web interface:
 
    -  Follow the prompts on your screen to complete the task.
 
-{:.bs-callout-tip}
-You can view and manage the SSH keys on your account in _Account settings_. In the upper right corner of the Project Web interface, click **your-user-name** > **Account Settings**.
+### Add a key from the Cloud Account dashboard {#add-key-cloud}
+
+You can add your SSH public key directly from the Cloud _Account Settings_ page.
+
+1. Open your [Cloud account page](https://accounts.magento.cloud) and log in if required.
+1. On the Cloud account dashboard, click the **Account Settings** tab.
+1. Under _SSH keys_, click **Add a public key**.
+
+## Update Cloud environments with a new SSH key
+
+After you add an SSH key, redeploy each active Cloud environment to upload the new key.
+
+Use the [Magento Cloud CLI]({{site.baseurl}}/cloud/reference/cli-ref-topic.html) to redeploy the environment:
+
+```bash
+magento-cloud redeploy --project <project-name> --host <host-name> --environment <environment-name>
+```
 
 ## Set global Git variables
 

src/_includes/cloud/error-codes.md

@@ -48,7 +48,7 @@ Critical errors indicate a problem with the {{ site.data.var.ece }} project conf
 | 106 |  | Unable to read the `.schema.yaml` file |  |
 | 107 | pre-deploy: clean-redis-cache | Failed to clean the Redis cache | Failed to clean the Redis cache. Check that the Redis cache configuration is correct and that the Redis service is available. See [Setup Redis service](https://devdocs.magento.com/cloud/project/services-redis.html). |
 | 108 | pre-deploy: set-production-mode | Command `/bin/magento maintenance:enable` failed | Check the `cloud.log` for more information. For more detailed command output, add the `VERBOSE_COMMANDS: '-vvv'` option to the `.magento.env.yaml` file. |
-| 109 | validate-config | Incorrect database configuration | Check that the the `DATABASE_CONFIGURATION` environment variable is configured correctly. |
+| 109 | validate-config | Incorrect database configuration | Check that the `DATABASE_CONFIGURATION` environment variable is configured correctly. |
 | 110 | validate-config | Incorrect session configuration | Check that the `SESSION_CONFIGURATION` environment variable is configured correctly. The configuration must contain at least the `save` parameter. |
 | 111 | validate-config | Incorrect search configuration | Check that the `SEARCH_CONFIGURATION` environment variable is configured correctly. The configuration must contain at least the `engine` parameter. |
 | 112 | validate-config | Incorrect resource configuration | Check that the `RESOURCE_CONFIGURATION` environment variable is configured correctly. The configuration must contain at least `connection` parameter. |

src/_includes/graphql/create-customer.md

@@ -1,6 +1,6 @@
 Attribute |  Data Type | Description
 --- | --- | ---
-`date_of_birth` | String | The customer’s date of birth
+`date_of_birth` | String | The customer’s date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
 `dob` | String | Deprecated. Use `date_of_birth` instead. The customer’s date of birth
 `email` | String | The customer’s email address. Required to create a customer
 `firstname` | String | The customer’s first name. Required to create a customer

src/_includes/graphql/customer-input-24.md

@@ -2,7 +2,7 @@ Attribute |  Data Type | Description
 --- | --- | ---
 `addresses` | [CustomerAddress](#customerAddressInput) | An array containing the customer's shipping and billing addresses
 `created_at` | String | Timestamp indicating when the account was created
-`date_of_birth` | String | The customer's date of birth
+`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
 `default_billing` | String | The ID assigned to the billing address
 `default_shipping` | String | The ID assigned to the shipping address
 `dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth

src/_includes/graphql/customer-input.md

@@ -2,7 +2,7 @@ Attribute |  Data Type | Description
 --- | --- | ---
 `addresses` | [CustomerAddress](#customerAddressInput) | An array containing the customer's shipping and billing addresses
 `created_at` | String | Timestamp indicating when the account was created
-`date_of_birth` | String | The customer's date of birth
+`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
 `default_billing` | String | The ID assigned to the billing address
 `default_shipping` | String | The ID assigned to the shipping address
 `dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth

src/_includes/graphql/customer-output-24.md

@@ -18,7 +18,7 @@ Attribute |  Data Type | Description
 --- | --- | ---
 `addresses` | {{ customeraddress_text }}  | An array containing the customer's shipping and billing addresses
 `created_at` | String | Timestamp indicating when the account was created
-`date_of_birth` | String | The customer's date of birth
+`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
 `default_billing` | String | The ID assigned to the billing address
 `default_shipping` | String | The ID assigned to the shipping address
 `dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth

src/_includes/graphql/customer-output.md

@@ -2,7 +2,7 @@ Attribute |  Data Type | Description
 --- | --- | ---
 `addresses` | [CustomerAddress](#customerAddressOutput)  | An array containing the customer's shipping and billing addresses
 `created_at` | String | Timestamp indicating when the account was created
-`date_of_birth` | String | The customer's date of birth
+`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
 `default_billing` | String | The ID assigned to the billing address
 `default_shipping` | String | The ID assigned to the shipping address
 `dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth

src/_includes/install/sampledata/sample-data-clone-24.md

@@ -87,6 +87,12 @@ To clone the Magento sample data GitHub repository using the SSH protocol:
 
 1. See [Set file system permissions and ownership](#samp-data-perms).
 
+1. Run the following command:
+
+   ```bash
+   bin/magento setup:upgrade
+   ```
+
 ### Clone with HTTPS {#instgde-prereq-compose-clone-https}
 
 To clone the Magento sample data GitHub repository using the HTTPS protocol:

src/_includes/install/sampledata/sample-data-clone.md

@@ -87,6 +87,12 @@ To clone the Magento sample data GitHub repository using the SSH protocol:
 
 1. See [Set file system permissions and ownership](#samp-data-perms).
 
+1. Run the following command:
+
+   ```bash
+   bin/magento setup:upgrade
+   ```
+
 ### Clone with HTTPS {#instgde-prereq-compose-clone-https}
 
 To clone the Magento sample data GitHub repository using the HTTPS protocol:

src/_includes/install/sampledata/sample-data_list-of-modules.md

@@ -21,7 +21,6 @@
 *  magento/module-theme-sample-data
 *  magento/module-widget-sample-data
 *  magento/module-wishlist-sample-data
-*  magento/sample-data
 *  magento/sample-data-media
 
 {{site.data.var.ee}} only:

src/_includes/layout/page-header.html

@@ -42,4 +42,10 @@ <h2 class="page-subtitle no_toc">{{ page.subtitle }}</h2>
   </div>
   {% endif %}
 
+  {% if page.url contains "safe-upgrade-tool/" %}
+  <div class="message-banner">
+    This tool is an ALPHA version with limited scope, available for all Magento Commerce merchants, and only validating PHP Magento APIs and GraphQL schema. If you are a Magento Commerce user you can download it at the <a href="https://repo.magento.com/">Magento repo</a>.
+  </div>
+  {% endif %}
+
 </section>

src/_videos/fundamentals/add-new-product-attribute.md

@@ -87,7 +87,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
 
 {% endcollapsible %}
 
-## Step 2 Create an InstallData script
+## Step 2 Create an InstallData script {#CreateProductAttributeByUpgradeScript}
 
 Next, we need to create the InstallData script.
 Because adding an attribute technically adds records into several tables, such as `eav_attribute` and `catalog_eav_attribute,` this is data manipulation, not a schema change.
@@ -196,7 +196,7 @@ For now, we’ll just quickly go through most important ones:
 *  **visible_on_front:** A flag that defines whether an attribute should be shown on the “More Information” tab on the frontend
 *  **is_html_allowed_on_front:** Defines whether an attribute value may contain HTML
 
-## Step 3: Add a source model
+## Step 3: Add a source model {#AddSourceModel}
 
 Next, we need to create the source model:
 
@@ -337,3 +337,54 @@ backend model has executed successfully, so now we’ll set it to Wool and save
 
 Having saved the product, we’ll now move to the frontend.
 It should be visible and in bold text.
+
+## Product Attribute Option Creation
+
+A product attribute of type multiselect or select will present selectable options to the user. These options may be added manually through the admin panel or by upgrade script. The script process is slightly different depending on whether the options are being added at the moment of attribute creation or whether the options are being added at a later time to an existing attribute.
+
+### Add options to a new prouduct attribute {#AddOptionsAlongNewProductAttribute}
+
+Basic instructions for creating a product attribute by setup or upgrade script can be found [above](#CreateProductAttributeByUpgradeScript). Before scripting the attribute creation, pick one of these two use cases for your options:
+
+1. You want a set of options which cannot be modified by a user through the admin panel and which can only be changed through a future code push.
+1. You want a set of options which can be modified, added or deleted through the admin panel.
+
+For use case `1` (an 'immutable' set of options), follow the above instructions ["Add a source model"](#AddSourceModel). You will create a model that contains and dynamically returns the attribute's selectable options to the client.
+
+For use case `2` (a 'mutable' set of options), see ["EAV and extension attributes"]({{ site.baseurl }}/guides/v2.4/extension-dev-guide/attributes.html). Make sure to declare 'Magento\Eav\Model\Entity\Attribute\Source\Table' as the value for the 'source' attribute option. This ensures that Magento will store options in the appropriate database table.
+
+With `\Magento\Eav\Setup\EavSetup.php::addAttribute()` and `\Magento\Eav\Setup\EavSetup.php::addAttributeOptions()` you can add a series of options with the following array:
+
+```php
+'option' => ['values' => ['Option 1', 'Option 2', 'Option 3', etc.]];
+```
+
+Alternatively, you may designate a specific option sorting order as follows:
+
+```php
+'option' => ['values' => [8 => 'Option 1', 3 => 'Option 2', 11 => 'Option 3', etc.]]
+```
+
+### Add options to an existing product attribute
+
+*  To add options to an 'immutable' set of options, modify the custom source model with the additional options you wish to provide.
+
+*  Adding options to a 'mutable' set of options leverages the same `EavSetup` object as you use when creating an attribute with options, but requires an additional step because `EavSetup` needs to know to which attribute you want to assign new options.
+
+1. Assign an array of new options to a variable:
+
+```php
+   $options = ['attribute_id' => null, 'values' => 'Option 1', 'Option 2', etc]];
+```
+
+1. Update your array with the attribute ID from the database:
+
+```php
+   $options['attribute_id'] = $eavSetup->getAttributeId($eavSetup->getEntityTypeId('catalog_product'), 'your_attribute_code');
+```
+
+1. Add your options:
+
+```php
+   $eavSetup->addAttributeOption($options);
+```

src/cloud/docker/docker-containers-service.md

@@ -163,10 +163,10 @@ The default Magento Cloud Docker configuration includes the MailHog service as a
 By default, MailHog listens on port 1025 for SMTP and port 8025 for the frontend dashboard and API (HTTP). You can change the default ports using the `--mailhog-http-port` and `--mailhog-smtp-port` options. When you build the Docker compose configuration, you can change the default ports:
 
 ```bash
-./vendor/bin/ece-docker build:compose --mailhog-smtp-port=1026 --mailhog-http-port=8026
+./vendor/bin/ece-docker build:compose --mailhog-smtp-port=1025 --mailhog-http-port=8025
 ```
 
-After updating the configuration and restarting the Docker environment, you can connect to the MailHog service from `http://magento2.docker:8026`, and use port 1026 for SMTP communication.
+After updating the configuration and restarting the Docker environment, you can connect to the MailHog service from `http://magento2.docker:8025`, and use port 1025 for SMTP communication.
 
 If needed, you can disable the MailHog service when you generate the Docker compose configuration: