aws-sdk-managedgrafana 1.24.0 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18491fec8d6a25a55d22193ee3b29d49538435bafad3bc7c9722f602c6ecfc5f
-  data.tar.gz: b80376c582d27b5172def0f8b8661c6c823ded52a96030d8c825bb8b51aad517
+  metadata.gz: 27e0670ad390b6ad4c76705c80e754742e67847125b4f3d28ae57f20ad6b297a
+  data.tar.gz: b0c4a385890a5ed52423559f4f0ee6a94e246617ff6b5dc7dba80749780bd95d
 SHA512:
-  metadata.gz: '06945515aaae927bf39e014097e7d9029e7206b4d6234587f25d8aca6c67170e69615accafbbb83f21f6d6bde7452eb455a10c14d495ebb6f03b434b4d17604f'
-  data.tar.gz: c56be75ebd030b178fff582eb5257ea66a35c907ccc06dd0ba48e6f6ed22dcd1c2617494dd956bfac56b14f215aa51ab83d47a519c009d07f40723326ff68be0
+  metadata.gz: be3519801b3c062ac798a9fa81f752b80e7321723042b00487b764ef73cc9cc04ddbc028ec507e0c74a4456072202a6b5824cb71b4d2eff3b9bcfe944364304d
+  data.tar.gz: fa1028529dfebf88cec9f32d47a175d6baaec855d7798e605fd2fe03a75795cba22c5d346355d245529426c79d08f9a062d37ed2896c08dee37fcb67f2857c28

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 Unreleased Changes
 ------------------
 
+1.26.0 (2024-03-07)
+------------------
+
+* Feature - Adds support for the new GrafanaToken as part of the Amazon Managed Grafana Enterprise plugins upgrade to associate your AWS account with a Grafana Labs account.
+
+1.25.0 (2024-01-26)
+------------------
+
+* Feature - Code Generated Changes, see `./build_tools` or `aws-sdk-core`'s CHANGELOG.md for details.
+
 1.24.0 (2023-11-28)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.24.0
+1.26.0

data/lib/aws-sdk-managedgrafana/client.rb

@@ -396,9 +396,23 @@ module Aws::ManagedGrafana
     #
     # [1]: https://docs.aws.amazon.com/grafana/latest/userguide/upgrade-to-Grafana-Enterprise.html
     #
+    # @option params [String] :grafana_token
+    #   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][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/grafana/latest/userguide/upgrade-to-Grafana-Enterprise.html#AMG-workspace-register-enterprise
+    #
     # @option params [required, String] :license_type
     #   The type of license to associate with the workspace.
     #
+    #   <note markdown="1"> Amazon Managed Grafana workspaces no longer support Grafana Enterprise
+    #   free trials.
+    #
+    #    </note>
+    #
     # @option params [required, String] :workspace_id
     #   The ID of the workspace to associate the license with.
     #
@@ -409,6 +423,7 @@ module Aws::ManagedGrafana
     # @example Request syntax with placeholder values
     #
     #   resp = client.associate_license({
+    #     grafana_token: "GrafanaToken",
     #     license_type: "ENTERPRISE", # required, accepts ENTERPRISE, ENTERPRISE_FREE_TRIAL
     #     workspace_id: "WorkspaceId", # required
     #   })
@@ -426,6 +441,7 @@ module Aws::ManagedGrafana
     #   resp.workspace.endpoint #=> String
     #   resp.workspace.free_trial_consumed #=> Boolean
     #   resp.workspace.free_trial_expiration #=> Time
+    #   resp.workspace.grafana_token #=> String
     #   resp.workspace.grafana_version #=> String
     #   resp.workspace.id #=> String
     #   resp.workspace.license_expiration #=> Time
@@ -482,10 +498,10 @@ module Aws::ManagedGrafana
     #   `workspaceOrganizationalUnits` parameter.
     #
     # @option params [required, Array<String>] :authentication_providers
-    #   Specifies whether this workspace uses SAML 2.0, IAM Identity Center
-    #   (successor to Single Sign-On), or both to authenticate users for using
-    #   the Grafana console within a workspace. For more information, see
-    #   [User authentication in Amazon Managed Grafana][1].
+    #   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][1].
     #
     #
     #
@@ -512,9 +528,10 @@ module Aws::ManagedGrafana
     #   [1]: https://docs.aws.amazon.com/grafana/latest/userguide/AMG-configure-workspace.html
     #
     # @option params [String] :grafana_version
-    #   Specifies the version of Grafana to support in the new workspace.
+    #   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 version, use the `ListVersions` operation.
+    #   To get a list of supported versions, use the `ListVersions` operation.
     #
     # @option params [Types::NetworkAccessConfiguration] :network_access_control
     #   Configuration for network access to your workspace.
@@ -652,6 +669,7 @@ module Aws::ManagedGrafana
     #   resp.workspace.endpoint #=> String
     #   resp.workspace.free_trial_consumed #=> Boolean
     #   resp.workspace.free_trial_expiration #=> Time
+    #   resp.workspace.grafana_token #=> String
     #   resp.workspace.grafana_version #=> String
     #   resp.workspace.id #=> String
     #   resp.workspace.license_expiration #=> Time
@@ -770,6 +788,7 @@ module Aws::ManagedGrafana
     #   resp.workspace.endpoint #=> String
     #   resp.workspace.free_trial_consumed #=> Boolean
     #   resp.workspace.free_trial_expiration #=> Time
+    #   resp.workspace.grafana_token #=> String
     #   resp.workspace.grafana_version #=> String
     #   resp.workspace.id #=> String
     #   resp.workspace.license_expiration #=> Time
@@ -867,6 +886,7 @@ module Aws::ManagedGrafana
     #   resp.workspace.endpoint #=> String
     #   resp.workspace.free_trial_consumed #=> Boolean
     #   resp.workspace.free_trial_expiration #=> Time
+    #   resp.workspace.grafana_token #=> String
     #   resp.workspace.grafana_version #=> String
     #   resp.workspace.id #=> String
     #   resp.workspace.license_expiration #=> Time
@@ -1011,6 +1031,7 @@ module Aws::ManagedGrafana
     #   resp.workspace.endpoint #=> String
     #   resp.workspace.free_trial_consumed #=> Boolean
     #   resp.workspace.free_trial_expiration #=> Time
+    #   resp.workspace.grafana_token #=> String
     #   resp.workspace.grafana_version #=> String
     #   resp.workspace.id #=> String
     #   resp.workspace.license_expiration #=> Time
@@ -1227,8 +1248,10 @@ module Aws::ManagedGrafana
     #   resp.workspaces[0].created #=> Time
     #   resp.workspaces[0].description #=> String
     #   resp.workspaces[0].endpoint #=> String
+    #   resp.workspaces[0].grafana_token #=> String
     #   resp.workspaces[0].grafana_version #=> String
     #   resp.workspaces[0].id #=> String
+    #   resp.workspaces[0].license_type #=> String, one of "ENTERPRISE", "ENTERPRISE_FREE_TRIAL"
     #   resp.workspaces[0].modified #=> Time
     #   resp.workspaces[0].name #=> String
     #   resp.workspaces[0].notification_destinations #=> Array
@@ -1531,6 +1554,7 @@ module Aws::ManagedGrafana
     #   resp.workspace.endpoint #=> String
     #   resp.workspace.free_trial_consumed #=> Boolean
     #   resp.workspace.free_trial_expiration #=> Time
+    #   resp.workspace.grafana_token #=> String
     #   resp.workspace.grafana_version #=> String
     #   resp.workspace.id #=> String
     #   resp.workspace.license_expiration #=> Time
@@ -1578,10 +1602,10 @@ module Aws::ManagedGrafana
     #  </note>
     #
     # @option params [required, Array<String>] :authentication_providers
-    #   Specifies whether this workspace uses SAML 2.0, IAM Identity Center
-    #   (successor to Single Sign-On), or both to authenticate users for using
-    #   the Grafana console within a workspace. For more information, see
-    #   [User authentication in Amazon Managed Grafana][1].
+    #   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][1].
     #
     #
     #
@@ -1674,13 +1698,18 @@ module Aws::ManagedGrafana
     #   [1]: https://docs.aws.amazon.com/grafana/latest/userguide/AMG-configure-workspace.html
     #
     # @option params [String] :grafana_version
-    #   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.
+    #   workspace, see the [ListVersions][1] operation.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/grafana/latest/APIReference/API_ListVersions.html
     #
     # @option params [required, String] :workspace_id
     #   The ID of the workspace to update.
@@ -1717,7 +1746,7 @@ module Aws::ManagedGrafana
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-managedgrafana'
-      context[:gem_version] = '1.24.0'
+      context[:gem_version] = '1.26.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-managedgrafana/client_api.rb

@@ -52,6 +52,7 @@ module Aws::ManagedGrafana
     DisassociateLicenseRequest = Shapes::StructureShape.new(name: 'DisassociateLicenseRequest')
     DisassociateLicenseResponse = Shapes::StructureShape.new(name: 'DisassociateLicenseResponse')
     Endpoint = Shapes::StringShape.new(name: 'Endpoint')
+    GrafanaToken = Shapes::StringShape.new(name: 'GrafanaToken')
     GrafanaVersion = Shapes::StringShape.new(name: 'GrafanaVersion')
     GrafanaVersionList = Shapes::ListShape.new(name: 'GrafanaVersionList')
     IamRoleArn = Shapes::StringShape.new(name: 'IamRoleArn')
@@ -156,6 +157,7 @@ module Aws::ManagedGrafana
     AssertionAttributes.add_member(:role, Shapes::ShapeRef.new(shape: AssertionAttribute, location_name: "role"))
     AssertionAttributes.struct_class = Types::AssertionAttributes
 
+    AssociateLicenseRequest.add_member(:grafana_token, Shapes::ShapeRef.new(shape: GrafanaToken, location: "header", location_name: "Grafana-Token"))
     AssociateLicenseRequest.add_member(:license_type, Shapes::ShapeRef.new(shape: LicenseType, required: true, location: "uri", location_name: "licenseType"))
     AssociateLicenseRequest.add_member(:workspace_id, Shapes::ShapeRef.new(shape: WorkspaceId, required: true, location: "uri", location_name: "workspaceId"))
     AssociateLicenseRequest.struct_class = Types::AssociateLicenseRequest
@@ -465,6 +467,7 @@ module Aws::ManagedGrafana
     WorkspaceDescription.add_member(:endpoint, Shapes::ShapeRef.new(shape: Endpoint, required: true, location_name: "endpoint"))
     WorkspaceDescription.add_member(:free_trial_consumed, Shapes::ShapeRef.new(shape: Boolean, location_name: "freeTrialConsumed"))
     WorkspaceDescription.add_member(:free_trial_expiration, Shapes::ShapeRef.new(shape: Timestamp, location_name: "freeTrialExpiration"))
+    WorkspaceDescription.add_member(:grafana_token, Shapes::ShapeRef.new(shape: GrafanaToken, location_name: "grafanaToken"))
     WorkspaceDescription.add_member(:grafana_version, Shapes::ShapeRef.new(shape: GrafanaVersion, required: true, location_name: "grafanaVersion"))
     WorkspaceDescription.add_member(:id, Shapes::ShapeRef.new(shape: WorkspaceId, required: true, location_name: "id"))
     WorkspaceDescription.add_member(:license_expiration, Shapes::ShapeRef.new(shape: Timestamp, location_name: "licenseExpiration"))
@@ -489,8 +492,10 @@ module Aws::ManagedGrafana
     WorkspaceSummary.add_member(:created, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "created"))
     WorkspaceSummary.add_member(:description, Shapes::ShapeRef.new(shape: Description, location_name: "description"))
     WorkspaceSummary.add_member(:endpoint, Shapes::ShapeRef.new(shape: Endpoint, required: true, location_name: "endpoint"))
+    WorkspaceSummary.add_member(:grafana_token, Shapes::ShapeRef.new(shape: GrafanaToken, location_name: "grafanaToken"))
     WorkspaceSummary.add_member(:grafana_version, Shapes::ShapeRef.new(shape: GrafanaVersion, required: true, location_name: "grafanaVersion"))
     WorkspaceSummary.add_member(:id, Shapes::ShapeRef.new(shape: WorkspaceId, required: true, location_name: "id"))
+    WorkspaceSummary.add_member(:license_type, Shapes::ShapeRef.new(shape: LicenseType, location_name: "licenseType"))
     WorkspaceSummary.add_member(:modified, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "modified"))
     WorkspaceSummary.add_member(:name, Shapes::ShapeRef.new(shape: WorkspaceName, location_name: "name"))
     WorkspaceSummary.add_member(:notification_destinations, Shapes::ShapeRef.new(shape: NotificationDestinationsList, location_name: "notificationDestinations"))

data/lib/aws-sdk-managedgrafana/endpoint_provider.rb

@@ -32,7 +32,7 @@ module Aws::ManagedGrafana
             raise ArgumentError, "FIPS and DualStack are enabled, but this partition does not support one or both"
           end
           if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true)
-            if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS"))
+            if Aws::Endpoints::Matchers.boolean_equals?(Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS"), true)
               return Aws::Endpoints::Endpoint.new(url: "https://grafana-fips.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
             end
             raise ArgumentError, "FIPS is enabled but this partition does not support FIPS"

data/lib/aws-sdk-managedgrafana/plugins/endpoints.rb

@@ -14,6 +14,7 @@ module Aws::ManagedGrafana
       option(
         :endpoint_provider,
         doc_type: 'Aws::ManagedGrafana::EndpointProvider',
+        rbs_type: 'untyped',
         docstring: 'The endpoint provider used to resolve endpoints. Any '\
                    'object that responds to `#resolve_endpoint(parameters)` '\
                    'where `parameters` is a Struct similar to '\

data/lib/aws-sdk-managedgrafana/types.rb

@@ -70,8 +70,23 @@ module Aws::ManagedGrafana
       include Aws::Structure
     end
 
+    # @!attribute [rw] grafana_token
+    #   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][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/grafana/latest/userguide/upgrade-to-Grafana-Enterprise.html#AMG-workspace-register-enterprise
+    #   @return [String]
+    #
     # @!attribute [rw] license_type
     #   The type of license to associate with the workspace.
+    #
+    #   <note markdown="1"> Amazon Managed Grafana workspaces no longer support Grafana
+    #   Enterprise free trials.
+    #
+    #    </note>
     #   @return [String]
     #
     # @!attribute [rw] workspace_id
@@ -81,6 +96,7 @@ module Aws::ManagedGrafana
     # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/AssociateLicenseRequest AWS API Documentation
     #
     class AssociateLicenseRequest < Struct.new(
+      :grafana_token,
       :license_type,
       :workspace_id)
       SENSITIVE = []
@@ -257,10 +273,10 @@ module Aws::ManagedGrafana
     #   @return [String]
     #
     # @!attribute [rw] authentication_providers
-    #   Specifies whether this workspace uses SAML 2.0, IAM Identity Center
-    #   (successor to Single Sign-On), or both to authenticate users for
-    #   using the Grafana console within a workspace. For more information,
-    #   see [User authentication in Amazon Managed Grafana][1].
+    #   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][1].
     #
     #
     #
@@ -286,9 +302,10 @@ module Aws::ManagedGrafana
     #   @return [String]
     #
     # @!attribute [rw] grafana_version
-    #   Specifies the version of Grafana to support in the new workspace.
+    #   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 version, use the `ListVersions`
+    #   To get a list of supported versions, use the `ListVersions`
     #   operation.
     #   @return [String]
     #
@@ -1228,10 +1245,10 @@ module Aws::ManagedGrafana
     end
 
     # @!attribute [rw] authentication_providers
-    #   Specifies whether this workspace uses SAML 2.0, IAM Identity Center
-    #   (successor to Single Sign-On), or both to authenticate users for
-    #   using the Grafana console within a workspace. For more information,
-    #   see [User authentication in Amazon Managed Grafana][1].
+    #   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][1].
     #
     #
     #
@@ -1283,13 +1300,18 @@ module Aws::ManagedGrafana
     #   @return [String]
     #
     # @!attribute [rw] grafana_version
-    #   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.
+    #   workspace, see the [ListVersions][1] operation.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/grafana/latest/APIReference/API_ListVersions.html
     #   @return [String]
     #
     # @!attribute [rw] workspace_id
@@ -1611,13 +1633,32 @@ module Aws::ManagedGrafana
     # @!attribute [rw] free_trial_consumed
     #   Specifies whether this workspace has already fully used its free
     #   trial for Grafana Enterprise.
+    #
+    #   <note markdown="1"> Amazon Managed Grafana workspaces no longer support Grafana
+    #   Enterprise free trials.
+    #
+    #    </note>
     #   @return [Boolean]
     #
     # @!attribute [rw] free_trial_expiration
     #   If this workspace is currently in the free trial period for Grafana
     #   Enterprise, this value specifies when that free trial ends.
+    #
+    #   <note markdown="1"> Amazon Managed Grafana workspaces no longer support Grafana
+    #   Enterprise free trials.
+    #
+    #    </note>
     #   @return [Time]
     #
+    # @!attribute [rw] grafana_token
+    #   The token that ties this workspace to a Grafana Labs account. For
+    #   more information, see [Register with Grafana Labs][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/grafana/latest/userguide/upgrade-to-Grafana-Enterprise.html#AMG-workspace-register-enterprise
+    #   @return [String]
+    #
     # @!attribute [rw] grafana_version
     #   The version of Grafana supported in this workspace.
     #   @return [String]
@@ -1627,13 +1668,21 @@ module Aws::ManagedGrafana
     #   @return [String]
     #
     # @!attribute [rw] license_expiration
-    #   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.
     #   @return [Time]
     #
     # @!attribute [rw] license_type
     #   Specifies whether this workspace has a full Grafana Enterprise
-    #   license or a free trial license.
+    #   license.
+    #
+    #   <note markdown="1"> Amazon Managed Grafana workspaces no longer support Grafana
+    #   Enterprise free trials.
+    #
+    #    </note>
     #   @return [String]
     #
     # @!attribute [rw] modified
@@ -1729,6 +1778,7 @@ module Aws::ManagedGrafana
       :endpoint,
       :free_trial_consumed,
       :free_trial_expiration,
+      :grafana_token,
       :grafana_version,
       :id,
       :license_expiration,
@@ -1770,6 +1820,15 @@ module Aws::ManagedGrafana
     #   workspace.
     #   @return [String]
     #
+    # @!attribute [rw] grafana_token
+    #   The token that ties this workspace to a Grafana Labs account. For
+    #   more information, see [Register with Grafana Labs][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/grafana/latest/userguide/upgrade-to-Grafana-Enterprise.html#AMG-workspace-register-enterprise
+    #   @return [String]
+    #
     # @!attribute [rw] grafana_version
     #   The Grafana version that the workspace is running.
     #   @return [String]
@@ -1778,6 +1837,16 @@ module Aws::ManagedGrafana
     #   The unique ID of the workspace.
     #   @return [String]
     #
+    # @!attribute [rw] license_type
+    #   Specifies whether this workspace has a full Grafana Enterprise
+    #   license.
+    #
+    #   <note markdown="1"> Amazon Managed Grafana workspaces no longer support Grafana
+    #   Enterprise free trials.
+    #
+    #    </note>
+    #   @return [String]
+    #
     # @!attribute [rw] modified
     #   The most recent date that the workspace was modified.
     #   @return [Time]
@@ -1807,8 +1876,10 @@ module Aws::ManagedGrafana
       :created,
       :description,
       :endpoint,
+      :grafana_token,
       :grafana_version,
       :id,
+      :license_type,
       :modified,
       :name,
       :notification_destinations,

data/lib/aws-sdk-managedgrafana.rb

@@ -52,6 +52,6 @@ require_relative 'aws-sdk-managedgrafana/customizations'
 # @!group service
 module Aws::ManagedGrafana
 
-  GEM_VERSION = '1.24.0'
+  GEM_VERSION = '1.26.0'
 
 end