AWS cli documentation change
Summary
Updated AWS CLI version reference, reordered command parameters, modified field constraints and patterns, restructured workspace output documentation including moving authentication/licensing fields, and added KMS encryption key documentation.
Security assessment
The changes add documentation about KMS encryption keys ('kmsKeyId') which is a security feature for data encryption. However, there's no evidence of a security vulnerability being fixed - the modifications primarily reorganize content, update patterns (removed regex anchors), and add new documentation for security features without addressing specific vulnerabilities.
Diff
diff --git a/cli/latest/reference/grafana/associate-license.md b/cli/latest/reference/grafana/associate-license.md index ecee38d91..3016e18e3 100644 --- a//cli/latest/reference/grafana/associate-license.md +++ b//cli/latest/reference/grafana/associate-license.md @@ -15 +15 @@ - * [AWS CLI 2.33.22 Command Reference](../../index.html) » + * [AWS CLI 2.33.25 Command Reference](../../index.html) » @@ -67,2 +66,0 @@ See also: [AWS API Documentation](https://docs.aws.amazon.com/goto/WebAPI/grafan - [--grafana-token <value>] - --license-type <value> @@ -69,0 +68,2 @@ See also: [AWS API Documentation](https://docs.aws.amazon.com/goto/WebAPI/grafan + --license-type <value> + [--grafana-token <value>] @@ -94 +94 @@ See also: [AWS API Documentation](https://docs.aws.amazon.com/goto/WebAPI/grafan -`--grafana-token` (string) +`--workspace-id` (string) [required] @@ -96 +96 @@ See also: [AWS API Documentation](https://docs.aws.amazon.com/goto/WebAPI/grafan -> A token from Grafana Labs that ties your Amazon Web Services account with a Grafana Labs account. For more information, see [Link your account with Grafana Labs](https://docs.aws.amazon.com/grafana/latest/userguide/upgrade-to-Grafana-Enterprise.html#AMG-workspace-register-enterprise) . +> The ID of the workspace to associate the license with. @@ -100,2 +100 @@ See also: [AWS API Documentation](https://docs.aws.amazon.com/goto/WebAPI/grafan -> * min: `1` -> * max: `36` +> * pattern: `g-[0-9a-f]{10}` @@ -120 +119 @@ See also: [AWS API Documentation](https://docs.aws.amazon.com/goto/WebAPI/grafan -`--workspace-id` (string) [required] +`--grafana-token` (string) @@ -122 +121 @@ See also: [AWS API Documentation](https://docs.aws.amazon.com/goto/WebAPI/grafan -> The ID of the workspace to associate the license with. +> A token from Grafana Labs that ties your Amazon Web Services account with a Grafana Labs account. For more information, see [Link your account with Grafana Labs](https://docs.aws.amazon.com/grafana/latest/userguide/upgrade-to-Grafana-Enterprise.html#AMG-workspace-register-enterprise) . @@ -126 +125,2 @@ See also: [AWS API Documentation](https://docs.aws.amazon.com/goto/WebAPI/grafan -> * pattern: `^g-[0-9a-f]{10}$` +> * min: `1` +> * max: `36` @@ -243,28 +242,0 @@ workspace -> (structure) -> -> authentication -> (structure) [required] -> ->> A structure that describes whether the workspace uses SAML, IAM Identity Center, or both methods for user authentication. ->> ->> providers -> (list) [required] ->> ->>> Specifies whether the workspace uses SAML, IAM Identity Center, or both methods for user authentication. ->>> ->>> (string) ->>> ->>>> Possible values: ->>>> ->>>> * `AWS_SSO` ->>>> * `SAML` ->>>> - ->> ->> samlConfigurationStatus -> (string) ->> ->>> Specifies whether the workplace’s user authentication method is fully configured. ->>> ->>> Possible values: ->>> ->>> * `CONFIGURED` ->>> * `NOT_CONFIGURED` ->>> - @@ -319,27 +290,0 @@ workspace -> (structure) -> -> freeTrialConsumed -> (boolean) -> ->> Specifies whether this workspace has already fully used its free trial for Grafana Enterprise. ->> ->> ### Note ->> ->> Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials. -> -> freeTrialExpiration -> (timestamp) -> ->> If this workspace is currently in the free trial period for Grafana Enterprise, this value specifies when that free trial ends. ->> ->> ### Note ->> ->> Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials. -> -> grafanaToken -> (string) -> ->> The token that ties this workspace to a Grafana Labs account. For more information, see [Link your account with Grafana Labs](https://docs.aws.amazon.com/grafana/latest/userguide/upgrade-to-Grafana-Enterprise.html#AMG-workspace-register-enterprise) . ->> ->> Constraints: ->> ->> * min: `1` ->> * max: `36` ->> - @@ -364,20 +309 @@ workspace -> (structure) ->> * pattern: `^g-[0-9a-f]{10}$` ->> - -> -> licenseExpiration -> (timestamp) -> ->> If this workspace has a full Grafana Enterprise license purchased through Amazon Web Services Marketplace, this specifies when the license ends and will need to be renewed. Purchasing the Enterprise plugins option through Amazon Managed Grafana does not have an expiration. It is valid until the license is removed. -> -> licenseType -> (string) -> ->> Specifies whether this workspace has a full Grafana Enterprise license. ->> ->> ### Note ->> ->> Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials. ->> ->> Possible values: ->> ->> * `ENTERPRISE` ->> * `ENTERPRISE_FREE_TRIAL` +>> * pattern: `g-[0-9a-f]{10}` @@ -397 +323 @@ workspace -> (structure) ->> * pattern: `^[a-zA-Z0-9-._~]{1,255}$` +>> * pattern: `[a-zA-Z0-9-._~]{1,255}` @@ -401 +327 @@ workspace -> (structure) -> networkAccessControl -> (structure) +> organizationRoleName -> (string) @@ -403,3 +329 @@ workspace -> (structure) ->> The configuration settings for network access to your workspace. ->> ->> prefixListIds -> (list) [required] +>> The name of the IAM role that is used to access resources through Organizations. @@ -407,14 +331 @@ workspace -> (structure) ->>> An array of prefix list IDs. A prefix list is a list of CIDR ranges of IP addresses. The IP addresses specified are allowed to access your workspace. If the list is not included in the configuration (passed an empty array) then no IP addresses are allowed to access the workspace. You create a prefix list using the Amazon VPC console. ->>> ->>> Prefix list IDs have the format ``pl-_1a2b3c4d_ `` . ->>> ->>> For more information about prefix lists, see [Group CIDR blocks using managed prefix lists](https://docs.aws.amazon.com/vpc/latest/userguide/managed-prefix-lists.html) in the _Amazon Virtual Private Cloud User Guide_ . ->>> ->>> (string) ->>> ->>>> Constraints: ->>>> ->>>> * min: `1` ->>>> * max: `100` ->>>> - +>> Constraints: @@ -422 +333,2 @@ workspace -> (structure) ->> vpceIds -> (list) [required] +>> * min: `1` +>> * max: `2048` @@ -424,17 +335,0 @@ workspace -> (structure) ->>> An array of Amazon VPC endpoint IDs for the workspace. You can create VPC endpoints to your Amazon Managed Grafana workspace for access from within a VPC. If a `NetworkAccessConfiguration` is specified then only VPC endpoints specified here are allowed to access the workspace. If you pass in an empty array of strings, then no VPCs are allowed to access the workspace. ->>> ->>> VPC endpoint IDs have the format ``vpce-_1a2b3c4d_ `` . ->>> ->>> For more information about creating an interface VPC endpoint, see [Interface VPC endpoints](https://docs.aws.amazon.com/grafana/latest/userguide/VPC-endpoints) in the _Amazon Managed Grafana User Guide_ . ->>> ->>> ### Note ->>> ->>> The only VPC endpoints that can be specified here are interface VPC endpoints for Grafana workspaces (using the `com.amazonaws.[region].grafana-workspace` service endpoint). Other VPC endpoints are ignored. ->>> ->>> (string) ->>> ->>>> Constraints: ->>>> ->>>> * min: `1` ->>>> * max: `100` ->>>> @@ -454,11 +348,0 @@ workspace -> (structure) -> -> organizationRoleName -> (string) -> ->> The name of the IAM role that is used to access resources through Organizations. ->> ->> Constraints: ->> ->> * min: `1` ->> * max: `2048` ->> - @@ -513,0 +398,74 @@ workspace -> (structure) +> +> workspaceRoleArn -> (string) +> +>> The IAM role that grants permissions to the Amazon Web Services resources that the workspace will view data from. This role must already exist. +>> +>> Constraints: +>> +>> * min: `1` +>> * max: `2048` +>> + +> +> licenseType -> (string) +> +>> Specifies whether this workspace has a full Grafana Enterprise license. +>> +>> ### Note +>> +>> Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials. +>> +>> Possible values: +>> +>> * `ENTERPRISE` +>> * `ENTERPRISE_FREE_TRIAL` +>> +