aws-sdk-managedgrafana 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e6faa833fdae54115a86217f205476e8eac425e0887e2400c575786d3d3a2c7
-  data.tar.gz: f72bd3280f9a2fb2bbd7c1818ec691c1315a1f31030bb28a3cd11928f26dccbd
+  metadata.gz: '065564804bad82939e60d25841d8dcb7681583b88fbe9c0d172f7a2697fb87f4'
+  data.tar.gz: 67e119b56e6ac05a0dad82ad9f57e8f9e533a47d756a06a783a34d39545e5505
 SHA512:
-  metadata.gz: fe3517249ef78a41056c86cd95dc135db2306e604efb9bb71f915ff7b088d821566fd3bd0087f4fc9a6b576536ea25ed29d847dd6bafe15bbe8e4334ccf52edc
-  data.tar.gz: 66d30c7ef247870e5e40acc6c496c0c3abee1a8bf7803c5486018062136d2d8b9ae7d34750cab46ec3a1c81f639bde8f734b693ad6cb8ecf94dbf2c657b8bca8
+  metadata.gz: 56675e343f4bf925f519e8d517c73b497148830701ff0f9bf4fdad5f046375f2295fef2040213d60f0cfa4e164d4c317e00d03fd47efb32fe5e9b940ac0e421c
+  data.tar.gz: 562b9c7c2d174d7062fccfc71363666c94e3e100cf31d7abeebd926ac3c2a9b0eec3af8cc83bc047ad3970b248be5b4dade547610a58593bd76d58aaf6c8783f

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.7.0 (2022-03-31)
+------------------
+
+* Feature - This release adds tagging support to the Managed Grafana service. New APIs: TagResource, UntagResource and ListTagsForResource. Updates: add optional field tags to support tagging while calling CreateWorkspace.
+
 1.6.0 (2022-02-24)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.7.0

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

@@ -384,7 +384,7 @@ module Aws::ManagedGrafana
     #   resp.workspace.authentication.saml_configuration_status #=> String, one of "CONFIGURED", "NOT_CONFIGURED"
     #   resp.workspace.created #=> Time
     #   resp.workspace.data_sources #=> Array
-    #   resp.workspace.data_sources[0] #=> String, one of "AMAZON_OPENSEARCH_SERVICE", "CLOUDWATCH", "PROMETHEUS", "XRAY", "TIMESTREAM", "SITEWISE"
+    #   resp.workspace.data_sources[0] #=> String, one of "AMAZON_OPENSEARCH_SERVICE", "CLOUDWATCH", "PROMETHEUS", "XRAY", "TIMESTREAM", "SITEWISE", "ATHENA", "REDSHIFT"
     #   resp.workspace.description #=> String
     #   resp.workspace.endpoint #=> String
     #   resp.workspace.free_trial_consumed #=> Boolean
@@ -403,6 +403,8 @@ module Aws::ManagedGrafana
     #   resp.workspace.permission_type #=> String, one of "CUSTOMER_MANAGED", "SERVICE_MANAGED"
     #   resp.workspace.stack_set_name #=> String
     #   resp.workspace.status #=> String, one of "ACTIVE", "CREATING", "DELETING", "FAILED", "UPDATING", "UPGRADING", "DELETION_FAILED", "CREATION_FAILED", "UPDATE_FAILED", "UPGRADE_FAILED", "LICENSE_REMOVAL_FAILED"
+    #   resp.workspace.tags #=> Hash
+    #   resp.workspace.tags["TagKey"] #=> String
     #   resp.workspace.workspace_role_arn #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/AssociateLicense AWS API Documentation
@@ -457,10 +459,11 @@ module Aws::ManagedGrafana
     #   in other accounts in an organization.
     #
     # @option params [required, String] :permission_type
-    #   If you specify `Service Managed`, Amazon Managed Grafana automatically
-    #   creates the IAM roles and provisions the permissions that the
-    #   workspace needs to use Amazon Web Services data sources and
-    #   notification channels.
+    #   If you specify `SERVICE_MANAGED` on AWS Grafana console, Amazon
+    #   Managed Grafana automatically creates the IAM roles and provisions the
+    #   permissions that the workspace needs to use Amazon Web Services data
+    #   sources and notification channels. In CLI mode, the permissionType
+    #   `SERVICE_MANAGED` will not create the IAM role for you.
     #
     #   If you specify `CUSTOMER_MANAGED`, you will manage those roles and
     #   permissions yourself. If you are creating this workspace in a member
@@ -471,7 +474,7 @@ module Aws::ManagedGrafana
     #
     #   For more information, see [Amazon Managed Grafana permissions and
     #   policies for Amazon Web Services data sources and notification
-    #   channels][1]
+    #   channels][1].
     #
     #
     #
@@ -481,6 +484,9 @@ module Aws::ManagedGrafana
     #   The name of the CloudFormation stack set to use to generate IAM roles
     #   to be used for this workspace.
     #
+    # @option params [Hash<String,String>] :tags
+    #   The list of tags associated with the workspace.
+    #
     # @option params [Array<String>] :workspace_data_sources
     #   Specify the Amazon Web Services data sources that you want to be
     #   queried in this workspace. Specifying these data sources here enables
@@ -496,6 +502,8 @@ module Aws::ManagedGrafana
     #   A description for the workspace. This is used only to help you
     #   identify this workspace.
     #
+    #   Pattern: `^[\\p\{L\}\\p\{Z\}\\p\{N\}\\p\{P\}]\{0,2048\}$`
+    #
     # @option params [String] :workspace_name
     #   The name for the workspace. It does not have to be unique.
     #
@@ -513,10 +521,8 @@ module Aws::ManagedGrafana
     # @option params [String] :workspace_role_arn
     #   The workspace needs an IAM role that grants permissions to the Amazon
     #   Web Services resources that the workspace will view data from. If you
-    #   already have a role that you want to use, specify it here. If you omit
-    #   this field and you specify some Amazon Web Services resources in
-    #   `workspaceDataSources` or `workspaceNotificationDestinations`, a new
-    #   IAM role with the necessary permissions is automatically created.
+    #   already have a role that you want to use, specify it here. The
+    #   permission type should be set to `CUSTOMER_MANAGED`.
     #
     # @return [Types::CreateWorkspaceResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -531,7 +537,10 @@ module Aws::ManagedGrafana
     #     organization_role_name: "OrganizationRoleName",
     #     permission_type: "CUSTOMER_MANAGED", # required, accepts CUSTOMER_MANAGED, SERVICE_MANAGED
     #     stack_set_name: "StackSetName",
-    #     workspace_data_sources: ["AMAZON_OPENSEARCH_SERVICE"], # accepts AMAZON_OPENSEARCH_SERVICE, CLOUDWATCH, PROMETHEUS, XRAY, TIMESTREAM, SITEWISE
+    #     tags: {
+    #       "TagKey" => "TagValue",
+    #     },
+    #     workspace_data_sources: ["AMAZON_OPENSEARCH_SERVICE"], # accepts AMAZON_OPENSEARCH_SERVICE, CLOUDWATCH, PROMETHEUS, XRAY, TIMESTREAM, SITEWISE, ATHENA, REDSHIFT
     #     workspace_description: "Description",
     #     workspace_name: "WorkspaceName",
     #     workspace_notification_destinations: ["SNS"], # accepts SNS
@@ -547,7 +556,7 @@ module Aws::ManagedGrafana
     #   resp.workspace.authentication.saml_configuration_status #=> String, one of "CONFIGURED", "NOT_CONFIGURED"
     #   resp.workspace.created #=> Time
     #   resp.workspace.data_sources #=> Array
-    #   resp.workspace.data_sources[0] #=> String, one of "AMAZON_OPENSEARCH_SERVICE", "CLOUDWATCH", "PROMETHEUS", "XRAY", "TIMESTREAM", "SITEWISE"
+    #   resp.workspace.data_sources[0] #=> String, one of "AMAZON_OPENSEARCH_SERVICE", "CLOUDWATCH", "PROMETHEUS", "XRAY", "TIMESTREAM", "SITEWISE", "ATHENA", "REDSHIFT"
     #   resp.workspace.description #=> String
     #   resp.workspace.endpoint #=> String
     #   resp.workspace.free_trial_consumed #=> Boolean
@@ -566,6 +575,8 @@ module Aws::ManagedGrafana
     #   resp.workspace.permission_type #=> String, one of "CUSTOMER_MANAGED", "SERVICE_MANAGED"
     #   resp.workspace.stack_set_name #=> String
     #   resp.workspace.status #=> String, one of "ACTIVE", "CREATING", "DELETING", "FAILED", "UPDATING", "UPGRADING", "DELETION_FAILED", "CREATION_FAILED", "UPDATE_FAILED", "UPGRADE_FAILED", "LICENSE_REMOVAL_FAILED"
+    #   resp.workspace.tags #=> Hash
+    #   resp.workspace.tags["TagKey"] #=> String
     #   resp.workspace.workspace_role_arn #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/CreateWorkspace AWS API Documentation
@@ -600,7 +611,7 @@ module Aws::ManagedGrafana
     #   resp.workspace.authentication.saml_configuration_status #=> String, one of "CONFIGURED", "NOT_CONFIGURED"
     #   resp.workspace.created #=> Time
     #   resp.workspace.data_sources #=> Array
-    #   resp.workspace.data_sources[0] #=> String, one of "AMAZON_OPENSEARCH_SERVICE", "CLOUDWATCH", "PROMETHEUS", "XRAY", "TIMESTREAM", "SITEWISE"
+    #   resp.workspace.data_sources[0] #=> String, one of "AMAZON_OPENSEARCH_SERVICE", "CLOUDWATCH", "PROMETHEUS", "XRAY", "TIMESTREAM", "SITEWISE", "ATHENA", "REDSHIFT"
     #   resp.workspace.description #=> String
     #   resp.workspace.endpoint #=> String
     #   resp.workspace.free_trial_consumed #=> Boolean
@@ -619,6 +630,8 @@ module Aws::ManagedGrafana
     #   resp.workspace.permission_type #=> String, one of "CUSTOMER_MANAGED", "SERVICE_MANAGED"
     #   resp.workspace.stack_set_name #=> String
     #   resp.workspace.status #=> String, one of "ACTIVE", "CREATING", "DELETING", "FAILED", "UPDATING", "UPGRADING", "DELETION_FAILED", "CREATION_FAILED", "UPDATE_FAILED", "UPGRADE_FAILED", "LICENSE_REMOVAL_FAILED"
+    #   resp.workspace.tags #=> Hash
+    #   resp.workspace.tags["TagKey"] #=> String
     #   resp.workspace.workspace_role_arn #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/DeleteWorkspace AWS API Documentation
@@ -653,7 +666,7 @@ module Aws::ManagedGrafana
     #   resp.workspace.authentication.saml_configuration_status #=> String, one of "CONFIGURED", "NOT_CONFIGURED"
     #   resp.workspace.created #=> Time
     #   resp.workspace.data_sources #=> Array
-    #   resp.workspace.data_sources[0] #=> String, one of "AMAZON_OPENSEARCH_SERVICE", "CLOUDWATCH", "PROMETHEUS", "XRAY", "TIMESTREAM", "SITEWISE"
+    #   resp.workspace.data_sources[0] #=> String, one of "AMAZON_OPENSEARCH_SERVICE", "CLOUDWATCH", "PROMETHEUS", "XRAY", "TIMESTREAM", "SITEWISE", "ATHENA", "REDSHIFT"
     #   resp.workspace.description #=> String
     #   resp.workspace.endpoint #=> String
     #   resp.workspace.free_trial_consumed #=> Boolean
@@ -672,6 +685,8 @@ module Aws::ManagedGrafana
     #   resp.workspace.permission_type #=> String, one of "CUSTOMER_MANAGED", "SERVICE_MANAGED"
     #   resp.workspace.stack_set_name #=> String
     #   resp.workspace.status #=> String, one of "ACTIVE", "CREATING", "DELETING", "FAILED", "UPDATING", "UPGRADING", "DELETION_FAILED", "CREATION_FAILED", "UPDATE_FAILED", "UPGRADE_FAILED", "LICENSE_REMOVAL_FAILED"
+    #   resp.workspace.tags #=> Hash
+    #   resp.workspace.tags["TagKey"] #=> String
     #   resp.workspace.workspace_role_arn #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/DescribeWorkspace AWS API Documentation
@@ -757,7 +772,7 @@ module Aws::ManagedGrafana
     #   resp.workspace.authentication.saml_configuration_status #=> String, one of "CONFIGURED", "NOT_CONFIGURED"
     #   resp.workspace.created #=> Time
     #   resp.workspace.data_sources #=> Array
-    #   resp.workspace.data_sources[0] #=> String, one of "AMAZON_OPENSEARCH_SERVICE", "CLOUDWATCH", "PROMETHEUS", "XRAY", "TIMESTREAM", "SITEWISE"
+    #   resp.workspace.data_sources[0] #=> String, one of "AMAZON_OPENSEARCH_SERVICE", "CLOUDWATCH", "PROMETHEUS", "XRAY", "TIMESTREAM", "SITEWISE", "ATHENA", "REDSHIFT"
     #   resp.workspace.description #=> String
     #   resp.workspace.endpoint #=> String
     #   resp.workspace.free_trial_consumed #=> Boolean
@@ -776,6 +791,8 @@ module Aws::ManagedGrafana
     #   resp.workspace.permission_type #=> String, one of "CUSTOMER_MANAGED", "SERVICE_MANAGED"
     #   resp.workspace.stack_set_name #=> String
     #   resp.workspace.status #=> String, one of "ACTIVE", "CREATING", "DELETING", "FAILED", "UPDATING", "UPGRADING", "DELETION_FAILED", "CREATION_FAILED", "UPDATE_FAILED", "UPGRADE_FAILED", "LICENSE_REMOVAL_FAILED"
+    #   resp.workspace.tags #=> Hash
+    #   resp.workspace.tags["TagKey"] #=> String
     #   resp.workspace.workspace_role_arn #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/DisassociateLicense AWS API Documentation
@@ -852,6 +869,38 @@ module Aws::ManagedGrafana
       req.send_request(options)
     end
 
+    # The `ListTagsForResource` operation returns the tags that are
+    # associated with the Amazon Managed Service for Grafana resource
+    # specified by the `resourceArn`. Currently, the only resource that can
+    # be tagged is a workspace.
+    #
+    # @option params [required, String] :resource_arn
+    #   The ARN of the resource the list of tags are associated with.
+    #
+    # @return [Types::ListTagsForResourceResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::ListTagsForResourceResponse#tags #tags} => Hash&lt;String,String&gt;
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.list_tags_for_resource({
+    #     resource_arn: "String", # required
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.tags #=> Hash
+    #   resp.tags["TagKey"] #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/ListTagsForResource AWS API Documentation
+    #
+    # @overload list_tags_for_resource(params = {})
+    # @param [Hash] params ({})
+    def list_tags_for_resource(params = {}, options = {})
+      req = build_request(:list_tags_for_resource, params)
+      req.send_request(options)
+    end
+
     # Returns a list of Amazon Managed Grafana workspaces in the account,
     # with some information about each workspace. For more complete
     # information about one workspace, use [DescribeWorkspace][1].
@@ -898,6 +947,8 @@ module Aws::ManagedGrafana
     #   resp.workspaces[0].notification_destinations #=> Array
     #   resp.workspaces[0].notification_destinations[0] #=> String, one of "SNS"
     #   resp.workspaces[0].status #=> String, one of "ACTIVE", "CREATING", "DELETING", "FAILED", "UPDATING", "UPGRADING", "DELETION_FAILED", "CREATION_FAILED", "UPDATE_FAILED", "UPGRADE_FAILED", "LICENSE_REMOVAL_FAILED"
+    #   resp.workspaces[0].tags #=> Hash
+    #   resp.workspaces[0].tags["TagKey"] #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/ListWorkspaces AWS API Documentation
     #
@@ -908,6 +959,70 @@ module Aws::ManagedGrafana
       req.send_request(options)
     end
 
+    # The `TagResource` operation associates tags with an Amazon Managed
+    # Grafana resource. Currently, the only resource that can be tagged is
+    # workspaces.
+    #
+    # If you specify a new tag key for the resource, this tag is appended to
+    # the list of tags associated with the resource. If you specify a tag
+    # key that is already associated with the resource, the new tag value
+    # that you specify replaces the previous value for that tag.
+    #
+    # @option params [required, String] :resource_arn
+    #   The ARN of the resource the tag is associated with.
+    #
+    # @option params [required, Hash<String,String>] :tags
+    #   The list of tag keys and values to associate with the resource. You
+    #   can associate tag keys only, tags (key and values) only or a
+    #   combination of tag keys and tags.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.tag_resource({
+    #     resource_arn: "String", # required
+    #     tags: { # required
+    #       "TagKey" => "TagValue",
+    #     },
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/TagResource AWS API Documentation
+    #
+    # @overload tag_resource(params = {})
+    # @param [Hash] params ({})
+    def tag_resource(params = {}, options = {})
+      req = build_request(:tag_resource, params)
+      req.send_request(options)
+    end
+
+    # The `UntagResource` operation removes the association of the tag with
+    # the Amazon Managed Grafana resource.
+    #
+    # @option params [required, String] :resource_arn
+    #   The ARN of the resource the tag association is removed from.
+    #
+    # @option params [required, Array<String>] :tag_keys
+    #   The key values of the tag to be removed from the resource.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.untag_resource({
+    #     resource_arn: "String", # required
+    #     tag_keys: ["TagKey"], # required
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/UntagResource AWS API Documentation
+    #
+    # @overload untag_resource(params = {})
+    # @param [Hash] params ({})
+    def untag_resource(params = {}, options = {})
+      req = build_request(:untag_resource, params)
+      req.send_request(options)
+    end
+
     # Updates which users in a workspace have the Grafana `Admin` or
     # `Editor` roles.
     #
@@ -1063,7 +1178,7 @@ module Aws::ManagedGrafana
     #     organization_role_name: "OrganizationRoleName",
     #     permission_type: "CUSTOMER_MANAGED", # accepts CUSTOMER_MANAGED, SERVICE_MANAGED
     #     stack_set_name: "StackSetName",
-    #     workspace_data_sources: ["AMAZON_OPENSEARCH_SERVICE"], # accepts AMAZON_OPENSEARCH_SERVICE, CLOUDWATCH, PROMETHEUS, XRAY, TIMESTREAM, SITEWISE
+    #     workspace_data_sources: ["AMAZON_OPENSEARCH_SERVICE"], # accepts AMAZON_OPENSEARCH_SERVICE, CLOUDWATCH, PROMETHEUS, XRAY, TIMESTREAM, SITEWISE, ATHENA, REDSHIFT
     #     workspace_description: "Description",
     #     workspace_id: "WorkspaceId", # required
     #     workspace_name: "WorkspaceName",
@@ -1080,7 +1195,7 @@ module Aws::ManagedGrafana
     #   resp.workspace.authentication.saml_configuration_status #=> String, one of "CONFIGURED", "NOT_CONFIGURED"
     #   resp.workspace.created #=> Time
     #   resp.workspace.data_sources #=> Array
-    #   resp.workspace.data_sources[0] #=> String, one of "AMAZON_OPENSEARCH_SERVICE", "CLOUDWATCH", "PROMETHEUS", "XRAY", "TIMESTREAM", "SITEWISE"
+    #   resp.workspace.data_sources[0] #=> String, one of "AMAZON_OPENSEARCH_SERVICE", "CLOUDWATCH", "PROMETHEUS", "XRAY", "TIMESTREAM", "SITEWISE", "ATHENA", "REDSHIFT"
     #   resp.workspace.description #=> String
     #   resp.workspace.endpoint #=> String
     #   resp.workspace.free_trial_consumed #=> Boolean
@@ -1099,6 +1214,8 @@ module Aws::ManagedGrafana
     #   resp.workspace.permission_type #=> String, one of "CUSTOMER_MANAGED", "SERVICE_MANAGED"
     #   resp.workspace.stack_set_name #=> String
     #   resp.workspace.status #=> String, one of "ACTIVE", "CREATING", "DELETING", "FAILED", "UPDATING", "UPGRADING", "DELETION_FAILED", "CREATION_FAILED", "UPDATE_FAILED", "UPGRADE_FAILED", "LICENSE_REMOVAL_FAILED"
+    #   resp.workspace.tags #=> Hash
+    #   resp.workspace.tags["TagKey"] #=> String
     #   resp.workspace.workspace_role_arn #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/UpdateWorkspace AWS API Documentation
@@ -1210,7 +1327,7 @@ module Aws::ManagedGrafana
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-managedgrafana'
-      context[:gem_version] = '1.6.0'
+      context[:gem_version] = '1.7.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -53,6 +53,8 @@ module Aws::ManagedGrafana
     ListPermissionsRequest = Shapes::StructureShape.new(name: 'ListPermissionsRequest')
     ListPermissionsRequestMaxResultsInteger = Shapes::IntegerShape.new(name: 'ListPermissionsRequestMaxResultsInteger')
     ListPermissionsResponse = Shapes::StructureShape.new(name: 'ListPermissionsResponse')
+    ListTagsForResourceRequest = Shapes::StructureShape.new(name: 'ListTagsForResourceRequest')
+    ListTagsForResourceResponse = Shapes::StructureShape.new(name: 'ListTagsForResourceResponse')
     ListWorkspacesRequest = Shapes::StructureShape.new(name: 'ListWorkspacesRequest')
     ListWorkspacesRequestMaxResultsInteger = Shapes::IntegerShape.new(name: 'ListWorkspacesRequestMaxResultsInteger')
     ListWorkspacesResponse = Shapes::StructureShape.new(name: 'ListWorkspacesResponse')
@@ -79,8 +81,16 @@ module Aws::ManagedGrafana
     SsoId = Shapes::StringShape.new(name: 'SsoId')
     StackSetName = Shapes::StringShape.new(name: 'StackSetName')
     String = Shapes::StringShape.new(name: 'String')
+    TagKey = Shapes::StringShape.new(name: 'TagKey')
+    TagKeys = Shapes::ListShape.new(name: 'TagKeys')
+    TagMap = Shapes::MapShape.new(name: 'TagMap')
+    TagResourceRequest = Shapes::StructureShape.new(name: 'TagResourceRequest')
+    TagResourceResponse = Shapes::StructureShape.new(name: 'TagResourceResponse')
+    TagValue = Shapes::StringShape.new(name: 'TagValue')
     ThrottlingException = Shapes::StructureShape.new(name: 'ThrottlingException')
     Timestamp = Shapes::TimestampShape.new(name: 'Timestamp')
+    UntagResourceRequest = Shapes::StructureShape.new(name: 'UntagResourceRequest')
+    UntagResourceResponse = Shapes::StructureShape.new(name: 'UntagResourceResponse')
     UpdateAction = Shapes::StringShape.new(name: 'UpdateAction')
     UpdateError = Shapes::StructureShape.new(name: 'UpdateError')
     UpdateErrorCodeInteger = Shapes::IntegerShape.new(name: 'UpdateErrorCodeInteger')
@@ -152,6 +162,7 @@ module Aws::ManagedGrafana
     CreateWorkspaceRequest.add_member(:organization_role_name, Shapes::ShapeRef.new(shape: OrganizationRoleName, location_name: "organizationRoleName"))
     CreateWorkspaceRequest.add_member(:permission_type, Shapes::ShapeRef.new(shape: PermissionType, required: true, location_name: "permissionType"))
     CreateWorkspaceRequest.add_member(:stack_set_name, Shapes::ShapeRef.new(shape: StackSetName, location_name: "stackSetName"))
+    CreateWorkspaceRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "tags"))
     CreateWorkspaceRequest.add_member(:workspace_data_sources, Shapes::ShapeRef.new(shape: DataSourceTypesList, location_name: "workspaceDataSources"))
     CreateWorkspaceRequest.add_member(:workspace_description, Shapes::ShapeRef.new(shape: Description, location_name: "workspaceDescription"))
     CreateWorkspaceRequest.add_member(:workspace_name, Shapes::ShapeRef.new(shape: WorkspaceName, location_name: "workspaceName"))
@@ -214,6 +225,12 @@ module Aws::ManagedGrafana
     ListPermissionsResponse.add_member(:permissions, Shapes::ShapeRef.new(shape: PermissionEntryList, required: true, location_name: "permissions"))
     ListPermissionsResponse.struct_class = Types::ListPermissionsResponse
 
+    ListTagsForResourceRequest.add_member(:resource_arn, Shapes::ShapeRef.new(shape: String, required: true, location: "uri", location_name: "resourceArn"))
+    ListTagsForResourceRequest.struct_class = Types::ListTagsForResourceRequest
+
+    ListTagsForResourceResponse.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "tags"))
+    ListTagsForResourceResponse.struct_class = Types::ListTagsForResourceResponse
+
     ListWorkspacesRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: ListWorkspacesRequestMaxResultsInteger, location: "querystring", location_name: "maxResults"))
     ListWorkspacesRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: PaginationToken, location: "querystring", location_name: "nextToken"))
     ListWorkspacesRequest.struct_class = Types::ListWorkspacesRequest
@@ -261,12 +278,29 @@ module Aws::ManagedGrafana
     ServiceQuotaExceededException.add_member(:service_code, Shapes::ShapeRef.new(shape: String, required: true, location_name: "serviceCode"))
     ServiceQuotaExceededException.struct_class = Types::ServiceQuotaExceededException
 
+    TagKeys.member = Shapes::ShapeRef.new(shape: TagKey)
+
+    TagMap.key = Shapes::ShapeRef.new(shape: TagKey)
+    TagMap.value = Shapes::ShapeRef.new(shape: TagValue)
+
+    TagResourceRequest.add_member(:resource_arn, Shapes::ShapeRef.new(shape: String, required: true, location: "uri", location_name: "resourceArn"))
+    TagResourceRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, required: true, location_name: "tags"))
+    TagResourceRequest.struct_class = Types::TagResourceRequest
+
+    TagResourceResponse.struct_class = Types::TagResourceResponse
+
     ThrottlingException.add_member(:message, Shapes::ShapeRef.new(shape: String, required: true, location_name: "message"))
     ThrottlingException.add_member(:quota_code, Shapes::ShapeRef.new(shape: String, location_name: "quotaCode"))
     ThrottlingException.add_member(:retry_after_seconds, Shapes::ShapeRef.new(shape: Integer, location: "header", location_name: "Retry-After"))
     ThrottlingException.add_member(:service_code, Shapes::ShapeRef.new(shape: String, location_name: "serviceCode"))
     ThrottlingException.struct_class = Types::ThrottlingException
 
+    UntagResourceRequest.add_member(:resource_arn, Shapes::ShapeRef.new(shape: String, required: true, location: "uri", location_name: "resourceArn"))
+    UntagResourceRequest.add_member(:tag_keys, Shapes::ShapeRef.new(shape: TagKeys, required: true, location: "querystring", location_name: "tagKeys"))
+    UntagResourceRequest.struct_class = Types::UntagResourceRequest
+
+    UntagResourceResponse.struct_class = Types::UntagResourceResponse
+
     UpdateError.add_member(:caused_by, Shapes::ShapeRef.new(shape: UpdateInstruction, required: true, location_name: "causedBy"))
     UpdateError.add_member(:code, Shapes::ShapeRef.new(shape: UpdateErrorCodeInteger, required: true, location_name: "code"))
     UpdateError.add_member(:message, Shapes::ShapeRef.new(shape: String, required: true, location_name: "message"))
@@ -349,6 +383,7 @@ module Aws::ManagedGrafana
     WorkspaceDescription.add_member(:permission_type, Shapes::ShapeRef.new(shape: PermissionType, location_name: "permissionType"))
     WorkspaceDescription.add_member(:stack_set_name, Shapes::ShapeRef.new(shape: StackSetName, location_name: "stackSetName"))
     WorkspaceDescription.add_member(:status, Shapes::ShapeRef.new(shape: WorkspaceStatus, required: true, location_name: "status"))
+    WorkspaceDescription.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "tags"))
     WorkspaceDescription.add_member(:workspace_role_arn, Shapes::ShapeRef.new(shape: IamRoleArn, location_name: "workspaceRoleArn"))
     WorkspaceDescription.struct_class = Types::WorkspaceDescription
 
@@ -364,6 +399,7 @@ module Aws::ManagedGrafana
     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"))
     WorkspaceSummary.add_member(:status, Shapes::ShapeRef.new(shape: WorkspaceStatus, required: true, location_name: "status"))
+    WorkspaceSummary.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "tags"))
     WorkspaceSummary.struct_class = Types::WorkspaceSummary
 
 
@@ -483,6 +519,19 @@ module Aws::ManagedGrafana
         )
       end)
 
+      api.add_operation(:list_tags_for_resource, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ListTagsForResource"
+        o.http_method = "GET"
+        o.http_request_uri = "/tags/{resourceArn}"
+        o.input = Shapes::ShapeRef.new(shape: ListTagsForResourceRequest)
+        o.output = Shapes::ShapeRef.new(shape: ListTagsForResourceResponse)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
+        o.errors << Shapes::ShapeRef.new(shape: ValidationException)
+        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+      end)
+
       api.add_operation(:list_workspaces, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListWorkspaces"
         o.http_method = "GET"
@@ -500,6 +549,32 @@ module Aws::ManagedGrafana
         )
       end)
 
+      api.add_operation(:tag_resource, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "TagResource"
+        o.http_method = "POST"
+        o.http_request_uri = "/tags/{resourceArn}"
+        o.input = Shapes::ShapeRef.new(shape: TagResourceRequest)
+        o.output = Shapes::ShapeRef.new(shape: TagResourceResponse)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
+        o.errors << Shapes::ShapeRef.new(shape: ValidationException)
+        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+      end)
+
+      api.add_operation(:untag_resource, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "UntagResource"
+        o.http_method = "DELETE"
+        o.http_request_uri = "/tags/{resourceArn}"
+        o.input = Shapes::ShapeRef.new(shape: UntagResourceRequest)
+        o.output = Shapes::ShapeRef.new(shape: UntagResourceResponse)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
+        o.errors << Shapes::ShapeRef.new(shape: ValidationException)
+        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+      end)
+
       api.add_operation(:update_permissions, Seahorse::Model::Operation.new.tap do |o|
         o.name = "UpdatePermissions"
         o.http_method = "PATCH"

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

@@ -223,7 +223,10 @@ module Aws::ManagedGrafana
     #         organization_role_name: "OrganizationRoleName",
     #         permission_type: "CUSTOMER_MANAGED", # required, accepts CUSTOMER_MANAGED, SERVICE_MANAGED
     #         stack_set_name: "StackSetName",
-    #         workspace_data_sources: ["AMAZON_OPENSEARCH_SERVICE"], # accepts AMAZON_OPENSEARCH_SERVICE, CLOUDWATCH, PROMETHEUS, XRAY, TIMESTREAM, SITEWISE
+    #         tags: {
+    #           "TagKey" => "TagValue",
+    #         },
+    #         workspace_data_sources: ["AMAZON_OPENSEARCH_SERVICE"], # accepts AMAZON_OPENSEARCH_SERVICE, CLOUDWATCH, PROMETHEUS, XRAY, TIMESTREAM, SITEWISE, ATHENA, REDSHIFT
     #         workspace_description: "Description",
     #         workspace_name: "WorkspaceName",
     #         workspace_notification_destinations: ["SNS"], # accepts SNS
@@ -266,10 +269,12 @@ module Aws::ManagedGrafana
     #   @return [String]
     #
     # @!attribute [rw] permission_type
-    #   If you specify `Service Managed`, Amazon Managed Grafana
-    #   automatically creates the IAM roles and provisions the permissions
-    #   that the workspace needs to use Amazon Web Services data sources and
-    #   notification channels.
+    #   If you specify `SERVICE_MANAGED` on AWS Grafana console, Amazon
+    #   Managed Grafana automatically creates the IAM roles and provisions
+    #   the permissions that the workspace needs to use Amazon Web Services
+    #   data sources and notification channels. In CLI mode, the
+    #   permissionType `SERVICE_MANAGED` will not create the IAM role for
+    #   you.
     #
     #   If you specify `CUSTOMER_MANAGED`, you will manage those roles and
     #   permissions yourself. If you are creating this workspace in a member
@@ -280,7 +285,7 @@ module Aws::ManagedGrafana
     #
     #   For more information, see [Amazon Managed Grafana permissions and
     #   policies for Amazon Web Services data sources and notification
-    #   channels][1]
+    #   channels][1].
     #
     #
     #
@@ -292,6 +297,10 @@ module Aws::ManagedGrafana
     #   roles to be used for this workspace.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   The list of tags associated with the workspace.
+    #   @return [Hash<String,String>]
+    #
     # @!attribute [rw] workspace_data_sources
     #   Specify the Amazon Web Services data sources that you want to be
     #   queried in this workspace. Specifying these data sources here
@@ -308,6 +317,8 @@ module Aws::ManagedGrafana
     # @!attribute [rw] workspace_description
     #   A description for the workspace. This is used only to help you
     #   identify this workspace.
+    #
+    #   Pattern: `^[\\p\{L\}\\p\{Z\}\\p\{N\}\\p\{P\}]\{0,2048\}$`
     #   @return [String]
     #
     # @!attribute [rw] workspace_name
@@ -331,10 +342,7 @@ module Aws::ManagedGrafana
     #   The workspace needs an IAM role that grants permissions to the
     #   Amazon Web Services resources that the workspace will view data
     #   from. If you already have a role that you want to use, specify it
-    #   here. If you omit this field and you specify some Amazon Web
-    #   Services resources in `workspaceDataSources` or
-    #   `workspaceNotificationDestinations`, a new IAM role with the
-    #   necessary permissions is automatically created.
+    #   here. The permission type should be set to `CUSTOMER_MANAGED`.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/CreateWorkspaceRequest AWS API Documentation
@@ -346,6 +354,7 @@ module Aws::ManagedGrafana
       :organization_role_name,
       :permission_type,
       :stack_set_name,
+      :tags,
       :workspace_data_sources,
       :workspace_description,
       :workspace_name,
@@ -626,6 +635,37 @@ module Aws::ManagedGrafana
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ListTagsForResourceRequest
+    #   data as a hash:
+    #
+    #       {
+    #         resource_arn: "String", # required
+    #       }
+    #
+    # @!attribute [rw] resource_arn
+    #   The ARN of the resource the list of tags are associated with.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/ListTagsForResourceRequest AWS API Documentation
+    #
+    class ListTagsForResourceRequest < Struct.new(
+      :resource_arn)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] tags
+    #   The list of tags that are associated with the resource.
+    #   @return [Hash<String,String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/ListTagsForResourceResponse AWS API Documentation
+    #
+    class ListTagsForResourceResponse < Struct.new(
+      :tags)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ListWorkspacesRequest
     #   data as a hash:
     #
@@ -868,6 +908,39 @@ module Aws::ManagedGrafana
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass TagResourceRequest
+    #   data as a hash:
+    #
+    #       {
+    #         resource_arn: "String", # required
+    #         tags: { # required
+    #           "TagKey" => "TagValue",
+    #         },
+    #       }
+    #
+    # @!attribute [rw] resource_arn
+    #   The ARN of the resource the tag is associated with.
+    #   @return [String]
+    #
+    # @!attribute [rw] tags
+    #   The list of tag keys and values to associate with the resource. You
+    #   can associate tag keys only, tags (key and values) only or a
+    #   combination of tag keys and tags.
+    #   @return [Hash<String,String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/TagResourceRequest AWS API Documentation
+    #
+    class TagResourceRequest < Struct.new(
+      :resource_arn,
+      :tags)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/TagResourceResponse AWS API Documentation
+    #
+    class TagResourceResponse < Aws::EmptyStructure; end
+
     # The request was denied because of request throttling. Retry the
     # request.
     #
@@ -898,6 +971,35 @@ module Aws::ManagedGrafana
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass UntagResourceRequest
+    #   data as a hash:
+    #
+    #       {
+    #         resource_arn: "String", # required
+    #         tag_keys: ["TagKey"], # required
+    #       }
+    #
+    # @!attribute [rw] resource_arn
+    #   The ARN of the resource the tag association is removed from.
+    #   @return [String]
+    #
+    # @!attribute [rw] tag_keys
+    #   The key values of the tag to be removed from the resource.
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/UntagResourceRequest AWS API Documentation
+    #
+    class UntagResourceRequest < Struct.new(
+      :resource_arn,
+      :tag_keys)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/UntagResourceResponse AWS API Documentation
+    #
+    class UntagResourceResponse < Aws::EmptyStructure; end
+
     # A structure containing information about one error encountered while
     # performing an [UpdatePermissions][1] operation.
     #
@@ -1102,7 +1204,7 @@ module Aws::ManagedGrafana
     #         organization_role_name: "OrganizationRoleName",
     #         permission_type: "CUSTOMER_MANAGED", # accepts CUSTOMER_MANAGED, SERVICE_MANAGED
     #         stack_set_name: "StackSetName",
-    #         workspace_data_sources: ["AMAZON_OPENSEARCH_SERVICE"], # accepts AMAZON_OPENSEARCH_SERVICE, CLOUDWATCH, PROMETHEUS, XRAY, TIMESTREAM, SITEWISE
+    #         workspace_data_sources: ["AMAZON_OPENSEARCH_SERVICE"], # accepts AMAZON_OPENSEARCH_SERVICE, CLOUDWATCH, PROMETHEUS, XRAY, TIMESTREAM, SITEWISE, ATHENA, REDSHIFT
     #         workspace_description: "Description",
     #         workspace_id: "WorkspaceId", # required
     #         workspace_name: "WorkspaceName",
@@ -1243,6 +1345,9 @@ module Aws::ManagedGrafana
     #
     # @!attribute [rw] id
     #   The ID of the user or group.
+    #
+    #   Pattern:
+    #   `^([0-9a-fA-F]\{10\}-|)[A-Fa-f0-9]\{8\}-[A-Fa-f0-9]\{4\}-[A-Fa-f0-9]\{4\}-[A-Fa-f0-9]\{4\}-[A-Fa-f0-9]\{12\}$`
     #   @return [String]
     #
     # @!attribute [rw] type
@@ -1422,6 +1527,10 @@ module Aws::ManagedGrafana
     #   The current status of the workspace.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   The list of tags associated with the workspace.
+    #   @return [Hash<String,String>]
+    #
     # @!attribute [rw] workspace_role_arn
     #   The IAM role that grants permissions to the Amazon Web Services
     #   resources that the workspace will view data from. This role must
@@ -1451,6 +1560,7 @@ module Aws::ManagedGrafana
       :permission_type,
       :stack_set_name,
       :status,
+      :tags,
       :workspace_role_arn)
       SENSITIVE = [:description, :name, :organization_role_name, :organizational_units, :workspace_role_arn]
       include Aws::Structure
@@ -1503,6 +1613,10 @@ module Aws::ManagedGrafana
     #   The current status of the workspace.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   The list of tags associated with the workspace.
+    #   @return [Hash<String,String>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/grafana-2020-08-18/WorkspaceSummary AWS API Documentation
     #
     class WorkspaceSummary < Struct.new(
@@ -1515,7 +1629,8 @@ module Aws::ManagedGrafana
       :modified,
       :name,
       :notification_destinations,
-      :status)
+      :status,
+      :tags)
       SENSITIVE = [:description, :name]
       include Aws::Structure
     end

data/lib/aws-sdk-managedgrafana.rb

@@ -48,6 +48,6 @@ require_relative 'aws-sdk-managedgrafana/customizations'
 # @!group service
 module Aws::ManagedGrafana
 
-  GEM_VERSION = '1.6.0'
+  GEM_VERSION = '1.7.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-managedgrafana
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-24 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core