From 00943f4ca3753f5ff478afd0c632b35ae2433d2b Mon Sep 17 00:00:00 2001
From: awstools The type of license to associate with the workspace. Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials. A token from Grafana Labs that ties your Amazon Web Services account with a Grafana
+ * Labs account. For more information, see Register with Grafana Labs. Specifies whether this workspace has a full Grafana Enterprise license or a free trial
- * license. Specifies whether this workspace has a full Grafana Enterprise license. Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials. Specifies whether this workspace has already fully used its free trial for Grafana
* Enterprise. Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials. If this workspace has a full Grafana Enterprise license, this specifies when the
- * license ends and will need to be renewed. 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. If this workspace is currently in the free trial period for Grafana Enterprise, this
* value specifies when that free trial ends. Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials. The configuration settings for network access to your workspace. The token that ties this workspace to a Grafana Labs account. For more information,
+ * see Register with Grafana Labs. Specifies whether this workspace uses SAML 2.0, IAM Identity Center (successor to Single Sign-On), or both to
+ * Specifies whether this workspace uses SAML 2.0, IAM Identity Center, or both to
* authenticate users for using the Grafana console within a workspace. For more
* information, see User authentication in
* Amazon Managed Grafana. Specifies the version of Grafana to support in the new workspace. Specifies the version of Grafana to support in the workspace. If not specified,
+ * keeps the current version of the workspace. Can only be used to upgrade (for example, from 8.4 to 9.4), not
* downgrade (for example, from 9.4 to 8.4). To know what versions are available to upgrade to for a specific workspace, see
- * the ListVersions
operation.
Specifies whether this workspace uses SAML 2.0, IAM Identity Center (successor to Single Sign-On), or both to + *
Specifies whether this workspace uses SAML 2.0, IAM Identity Center, or both to * authenticate users for using the Grafana console within a workspace. For more * information, see User authentication in * Amazon Managed Grafana.
@@ -1809,8 +1838,9 @@ export interface CreateWorkspaceRequest { /** * @public - *Specifies the version of Grafana to support in the new workspace.
- *To get a list of supported version, use the ListVersions
+ *
Specifies the version of Grafana to support in the new workspace. If not specified, + * defaults to the latest version (for example, 9.4).
+ *To get a list of supported versions, use the ListVersions
* operation.
The list of tags associated with the workspace.
*/ tags?: RecordSpecifies whether this workspace has a full Grafana Enterprise license.
+ *Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
+ *The token that ties this workspace to a Grafana Labs account. For more information, + * see Register with Grafana Labs.
+ */ + grafanaToken?: string; } /** diff --git a/clients/client-grafana/src/protocols/Aws_restJson1.ts b/clients/client-grafana/src/protocols/Aws_restJson1.ts index 5418f209a4a6..bff31e2e56ff 100644 --- a/clients/client-grafana/src/protocols/Aws_restJson1.ts +++ b/clients/client-grafana/src/protocols/Aws_restJson1.ts @@ -102,7 +102,9 @@ export const se_AssociateLicenseCommand = async ( context: __SerdeContext ): Promise<__HttpRequest> => { const b = rb(input, context); - const headers: any = {}; + const headers: any = map({}, isSerializableHeaderValue, { + [_gt]: input[_gT]!, + }); b.bp("/workspaces/{workspaceId}/licenses/{licenseType}"); b.p("workspaceId", () => input.workspaceId!, "{workspaceId}", false); b.p("licenseType", () => input.licenseType!, "{licenseType}", false); @@ -1202,6 +1204,7 @@ const de_WorkspaceDescription = (output: any, context: __SerdeContext): Workspac endpoint: __expectString, freeTrialConsumed: __expectBoolean, freeTrialExpiration: (_: any) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))), + grafanaToken: __expectString, grafanaVersion: __expectString, id: __expectString, licenseExpiration: (_: any) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))), @@ -1242,8 +1245,10 @@ const de_WorkspaceSummary = (output: any, context: __SerdeContext): WorkspaceSum created: (_: any) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))), description: __expectString, endpoint: __expectString, + grafanaToken: __expectString, grafanaVersion: __expectString, id: __expectString, + licenseType: __expectString, modified: (_: any) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))), name: __expectString, notificationDestinations: _json, @@ -1272,6 +1277,8 @@ const isSerializableHeaderValue = (value: any): boolean => (!Object.getOwnPropertyNames(value).includes("size") || value.size != 0); const _gI = "groupId"; +const _gT = "grafanaToken"; +const _gt = "grafana-token"; const _mR = "maxResults"; const _nT = "nextToken"; const _rAS = "retryAfterSeconds"; diff --git a/codegen/sdk-codegen/aws-models/grafana.json b/codegen/sdk-codegen/aws-models/grafana.json index 8b76c2437e5b..e5779beb6846 100644 --- a/codegen/sdk-codegen/aws-models/grafana.json +++ b/codegen/sdk-codegen/aws-models/grafana.json @@ -1003,10 +1003,17 @@ "licenseType": { "target": "com.amazonaws.grafana#LicenseType", "traits": { - "smithy.api#documentation": "The type of license to associate with the workspace.
", + "smithy.api#documentation": "The type of license to associate with the workspace.
\nAmazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
\nA token from Grafana Labs that ties your Amazon Web Services account with a Grafana \n Labs account. For more information, see Register with Grafana Labs.
", + "smithy.api#httpHeader": "Grafana-Token" + } } } }, @@ -1402,7 +1409,7 @@ "authenticationProviders": { "target": "com.amazonaws.grafana#AuthenticationProviders", "traits": { - "smithy.api#documentation": "Specifies whether this workspace uses SAML 2.0, IAM Identity Center (successor to Single Sign-On), or both to\n authenticate users for using the Grafana console within a workspace. For more\n information, see User authentication in\n Amazon Managed Grafana.
", + "smithy.api#documentation": "Specifies whether this workspace uses SAML 2.0, IAM Identity Center, or both to\n authenticate users for using the Grafana console within a workspace. For more\n information, see User authentication in\n Amazon Managed Grafana.
", "smithy.api#required": {} } }, @@ -1433,7 +1440,7 @@ "grafanaVersion": { "target": "com.amazonaws.grafana#GrafanaVersion", "traits": { - "smithy.api#documentation": "Specifies the version of Grafana to support in the new workspace.
\nTo get a list of supported version, use the ListVersions
\n operation.
Specifies the version of Grafana to support in the new workspace. If not specified, \n defaults to the latest version (for example, 9.4).
\nTo get a list of supported versions, use the ListVersions
\n operation.
Specifies whether this workspace uses SAML 2.0, IAM Identity Center (successor to Single Sign-On), or both to\n authenticate users for using the Grafana console within a workspace. For more\n information, see User authentication in\n Amazon Managed Grafana.
", + "smithy.api#documentation": "Specifies whether this workspace uses SAML 2.0, IAM Identity Center, or both to\n authenticate users for using the Grafana console within a workspace. For more\n information, see User authentication in\n Amazon Managed Grafana.
", "smithy.api#required": {} } }, @@ -3342,7 +3358,7 @@ "grafanaVersion": { "target": "com.amazonaws.grafana#GrafanaVersion", "traits": { - "smithy.api#documentation": "Specifies the version of Grafana to support in the new workspace.
\nCan only be used to upgrade (for example, from 8.4 to 9.4), not\n downgrade (for example, from 9.4 to 8.4).
\nTo know what versions are available to upgrade to for a specific workspace, see \n the ListVersions
operation.
Specifies the version of Grafana to support in the workspace. If not specified, \n keeps the current version of the workspace.
\nCan only be used to upgrade (for example, from 8.4 to 9.4), not\n downgrade (for example, from 9.4 to 8.4).
\nTo know what versions are available to upgrade to for a specific workspace, see \n the ListVersions operation.
" } } } @@ -3761,25 +3777,25 @@ "licenseType": { "target": "com.amazonaws.grafana#LicenseType", "traits": { - "smithy.api#documentation": "Specifies whether this workspace has a full Grafana Enterprise license or a free trial\n license.
" + "smithy.api#documentation": "Specifies whether this workspace has a full Grafana Enterprise license.
\nAmazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
\nSpecifies whether this workspace has already fully used its free trial for Grafana\n Enterprise.
" + "smithy.api#documentation": "Specifies whether this workspace has already fully used its free trial for Grafana\n Enterprise.
\nAmazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
\nIf this workspace has a full Grafana Enterprise license, this specifies when the\n license ends and will need to be renewed.
" + "smithy.api#documentation": "If this workspace has a full Grafana Enterprise license purchased through \n Amazon Web Services Marketplace, this specifies when the\n license ends and will need to be renewed. Purchasing the Enterprise plugins option \n through Amazon Managed Grafana does not have an expiration. It is valid until the \n license is removed.
" } }, "freeTrialExpiration": { "target": "smithy.api#Timestamp", "traits": { - "smithy.api#documentation": "If this workspace is currently in the free trial period for Grafana Enterprise, this\n value specifies when that free trial ends.
" + "smithy.api#documentation": "If this workspace is currently in the free trial period for Grafana Enterprise, this\n value specifies when that free trial ends.
\nAmazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
\nThe configuration settings for network access to your workspace.
" } + }, + "grafanaToken": { + "target": "com.amazonaws.grafana#GrafanaToken", + "traits": { + "smithy.api#documentation": "The token that ties this workspace to a Grafana Labs account. For more information, \n see Register with Grafana Labs.
" + } } }, "traits": { @@ -3978,6 +4000,18 @@ "traits": { "smithy.api#documentation": "The list of tags associated with the workspace.
" } + }, + "licenseType": { + "target": "com.amazonaws.grafana#LicenseType", + "traits": { + "smithy.api#documentation": "Specifies whether this workspace has a full Grafana Enterprise license.
\nAmazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
\nThe token that ties this workspace to a Grafana Labs account. For more information, \n see Register with Grafana Labs.
" + } } }, "traits": {