Skip to content

Commit 0d20292

Browse files
committed
Merge remote-tracking branch 'origin/main' into DOC-12504
2 parents 7afbceb + cb954c9 commit 0d20292

6 files changed

+6
-0
lines changed

Diff for: src/current/v23.1/take-and-restore-encrypted-backups.md

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ The AWS URI **requires** the following:
5858
`{key}` | The key identifiers used to reference the KMS key that should be used to encrypt or decrypt. For information about the supported formats, see the [AWS KMS docs](https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id).
5959
`AUTH=<auth_type>` | The user-specified credentials. If you use `AUTH=specified`, you must provide access keys in the URI parameters (e.g., `AWS_ACCESS_KEY_ID=<key_id>&AWS_SECRET_ACCESS_KEY=<secret_key>`). If you use `AUTH=implicit`, the access keys can be omitted and the [credentials will be loaded from the environment](https://docs.aws.amazon.com/sdk-for-go/api/aws/session/). For details on setting up and using the different authentication types, see [Authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %}).
6060
`REGION=<region>` | The region of the KMS key.
61+
(optional) `AWS_ENDPOINT` | A custom endpoint for Amazon S3. Use to define a particular region or a Virtual Private Cloud (VPC) endpoint. Use with `specified` or `implicit` [authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %}).
6162

6263
See AWS's [KMS keys](https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html) documentation for guidance on creating an AWS KMS key.
6364

Diff for: src/current/v23.2/take-and-restore-encrypted-backups.md

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ The AWS URI **requires** the following:
5858
`{key}` | The key identifiers used to reference the KMS key that should be used to encrypt or decrypt. For information about the supported formats, see the [AWS KMS docs](https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id).
5959
`AUTH=<auth_type>` | The user-specified credentials. If you use `AUTH=specified`, you must provide access keys in the URI parameters (e.g., `AWS_ACCESS_KEY_ID=<key_id>&AWS_SECRET_ACCESS_KEY=<secret_key>`). If you use `AUTH=implicit`, the access keys can be omitted and the [credentials will be loaded from the environment](https://docs.aws.amazon.com/sdk-for-go/api/aws/session/). For details on setting up and using the different authentication types, see [Authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %}).
6060
`REGION=<region>` | The region of the KMS key.
61+
(optional) `AWS_ENDPOINT` | A custom endpoint for Amazon S3. Use to define a particular region or a Virtual Private Cloud (VPC) endpoint. Use with `specified` or `implicit` [authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %}).
6162

6263
See AWS's [KMS keys](https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html) documentation for guidance on creating an AWS KMS key.
6364

Diff for: src/current/v24.1/take-and-restore-encrypted-backups.md

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ The AWS URI **requires** the following:
5858
`{key}` | The key identifiers used to reference the KMS key that should be used to encrypt or decrypt. For information about the supported formats, see the [AWS KMS docs](https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id).
5959
`AUTH=<auth_type>` | The user-specified credentials. If you use `AUTH=specified`, you must provide access keys in the URI parameters (e.g., `AWS_ACCESS_KEY_ID=<key_id>&AWS_SECRET_ACCESS_KEY=<secret_key>`). If you use `AUTH=implicit`, the access keys can be omitted and the [credentials will be loaded from the environment](https://docs.aws.amazon.com/sdk-for-go/api/aws/session/). For details on setting up and using the different authentication types, see [Authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %}).
6060
`REGION=<region>` | The region of the KMS key.
61+
(optional) `AWS_ENDPOINT` | A custom endpoint for Amazon S3. Use to define a particular region or a Virtual Private Cloud (VPC) endpoint. Use with `specified` or `implicit` [authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %}).
6162

6263
See AWS's [KMS keys](https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html) documentation for guidance on creating an AWS KMS key.
6364

Diff for: src/current/v24.2/take-and-restore-encrypted-backups.md

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ The AWS URI **requires** the following:
5858
`{key}` | The key identifiers used to reference the KMS key that should be used to encrypt or decrypt. For information about the supported formats, see the [AWS KMS docs](https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id).
5959
`AUTH=<auth_type>` | The user-specified credentials. If you use `AUTH=specified`, you must provide access keys in the URI parameters (e.g., `AWS_ACCESS_KEY_ID=<key_id>&AWS_SECRET_ACCESS_KEY=<secret_key>`). If you use `AUTH=implicit`, the access keys can be omitted and the [credentials will be loaded from the environment](https://docs.aws.amazon.com/sdk-for-go/api/aws/session/). For details on setting up and using the different authentication types, see [Authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %}).
6060
`REGION=<region>` | The region of the KMS key.
61+
(optional) `AWS_ENDPOINT` | A custom endpoint for Amazon S3. Use to define a particular region or a Virtual Private Cloud (VPC) endpoint. Use with `specified` or `implicit` [authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %}).
6162

6263
See AWS's [KMS keys](https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html) documentation for guidance on creating an AWS KMS key.
6364

Diff for: src/current/v24.3/take-and-restore-encrypted-backups.md

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ The AWS URI **requires** the following:
5858
`{key}` | The key identifiers used to reference the KMS key that should be used to encrypt or decrypt. For information about the supported formats, see the [AWS KMS docs](https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id).
5959
`AUTH=<auth_type>` | The user-specified credentials. If you use `AUTH=specified`, you must provide access keys in the URI parameters (e.g., `AWS_ACCESS_KEY_ID=<key_id>&AWS_SECRET_ACCESS_KEY=<secret_key>`). If you use `AUTH=implicit`, the access keys can be omitted and the [credentials will be loaded from the environment](https://docs.aws.amazon.com/sdk-for-go/api/aws/session/). For details on setting up and using the different authentication types, see [Authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %}).
6060
`REGION=<region>` | The region of the KMS key.
61+
(optional) `AWS_ENDPOINT` | A custom endpoint for Amazon S3. Use to define a particular region or a Virtual Private Cloud (VPC) endpoint. Use with `specified` or `implicit` [authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %}).
6162

6263
See AWS's [KMS keys](https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html) documentation for guidance on creating an AWS KMS key.
6364

Diff for: src/current/v25.1/take-and-restore-encrypted-backups.md

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ The AWS URI **requires** the following:
5858
`{key}` | The key identifiers used to reference the KMS key that should be used to encrypt or decrypt. For information about the supported formats, see the [AWS KMS docs](https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id).
5959
`AUTH=<auth_type>` | The user-specified credentials. If you use `AUTH=specified`, you must provide access keys in the URI parameters (e.g., `AWS_ACCESS_KEY_ID=<key_id>&AWS_SECRET_ACCESS_KEY=<secret_key>`). If you use `AUTH=implicit`, the access keys can be omitted and the [credentials will be loaded from the environment](https://docs.aws.amazon.com/sdk-for-go/api/aws/session/). For details on setting up and using the different authentication types, see [Authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %}).
6060
`REGION=<region>` | The region of the KMS key.
61+
(optional) `AWS_ENDPOINT` | A custom endpoint for Amazon S3. Use to define a particular region or a Virtual Private Cloud (VPC) endpoint. Use with `specified` or `implicit` [authentication]({% link {{ page.version.version }}/cloud-storage-authentication.md %}).
6162

6263
See AWS's [KMS keys](https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html) documentation for guidance on creating an AWS KMS key.
6364

0 commit comments

Comments
 (0)