diff --git a/CHANGELOG.md b/CHANGELOG.md index 18755e21a9..c607e07d67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +Release v1.44.129 (2022-11-02) +=== + +### Service Client Updates +* `service/iotsitewise`: Updates service API, documentation, and paginators +* `service/s3control`: Updates service API and documentation + * S3 on Outposts launches support for Lifecycle configuration for Outposts buckets. With S3 Lifecycle configuration, you can mange objects so they are stored cost effectively. You can manage objects using size-based rules and specify how many noncurrent versions bucket will retain. +* `service/sagemaker`: Updates service API and documentation + * This release updates Framework model regex for ModelPackage to support new Framework version xgboost, sklearn. +* `service/ssm-incidents`: Updates service API and documentation + Release v1.44.128 (2022-11-01) === diff --git a/aws/endpoints/defaults.go b/aws/endpoints/defaults.go index 8bc65154c3..bdf2ad742d 100644 --- a/aws/endpoints/defaults.go +++ b/aws/endpoints/defaults.go @@ -14397,6 +14397,12 @@ var awsPartition = partition{ endpointKey{ Region: "me-central-1", }: endpoint{}, + endpointKey{ + Region: "me-central-1", + Variant: dualStackVariant, + }: endpoint{ + Hostname: "lambda.me-central-1.api.aws", + }, endpointKey{ Region: "me-south-1", }: endpoint{}, diff --git a/aws/version.go b/aws/version.go index 0df464d83b..88348fb1db 100644 --- a/aws/version.go +++ b/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.44.128" +const SDKVersion = "1.44.129" diff --git a/models/apis/iotsitewise/2019-12-02/api-2.json b/models/apis/iotsitewise/2019-12-02/api-2.json index f3075af716..1a358e3f57 100644 --- a/models/apis/iotsitewise/2019-12-02/api-2.json +++ b/models/apis/iotsitewise/2019-12-02/api-2.json @@ -779,6 +779,22 @@ ], "endpoint":{"hostPrefix":"monitor."} }, + "ListAssetModelProperties":{ + "name":"ListAssetModelProperties", + "http":{ + "method":"GET", + "requestUri":"/asset-models/{assetModelId}/properties" + }, + "input":{"shape":"ListAssetModelPropertiesRequest"}, + "output":{"shape":"ListAssetModelPropertiesResponse"}, + "errors":[ + {"shape":"InvalidRequestException"}, + {"shape":"InternalFailureException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"ThrottlingException"} + ], + "endpoint":{"hostPrefix":"api."} + }, "ListAssetModels":{ "name":"ListAssetModels", "http":{ @@ -794,6 +810,22 @@ ], "endpoint":{"hostPrefix":"api."} }, + "ListAssetProperties":{ + "name":"ListAssetProperties", + "http":{ + "method":"GET", + "requestUri":"/assets/{assetId}/properties" + }, + "input":{"shape":"ListAssetPropertiesRequest"}, + "output":{"shape":"ListAssetPropertiesResponse"}, + "errors":[ + {"shape":"InvalidRequestException"}, + {"shape":"InternalFailureException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"ThrottlingException"} + ], + "endpoint":{"hostPrefix":"api."} + }, "ListAssetRelationships":{ "name":"ListAssetRelationships", "http":{ @@ -1320,7 +1352,8 @@ "name":{"shape":"Name"}, "description":{"shape":"Description"}, "type":{"shape":"Name"}, - "properties":{"shape":"AssetProperties"} + "properties":{"shape":"AssetProperties"}, + "id":{"shape":"ID"} } }, "AssetCompositeModels":{ @@ -1378,7 +1411,8 @@ "name":{"shape":"Name"}, "description":{"shape":"Description"}, "type":{"shape":"Name"}, - "properties":{"shape":"AssetModelProperties"} + "properties":{"shape":"AssetModelProperties"}, + "id":{"shape":"ID"} } }, "AssetModelCompositeModelDefinition":{ @@ -1472,6 +1506,27 @@ "type":"list", "member":{"shape":"AssetModelPropertyDefinition"} }, + "AssetModelPropertySummaries":{ + "type":"list", + "member":{"shape":"AssetModelPropertySummary"} + }, + "AssetModelPropertySummary":{ + "type":"structure", + "required":[ + "name", + "dataType", + "type" + ], + "members":{ + "id":{"shape":"ID"}, + "name":{"shape":"Name"}, + "dataType":{"shape":"PropertyDataType"}, + "dataTypeSpec":{"shape":"Name"}, + "unit":{"shape":"PropertyUnit"}, + "type":{"shape":"PropertyType"}, + "assetModelCompositeModelId":{"shape":"ID"} + } + }, "AssetModelState":{ "type":"string", "enum":[ @@ -1543,6 +1598,20 @@ "min":1, "pattern":"[^\\u0000-\\u001F\\u007F]+" }, + "AssetPropertySummaries":{ + "type":"list", + "member":{"shape":"AssetPropertySummary"} + }, + "AssetPropertySummary":{ + "type":"structure", + "members":{ + "id":{"shape":"ID"}, + "alias":{"shape":"PropertyAlias"}, + "unit":{"shape":"PropertyUnit"}, + "notification":{"shape":"PropertyNotification"}, + "assetCompositeModelId":{"shape":"ID"} + } + }, "AssetPropertyValue":{ "type":"structure", "required":[ @@ -2231,7 +2300,8 @@ "members":{ "name":{"shape":"Name"}, "type":{"shape":"Name"}, - "assetProperty":{"shape":"Property"} + "assetProperty":{"shape":"Property"}, + "id":{"shape":"ID"} } }, "ComputeLocation":{ @@ -2787,6 +2857,11 @@ "shape":"ID", "location":"uri", "locationName":"assetModelId" + }, + "excludeProperties":{ + "shape":"ExcludeProperties", + "location":"querystring", + "locationName":"excludeProperties" } } }, @@ -2858,6 +2933,11 @@ "shape":"ID", "location":"uri", "locationName":"assetId" + }, + "excludeProperties":{ + "shape":"ExcludeProperties", + "location":"querystring", + "locationName":"excludeProperties" } } }, @@ -3320,6 +3400,7 @@ } }, "ExceptionMessage":{"type":"string"}, + "ExcludeProperties":{"type":"boolean"}, "Expression":{ "type":"string", "max":1024, @@ -3921,6 +4002,47 @@ "nextToken":{"shape":"NextToken"} } }, + "ListAssetModelPropertiesFilter":{ + "type":"string", + "enum":[ + "ALL", + "BASE" + ] + }, + "ListAssetModelPropertiesRequest":{ + "type":"structure", + "required":["assetModelId"], + "members":{ + "assetModelId":{ + "shape":"ID", + "location":"uri", + "locationName":"assetModelId" + }, + "nextToken":{ + "shape":"NextToken", + "location":"querystring", + "locationName":"nextToken" + }, + "maxResults":{ + "shape":"MaxResults", + "location":"querystring", + "locationName":"maxResults" + }, + "filter":{ + "shape":"ListAssetModelPropertiesFilter", + "location":"querystring", + "locationName":"filter" + } + } + }, + "ListAssetModelPropertiesResponse":{ + "type":"structure", + "required":["assetModelPropertySummaries"], + "members":{ + "assetModelPropertySummaries":{"shape":"AssetModelPropertySummaries"}, + "nextToken":{"shape":"NextToken"} + } + }, "ListAssetModelsRequest":{ "type":"structure", "members":{ @@ -3944,6 +4066,47 @@ "nextToken":{"shape":"NextToken"} } }, + "ListAssetPropertiesFilter":{ + "type":"string", + "enum":[ + "ALL", + "BASE" + ] + }, + "ListAssetPropertiesRequest":{ + "type":"structure", + "required":["assetId"], + "members":{ + "assetId":{ + "shape":"ID", + "location":"uri", + "locationName":"assetId" + }, + "nextToken":{ + "shape":"NextToken", + "location":"querystring", + "locationName":"nextToken" + }, + "maxResults":{ + "shape":"MaxResults", + "location":"querystring", + "locationName":"maxResults" + }, + "filter":{ + "shape":"ListAssetPropertiesFilter", + "location":"querystring", + "locationName":"filter" + } + } + }, + "ListAssetPropertiesResponse":{ + "type":"structure", + "required":["assetPropertySummaries"], + "members":{ + "assetPropertySummaries":{"shape":"AssetPropertySummaries"}, + "nextToken":{"shape":"NextToken"} + } + }, "ListAssetRelationshipsRequest":{ "type":"structure", "required":[ diff --git a/models/apis/iotsitewise/2019-12-02/docs-2.json b/models/apis/iotsitewise/2019-12-02/docs-2.json index 51a0a79d1e..7945c4a9e3 100644 --- a/models/apis/iotsitewise/2019-12-02/docs-2.json +++ b/models/apis/iotsitewise/2019-12-02/docs-2.json @@ -10,13 +10,13 @@ "BatchGetAssetPropertyValue": "

Gets the current value for one or more asset properties. For more information, see Querying current values in the IoT SiteWise User Guide.

", "BatchGetAssetPropertyValueHistory": "

Gets the historical values for one or more asset properties. For more information, see Querying historical values in the IoT SiteWise User Guide.

", "BatchPutAssetPropertyValue": "

Sends a list of asset property values to IoT SiteWise. Each value is a timestamp-quality-value (TQV) data point. For more information, see Ingesting data using the API in the IoT SiteWise User Guide.

To identify an asset property, you must specify one of the following:

With respect to Unix epoch time, IoT SiteWise accepts only TQVs that have a timestamp of no more than 7 days in the past and no more than 10 minutes in the future. IoT SiteWise rejects timestamps outside of the inclusive range of [-7 days, +10 minutes] and returns a TimestampOutOfRangeException error.

For each asset property, IoT SiteWise overwrites TQVs with duplicate timestamps unless the newer TQV has a different quality. For example, if you store a TQV {T1, GOOD, V1}, then storing {T1, GOOD, V2} replaces the existing TQV.

IoT SiteWise authorizes access to each BatchPutAssetPropertyValue entry individually. For more information, see BatchPutAssetPropertyValue authorization in the IoT SiteWise User Guide.

", - "CreateAccessPolicy": "

Creates an access policy that grants the specified identity (Amazon Web Services SSO user, Amazon Web Services SSO group, or IAM user) access to the specified IoT SiteWise Monitor portal or project resource.

", + "CreateAccessPolicy": "

Creates an access policy that grants the specified identity (IAM Identity Center user, IAM Identity Center group, or IAM user) access to the specified IoT SiteWise Monitor portal or project resource.

", "CreateAsset": "

Creates an asset from an existing asset model. For more information, see Creating assets in the IoT SiteWise User Guide.

", "CreateAssetModel": "

Creates an asset model from specified property and hierarchy definitions. You create assets from asset models. With asset models, you can easily create assets of the same type that have standardized definitions. Each asset created from a model inherits the asset model's property and hierarchy definitions. For more information, see Defining asset models in the IoT SiteWise User Guide.

", "CreateBulkImportJob": "

Defines a job to ingest data to IoT SiteWise from Amazon S3. For more information, see Create a bulk import job (CLI) in the Amazon Simple Storage Service User Guide.

You must enable IoT SiteWise to export data to Amazon S3 before you create a bulk import job. For more information about how to configure storage settings, see PutStorageConfiguration.

", "CreateDashboard": "

Creates a dashboard in an IoT SiteWise Monitor project.

", "CreateGateway": "

Creates a gateway, which is a virtual or edge device that delivers industrial data streams from local servers to IoT SiteWise. For more information, see Ingesting data using a gateway in the IoT SiteWise User Guide.

", - "CreatePortal": "

Creates a portal, which can contain projects and dashboards. IoT SiteWise Monitor uses Amazon Web Services SSO or IAM to authenticate portal users and manage user permissions.

Before you can sign in to a new portal, you must add at least one identity to that portal. For more information, see Adding or removing portal administrators in the IoT SiteWise User Guide.

", + "CreatePortal": "

Creates a portal, which can contain projects and dashboards. IoT SiteWise Monitor uses IAM Identity Center or IAM to authenticate portal users and manage user permissions.

Before you can sign in to a new portal, you must add at least one identity to that portal. For more information, see Adding or removing portal administrators in the IoT SiteWise User Guide.

", "CreateProject": "

Creates a project in the specified portal.

Make sure that the project name and description don't contain confidential information.

", "DeleteAccessPolicy": "

Deletes an access policy that grants the specified identity access to the specified IoT SiteWise Monitor resource. You can use this operation to revoke access to an IoT SiteWise Monitor resource.

", "DeleteAsset": "

Deletes an asset. This action can't be undone. For more information, see Deleting assets and models in the IoT SiteWise User Guide.

You can't delete an asset that's associated to another asset. For more information, see DisassociateAssets.

", @@ -46,8 +46,10 @@ "GetAssetPropertyValue": "

Gets an asset property's current value. For more information, see Querying current values in the IoT SiteWise User Guide.

To identify an asset property, you must specify one of the following:

", "GetAssetPropertyValueHistory": "

Gets the history of an asset property's values. For more information, see Querying historical values in the IoT SiteWise User Guide.

To identify an asset property, you must specify one of the following:

", "GetInterpolatedAssetPropertyValues": "

Get interpolated values for an asset property for a specified time interval, during a period of time. If your time series is missing data points during the specified time interval, you can use interpolation to estimate the missing data.

For example, you can use this operation to return the interpolated temperature values for a wind turbine every 24 hours over a duration of 7 days.

To identify an asset property, you must specify one of the following:

", - "ListAccessPolicies": "

Retrieves a paginated list of access policies for an identity (an Amazon Web Services SSO user, an Amazon Web Services SSO group, or an IAM user) or an IoT SiteWise Monitor resource (a portal or project).

", + "ListAccessPolicies": "

Retrieves a paginated list of access policies for an identity (an IAM Identity Center user, an IAM Identity Center group, or an IAM user) or an IoT SiteWise Monitor resource (a portal or project).

", + "ListAssetModelProperties": "

Retrieves a paginated list of properties associated with an asset model. If you update properties associated with the model before you finish listing all the properties, you need to start all over again.

", "ListAssetModels": "

Retrieves a paginated list of summaries of all asset models.

", + "ListAssetProperties": "

Retrieves a paginated list of properties associated with an asset. If you update properties associated with the model before you finish listing all the properties, you need to start all over again.

", "ListAssetRelationships": "

Retrieves a paginated list of asset relationships for an asset. You can use this operation to identify an asset's root asset and all associated assets between that asset and its root.

", "ListAssets": "

Retrieves a paginated list of asset summaries.

You can use this operation to do the following:

You can't use this operation to list all assets. To retrieve summaries for all of your assets, use ListAssetModels to get all of your asset model IDs. Then, use ListAssets to get all assets for each asset model.

", "ListAssociatedAssets": "

Retrieves a paginated list of associated assets.

You can use this operation to do the following:

", @@ -319,6 +321,18 @@ "CreateAssetModelRequest$assetModelProperties": "

The property definitions of the asset model. For more information, see Asset properties in the IoT SiteWise User Guide.

You can specify up to 200 properties per asset model. For more information, see Quotas in the IoT SiteWise User Guide.

" } }, + "AssetModelPropertySummaries": { + "base": null, + "refs": { + "ListAssetModelPropertiesResponse$assetModelPropertySummaries": "

A list that summarizes the properties associated with the specified asset model.

" + } + }, + "AssetModelPropertySummary": { + "base": "

Contains a summary of a property associated with a model.

", + "refs": { + "AssetModelPropertySummaries$member": null + } + }, "AssetModelState": { "base": null, "refs": { @@ -373,6 +387,18 @@ "PutAssetPropertyValueEntry$propertyAlias": "

The alias that identifies the property, such as an OPC-UA server data stream path (for example, /company/windfarm/3/turbine/7/temperature). For more information, see Mapping industrial data streams to asset properties in the IoT SiteWise User Guide.

" } }, + "AssetPropertySummaries": { + "base": null, + "refs": { + "ListAssetPropertiesResponse$assetPropertySummaries": "

A list that summarizes the properties associated with the specified asset.

" + } + }, + "AssetPropertySummary": { + "base": "

Contains a summary of a property associated with an asset.

", + "refs": { + "AssetPropertySummaries$member": null + } + }, "AssetPropertyValue": { "base": "

Contains asset property value information.

", "refs": { @@ -473,7 +499,7 @@ "AuthMode": { "base": null, "refs": { - "CreatePortalRequest$portalAuthMode": "

The service to use to authenticate users to the portal. Choose from the following options:

You can't change this value after you create a portal.

Default: SSO

", + "CreatePortalRequest$portalAuthMode": "

The service to use to authenticate users to the portal. Choose from the following options:

You can't change this value after you create a portal.

Default: SSO

", "DescribePortalResponse$portalAuthMode": "

The service to use to authenticate users to the portal.

" } }, @@ -1386,6 +1412,13 @@ "TooManyTagsException$message": null } }, + "ExcludeProperties": { + "base": null, + "refs": { + "DescribeAssetModelRequest$excludeProperties": "

Whether or not to exclude asset model properties from the response.

", + "DescribeAssetRequest$excludeProperties": "

Whether or not to exclude asset properties from the response.

" + } + }, "Expression": { "base": null, "refs": { @@ -1526,7 +1559,7 @@ "GroupIdentity": { "base": "

Contains information for a group identity in an access policy.

", "refs": { - "Identity$group": "

An Amazon Web Services SSO group identity.

" + "Identity$group": "

An IAM Identity Center group identity.

" } }, "IAMRoleIdentity": { @@ -1545,17 +1578,23 @@ "base": null, "refs": { "AccessPolicySummary$id": "

The ID of the access policy.

", + "AssetCompositeModel$id": "

The ID of the asset composite model.

", "AssetErrorDetails$assetId": "

The ID of the asset.

", "AssetHierarchy$id": "

The ID of the hierarchy. This ID is a hierarchyId.

", "AssetHierarchyInfo$parentAssetId": "

The ID of the parent asset in this asset relationship.

", "AssetHierarchyInfo$childAssetId": "

The ID of the child asset in this asset relationship.

", "AssetIDs$member": null, + "AssetModelCompositeModel$id": "

The ID of the asset model composite model.

", "AssetModelHierarchy$id": "

The ID of the asset model hierarchy. This ID is a hierarchyId.

", "AssetModelHierarchy$childAssetModelId": "

The ID of the asset model. All assets in this hierarchy must be instances of the childAssetModelId asset model.

", "AssetModelHierarchyDefinition$childAssetModelId": "

The ID of an asset model for this hierarchy.

", "AssetModelProperty$id": "

The ID of the asset model property.

", + "AssetModelPropertySummary$id": "

The ID of the property.

", + "AssetModelPropertySummary$assetModelCompositeModelId": "

The ID of the composite model that contains the asset model property.

", "AssetModelSummary$id": "

The ID of the asset model (used with IoT SiteWise APIs).

", "AssetProperty$id": "

The ID of the asset property.

", + "AssetPropertySummary$id": "

The ID of the property.

", + "AssetPropertySummary$assetCompositeModelId": "

The ID of the composite model that contains the asset property.

", "AssetSummary$id": "

The ID of the asset.

", "AssetSummary$assetModelId": "

The ID of the asset model used to create this asset.

", "AssociateAssetsRequest$assetId": "

The ID of the parent asset.

", @@ -1573,6 +1612,7 @@ "BatchGetAssetPropertyValueEntry$propertyId": "

The ID of the asset property.

", "BatchGetAssetPropertyValueHistoryEntry$assetId": "

The ID of the asset in which the asset property was created.

", "BatchGetAssetPropertyValueHistoryEntry$propertyId": "

The ID of the asset property.

", + "CompositeModelProperty$id": "

The ID of the composite model that contains the property.

", "CreateAccessPolicyResponse$accessPolicyId": "

The ID of the access policy.

", "CreateAssetModelResponse$assetModelId": "

The ID of the asset model. You can use this ID when you call other IoT SiteWise APIs.

", "CreateAssetRequest$assetModelId": "

The ID of the asset model from which to create the asset.

", @@ -1642,6 +1682,8 @@ "ImageLocation$id": "

The ID of the image.

", "JobSummary$id": "

The ID of the job.

", "ListAccessPoliciesRequest$resourceId": "

The ID of the resource. This parameter is required if you specify resourceType.

", + "ListAssetModelPropertiesRequest$assetModelId": "

The ID of the asset model.

", + "ListAssetPropertiesRequest$assetId": "

The ID of the asset.

", "ListAssetRelationshipsRequest$assetId": "

The ID of the asset.

", "ListAssetsRequest$assetModelId": "

The ID of the asset model by which to filter the list of assets. This parameter is required if you choose ALL for filter.

", "ListAssociatedAssetsRequest$assetId": "

The ID of the asset to query.

", @@ -1679,26 +1721,26 @@ } }, "Identity": { - "base": "

Contains an identity that can access an IoT SiteWise Monitor resource.

Currently, you can't use Amazon Web Services APIs to retrieve Amazon Web Services SSO identity IDs. You can find the Amazon Web Services SSO identity IDs in the URL of user and group pages in the Amazon Web Services SSO console.

", + "base": "

Contains an identity that can access an IoT SiteWise Monitor resource.

Currently, you can't use Amazon Web Services APIs to retrieve IAM Identity Center identity IDs. You can find the IAM Identity Center identity IDs in the URL of user and group pages in the IAM Identity Center console.

", "refs": { - "AccessPolicySummary$identity": "

The identity (an Amazon Web Services SSO user, an Amazon Web Services SSO group, or an IAM user).

", - "CreateAccessPolicyRequest$accessPolicyIdentity": "

The identity for this access policy. Choose an Amazon Web Services SSO user, an Amazon Web Services SSO group, or an IAM user.

", - "DescribeAccessPolicyResponse$accessPolicyIdentity": "

The identity (Amazon Web Services SSO user, Amazon Web Services SSO group, or IAM user) to which this access policy applies.

", - "UpdateAccessPolicyRequest$accessPolicyIdentity": "

The identity for this access policy. Choose an Amazon Web Services SSO user, an Amazon Web Services SSO group, or an IAM user.

" + "AccessPolicySummary$identity": "

The identity (an IAM Identity Center user, an IAM Identity Center group, or an IAM user).

", + "CreateAccessPolicyRequest$accessPolicyIdentity": "

The identity for this access policy. Choose an IAM Identity Center user, an IAM Identity Center group, or an IAM user.

", + "DescribeAccessPolicyResponse$accessPolicyIdentity": "

The identity (IAM Identity Center user, IAM Identity Center group, or IAM user) to which this access policy applies.

", + "UpdateAccessPolicyRequest$accessPolicyIdentity": "

The identity for this access policy. Choose an IAM Identity Center user, an IAM Identity Center group, or an IAM user.

" } }, "IdentityId": { "base": null, "refs": { - "GroupIdentity$id": "

The Amazon Web Services SSO ID of the group.

", + "GroupIdentity$id": "

The IAM Identity Center ID of the group.

", "ListAccessPoliciesRequest$identityId": "

The ID of the identity. This parameter is required if you specify USER or GROUP for identityType.

", - "UserIdentity$id": "

The Amazon Web Services SSO ID of the user.

" + "UserIdentity$id": "

The IAM Identity Center ID of the user.

" } }, "IdentityType": { "base": null, "refs": { - "ListAccessPoliciesRequest$identityType": "

The type of identity (Amazon Web Services SSO user, Amazon Web Services SSO group, or IAM user). This parameter is required if you specify identityId.

" + "ListAccessPoliciesRequest$identityType": "

The type of identity (IAM Identity Center user, IAM Identity Center group, or IAM user). This parameter is required if you specify identityId.

" } }, "Image": { @@ -1826,6 +1868,22 @@ "refs": { } }, + "ListAssetModelPropertiesFilter": { + "base": null, + "refs": { + "ListAssetModelPropertiesRequest$filter": "

Filters the requested list of asset model properties. You can choose one of the following options:

Default: BASE

" + } + }, + "ListAssetModelPropertiesRequest": { + "base": null, + "refs": { + } + }, + "ListAssetModelPropertiesResponse": { + "base": null, + "refs": { + } + }, "ListAssetModelsRequest": { "base": null, "refs": { @@ -1836,6 +1894,22 @@ "refs": { } }, + "ListAssetPropertiesFilter": { + "base": null, + "refs": { + "ListAssetPropertiesRequest$filter": "

Filters the requested list of asset properties. You can choose one of the following options:

Default: BASE

" + } + }, + "ListAssetPropertiesRequest": { + "base": null, + "refs": { + } + }, + "ListAssetPropertiesResponse": { + "base": null, + "refs": { + } + }, "ListAssetRelationshipsRequest": { "base": null, "refs": { @@ -1996,7 +2070,9 @@ "GetAssetPropertyAggregatesRequest$maxResults": "

The maximum number of results to return for each paginated request.

Default: 100

", "GetAssetPropertyValueHistoryRequest$maxResults": "

The maximum number of results to return for each paginated request.

Default: 100

", "ListAccessPoliciesRequest$maxResults": "

The maximum number of results to return for each paginated request.

Default: 50

", + "ListAssetModelPropertiesRequest$maxResults": "

The maximum number of results to return for each paginated request. If not specified, the default value is 50.

", "ListAssetModelsRequest$maxResults": "

The maximum number of results to return for each paginated request.

Default: 50

", + "ListAssetPropertiesRequest$maxResults": "

The maximum number of results to return for each paginated request. If not specified, the default value is 50.

", "ListAssetRelationshipsRequest$maxResults": "

The maximum number of results to return for each paginated request.

", "ListAssetsRequest$maxResults": "

The maximum number of results to return for each paginated request.

Default: 50

", "ListAssociatedAssetsRequest$maxResults": "

The maximum number of results to return for each paginated request.

Default: 50

", @@ -2081,6 +2157,8 @@ "AssetModelProperty$dataTypeSpec": "

The data type of the structure for this property. This parameter exists on properties that have the STRUCT data type.

", "AssetModelPropertyDefinition$name": "

The name of the property definition.

", "AssetModelPropertyDefinition$dataTypeSpec": "

The data type of the structure for this property. This parameter is required on properties that have the STRUCT data type.

The options for this parameter depend on the type of the composite model in which you define this property. Use AWS/ALARM_STATE for alarm state in alarm composite models.

", + "AssetModelPropertySummary$name": "

The name of the property.

", + "AssetModelPropertySummary$dataTypeSpec": "

The data type of the structure for this property. This parameter exists on properties that have the STRUCT data type.

", "AssetModelSummary$name": "

The name of the asset model.

", "AssetProperty$name": "

The name of the property.

", "AssetProperty$dataTypeSpec": "

The data type of the structure for this property. This parameter exists on properties that have the STRUCT data type.

", @@ -2137,8 +2215,12 @@ "GetInterpolatedAssetPropertyValuesResponse$nextToken": "

The token for the next set of results, or null if there are no additional results.

", "ListAccessPoliciesRequest$nextToken": "

The token to be used for the next set of paginated results.

", "ListAccessPoliciesResponse$nextToken": "

The token for the next set of results, or null if there are no additional results.

", + "ListAssetModelPropertiesRequest$nextToken": "

The token to be used for the next set of paginated results.

", + "ListAssetModelPropertiesResponse$nextToken": "

The token for the next set of results, or null if there are no additional results.

", "ListAssetModelsRequest$nextToken": "

The token to be used for the next set of paginated results.

", "ListAssetModelsResponse$nextToken": "

The token for the next set of results, or null if there are no additional results.

", + "ListAssetPropertiesRequest$nextToken": "

The token to be used for the next set of paginated results.

", + "ListAssetPropertiesResponse$nextToken": "

The token for the next set of results, or null if there are no additional results.

", "ListAssetRelationshipsRequest$nextToken": "

The token to be used for the next set of paginated results.

", "ListAssetRelationshipsResponse$nextToken": "

The token for the next set of results, or null if there are no additional results.

", "ListAssetsRequest$nextToken": "

The token to be used for the next set of paginated results.

", @@ -2193,7 +2275,7 @@ "PortalClientId": { "base": null, "refs": { - "DescribePortalResponse$portalClientId": "

The Amazon Web Services SSO application generated client ID (used with Amazon Web Services SSO APIs). IoT SiteWise includes portalClientId for only portals that use Amazon Web Services SSO to authenticate users.

" + "DescribePortalResponse$portalClientId": "

The IAM Identity Center application generated client ID (used with IAM Identity Center APIs). IoT SiteWise includes portalClientId for only portals that use IAM Identity Center to authenticate users.

" } }, "PortalResource": { @@ -2259,6 +2341,7 @@ "base": null, "refs": { "AssetProperty$alias": "

The alias that identifies the property, such as an OPC-UA server data stream path (for example, /company/windfarm/3/turbine/7/temperature). For more information, see Mapping industrial data streams to asset properties in the IoT SiteWise User Guide.

", + "AssetPropertySummary$alias": "

The alias that identifies the property, such as an OPC-UA server data stream path (for example, /company/windfarm/3/turbine/7/temperature). For more information, see Mapping industrial data streams to asset properties in the IoT SiteWise User Guide.

", "AssociateTimeSeriesToAssetPropertyRequest$alias": "

The alias that identifies the time series.

", "DeleteTimeSeriesRequest$alias": "

The alias that identifies the time series.

", "DescribeTimeSeriesRequest$alias": "

The alias that identifies the time series.

", @@ -2275,6 +2358,7 @@ "refs": { "AssetModelProperty$dataType": "

The data type of the asset model property.

", "AssetModelPropertyDefinition$dataType": "

The data type of the property definition.

If you specify STRUCT, you must also specify dataTypeSpec to identify the type of the structure for this property.

", + "AssetModelPropertySummary$dataType": "

The data type of the property.

", "AssetProperty$dataType": "

The data type of the asset property.

", "DescribeTimeSeriesResponse$dataType": "

The data type of the time series.

If you specify STRUCT, you must also specify dataTypeSpec to identify the type of the structure for this time series.

", "Property$dataType": "

The property data type.

", @@ -2285,6 +2369,7 @@ "base": "

Contains asset property value notification information. When the notification state is enabled, IoT SiteWise publishes property value updates to a unique MQTT topic. For more information, see Interacting with other services in the IoT SiteWise User Guide.

", "refs": { "AssetProperty$notification": "

The asset property's notification topic and state. For more information, see UpdateAssetProperty.

", + "AssetPropertySummary$notification": null, "Property$notification": "

The asset property's notification topic and state. For more information, see UpdateAssetProperty.

" } }, @@ -2306,6 +2391,7 @@ "refs": { "AssetModelProperty$type": "

The property type (see PropertyType).

", "AssetModelPropertyDefinition$type": "

The property definition type (see PropertyType). You can only specify one type in a property definition.

", + "AssetModelPropertySummary$type": null, "Property$type": "

The property type (see PropertyType). A property contains one type.

" } }, @@ -2314,7 +2400,9 @@ "refs": { "AssetModelProperty$unit": "

The unit of the asset model property, such as Newtons or RPM.

", "AssetModelPropertyDefinition$unit": "

The unit of the property definition, such as Newtons or RPM.

", + "AssetModelPropertySummary$unit": "

The unit (such as Newtons or RPM) of the property.

", "AssetProperty$unit": "

The unit (such as Newtons or RPM) of the asset property.

", + "AssetPropertySummary$unit": "

The unit of measure (such as Newtons or RPM) of the asset property.

", "Property$unit": "

The unit (such as Newtons or RPM) of the asset property.

", "UpdateAssetPropertyRequest$propertyUnit": "

The unit of measure (such as Newtons or RPM) of the asset property. If you don't specify a value for this parameter, the service uses the value of the assetModelProperty in the asset model.

" } @@ -2460,7 +2548,7 @@ "SSOApplicationId": { "base": null, "refs": { - "CreatePortalResponse$ssoApplicationId": "

The associated Amazon Web Services SSO application ID, if the portal uses Amazon Web Services SSO.

" + "CreatePortalResponse$ssoApplicationId": "

The associated IAM Identity Center application ID, if the portal uses IAM Identity Center.

" } }, "ServiceUnavailableException": { @@ -2775,16 +2863,16 @@ "Url": { "base": null, "refs": { - "CreatePortalResponse$portalStartUrl": "

The URL for the IoT SiteWise Monitor portal. You can use this URL to access portals that use Amazon Web Services SSO for authentication. For portals that use IAM for authentication, you must use the IoT SiteWise console to get a URL that you can use to access the portal.

", - "DescribePortalResponse$portalStartUrl": "

The URL for the IoT SiteWise Monitor portal. You can use this URL to access portals that use Amazon Web Services SSO for authentication. For portals that use IAM for authentication, you must use the IoT SiteWise console to get a URL that you can use to access the portal.

", + "CreatePortalResponse$portalStartUrl": "

The URL for the IoT SiteWise Monitor portal. You can use this URL to access portals that use IAM Identity Center for authentication. For portals that use IAM for authentication, you must use the IoT SiteWise console to get a URL that you can use to access the portal.

", + "DescribePortalResponse$portalStartUrl": "

The URL for the IoT SiteWise Monitor portal. You can use this URL to access portals that use IAM Identity Center for authentication. For portals that use IAM for authentication, you must use the IoT SiteWise console to get a URL that you can use to access the portal.

", "ImageLocation$url": "

The URL where the image is available. The URL is valid for 15 minutes so that you can view and download the image

", - "PortalSummary$startUrl": "

The URL for the IoT SiteWise Monitor portal. You can use this URL to access portals that use Amazon Web Services SSO for authentication. For portals that use IAM for authentication, you must use the IoT SiteWise console to get a URL that you can use to access the portal.

" + "PortalSummary$startUrl": "

The URL for the IoT SiteWise Monitor portal. You can use this URL to access portals that use IAM Identity Center for authentication. For portals that use IAM for authentication, you must use the IoT SiteWise console to get a URL that you can use to access the portal.

" } }, "UserIdentity": { "base": "

Contains information for a user identity in an access policy.

", "refs": { - "Identity$user": "

An Amazon Web Services SSO user identity.

" + "Identity$user": "

An IAM Identity Center user identity.

" } }, "VariableName": { diff --git a/models/apis/iotsitewise/2019-12-02/endpoint-rule-set-1.json b/models/apis/iotsitewise/2019-12-02/endpoint-rule-set-1.json new file mode 100644 index 0000000000..fb779a32e3 --- /dev/null +++ b/models/apis/iotsitewise/2019-12-02/endpoint-rule-set-1.json @@ -0,0 +1,315 @@ +{ + "version": "1.0", + "parameters": { + "Region": { + "builtIn": "AWS::Region", + "required": false, + "documentation": "The AWS region used to dispatch the request.", + "type": "String" + }, + "UseDualStack": { + "builtIn": "AWS::UseDualStack", + "required": true, + "default": false, + "documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.", + "type": "Boolean" + }, + "UseFIPS": { + "builtIn": "AWS::UseFIPS", + "required": true, + "default": false, + "documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.", + "type": "Boolean" + }, + "Endpoint": { + "builtIn": "SDK::Endpoint", + "required": false, + "documentation": "Override the endpoint used to send this request", + "type": "String" + } + }, + "rules": [ + { + "conditions": [ + { + "fn": "aws.partition", + "argv": [ + { + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Endpoint" + } + ] + }, + { + "fn": "parseURL", + "argv": [ + { + "ref": "Endpoint" + } + ], + "assign": "url" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://iotsitewise-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://iotsitewise-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://iotsitewise.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" + } + ] + }, + { + "conditions": [], + "endpoint": { + "url": "https://iotsitewise.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] +} \ No newline at end of file diff --git a/models/apis/iotsitewise/2019-12-02/endpoint-tests-1.json b/models/apis/iotsitewise/2019-12-02/endpoint-tests-1.json new file mode 100644 index 0000000000..44fb0f09bd --- /dev/null +++ b/models/apis/iotsitewise/2019-12-02/endpoint-tests-1.json @@ -0,0 +1,771 @@ +{ + "testCases": [ + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.ap-south-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "ap-south-1" + } + }, + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.ap-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "ap-south-1" + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.ap-south-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "ap-south-1" + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.ap-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "ap-south-1" + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.us-gov-east-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "us-gov-east-1" + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "us-gov-east-1" + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.us-gov-east-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "us-gov-east-1" + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "us-gov-east-1" + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.ca-central-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "ca-central-1" + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.ca-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "ca-central-1" + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.ca-central-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "ca-central-1" + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.ca-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "ca-central-1" + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.eu-central-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "eu-central-1" + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.eu-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "eu-central-1" + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.eu-central-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "eu-central-1" + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.eu-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "eu-central-1" + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.us-west-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "us-west-2" + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.us-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "us-west-2" + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.us-west-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "us-west-2" + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.us-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "us-west-2" + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.eu-west-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "eu-west-1" + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.eu-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "eu-west-1" + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.eu-west-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "eu-west-1" + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.eu-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "eu-west-1" + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.ap-northeast-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "ap-northeast-2" + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "ap-northeast-2" + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.ap-northeast-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "ap-northeast-2" + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "ap-northeast-2" + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.ap-northeast-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "ap-northeast-1" + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "ap-northeast-1" + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.ap-northeast-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "ap-northeast-1" + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "ap-northeast-1" + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "cn-north-1" + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "cn-north-1" + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "cn-north-1" + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "cn-north-1" + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.us-gov-west-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "us-gov-west-1" + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "us-gov-west-1" + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.us-gov-west-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "us-gov-west-1" + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "us-gov-west-1" + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.ap-southeast-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "ap-southeast-1" + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "ap-southeast-1" + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.ap-southeast-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "ap-southeast-1" + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "ap-southeast-1" + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.ap-southeast-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "ap-southeast-2" + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "ap-southeast-2" + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.ap-southeast-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "ap-southeast-2" + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "ap-southeast-2" + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.us-east-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "us-east-1" + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.us-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "us-east-1" + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.us-east-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "us-east-1" + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.us-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "us-east-1" + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.us-east-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "us-east-2" + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise-fips.us-east-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "us-east-2" + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.us-east-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "us-east-2" + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://iotsitewise.us-east-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "us-east-2" + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "us-east-1", + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips enabled and dualstack disabled", + "expect": { + "error": "Invalid Configuration: FIPS and custom endpoint are not supported" + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "us-east-1", + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack enabled", + "expect": { + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "us-east-1", + "Endpoint": "https://example.com" + } + } + ], + "version": "1.0" +} \ No newline at end of file diff --git a/models/apis/iotsitewise/2019-12-02/paginators-1.json b/models/apis/iotsitewise/2019-12-02/paginators-1.json index 56e894096b..7745303a10 100644 --- a/models/apis/iotsitewise/2019-12-02/paginators-1.json +++ b/models/apis/iotsitewise/2019-12-02/paginators-1.json @@ -38,12 +38,24 @@ "limit_key": "maxResults", "result_key": "accessPolicySummaries" }, + "ListAssetModelProperties": { + "input_token": "nextToken", + "output_token": "nextToken", + "limit_key": "maxResults", + "result_key": "assetModelPropertySummaries" + }, "ListAssetModels": { "input_token": "nextToken", "output_token": "nextToken", "limit_key": "maxResults", "result_key": "assetModelSummaries" }, + "ListAssetProperties": { + "input_token": "nextToken", + "output_token": "nextToken", + "limit_key": "maxResults", + "result_key": "assetPropertySummaries" + }, "ListAssetRelationships": { "input_token": "nextToken", "output_token": "nextToken", diff --git a/models/apis/s3control/2018-08-20/api-2.json b/models/apis/s3control/2018-08-20/api-2.json index 9ffe1d6eb6..5a0a34e7dc 100644 --- a/models/apis/s3control/2018-08-20/api-2.json +++ b/models/apis/s3control/2018-08-20/api-2.json @@ -2808,7 +2808,15 @@ "type":"structure", "members":{ "Prefix":{"shape":"Prefix"}, - "Tags":{"shape":"S3TagSet"} + "Tags":{"shape":"S3TagSet"}, + "ObjectSizeGreaterThan":{ + "shape":"ObjectSizeGreaterThanBytes", + "box":true + }, + "ObjectSizeLessThan":{ + "shape":"ObjectSizeLessThanBytes", + "box":true + } } }, "LifecycleRuleFilter":{ @@ -2816,7 +2824,15 @@ "members":{ "Prefix":{"shape":"Prefix"}, "Tag":{"shape":"S3Tag"}, - "And":{"shape":"LifecycleRuleAndOperator"} + "And":{"shape":"LifecycleRuleAndOperator"}, + "ObjectSizeGreaterThan":{ + "shape":"ObjectSizeGreaterThanBytes", + "box":true + }, + "ObjectSizeLessThan":{ + "shape":"ObjectSizeLessThanBytes", + "box":true + } } }, "LifecycleRules":{ @@ -3175,10 +3191,15 @@ "max":64, "min":1 }, + "NoncurrentVersionCount":{"type":"integer"}, "NoncurrentVersionExpiration":{ "type":"structure", "members":{ - "NoncurrentDays":{"shape":"Days"} + "NoncurrentDays":{"shape":"Days"}, + "NewerNoncurrentVersions":{ + "shape":"NoncurrentVersionCount", + "box":true + } } }, "NoncurrentVersionTransition":{ @@ -3308,6 +3329,8 @@ } }, "ObjectLockEnabledForBucket":{"type":"boolean"}, + "ObjectSizeGreaterThanBytes":{"type":"long"}, + "ObjectSizeLessThanBytes":{"type":"long"}, "OperationName":{ "type":"string", "enum":[ diff --git a/models/apis/s3control/2018-08-20/docs-2.json b/models/apis/s3control/2018-08-20/docs-2.json index 92b60c858b..82f347d1fc 100644 --- a/models/apis/s3control/2018-08-20/docs-2.json +++ b/models/apis/s3control/2018-08-20/docs-2.json @@ -1471,10 +1471,16 @@ "RegionalBucket$OutpostId": "

The Outposts ID of the regional bucket.

" } }, + "NoncurrentVersionCount": { + "base": null, + "refs": { + "NoncurrentVersionExpiration$NewerNoncurrentVersions": "

Specifies how many noncurrent versions S3 on Outposts will retain. If there are this many more recent noncurrent versions, S3 on Outposts will take the associated action. For more information about noncurrent versions, see Lifecycle configuration elements in the Amazon S3 User Guide.

" + } + }, "NoncurrentVersionExpiration": { "base": "

The container of the noncurrent version expiration.

", "refs": { - "LifecycleRule$NoncurrentVersionExpiration": "

The noncurrent version expiration of the lifecycle rule.

This is not supported by Amazon S3 on Outposts buckets.

" + "LifecycleRule$NoncurrentVersionExpiration": "

The noncurrent version expiration of the lifecycle rule.

" } }, "NoncurrentVersionTransition": { @@ -1545,7 +1551,7 @@ "ObjectLambdaAllowedFeaturesList": { "base": null, "refs": { - "ObjectLambdaConfiguration$AllowedFeatures": "

A container for allowed features. Valid inputs are GetObject-Range and GetObject-PartNumber.

" + "ObjectLambdaConfiguration$AllowedFeatures": "

A container for allowed features. Valid inputs are GetObject-Range, GetObject-PartNumber, HeadObject-Range, and HeadObject-PartNumber.

" } }, "ObjectLambdaConfiguration": { @@ -1590,7 +1596,7 @@ "ObjectLambdaTransformationConfigurationActionsList": { "base": null, "refs": { - "ObjectLambdaTransformationConfiguration$Actions": "

A container for the action of an Object Lambda Access Point configuration. Valid input is GetObject.

" + "ObjectLambdaTransformationConfiguration$Actions": "

A container for the action of an Object Lambda Access Point configuration. Valid inputs are GetObject, ListObjects, HeadObject, and ListObjectsV2.

" } }, "ObjectLambdaTransformationConfigurationsList": { @@ -1605,6 +1611,20 @@ "CreateBucketRequest$ObjectLockEnabledForBucket": "

Specifies whether you want S3 Object Lock to be enabled for the new bucket.

This is not supported by Amazon S3 on Outposts buckets.

" } }, + "ObjectSizeGreaterThanBytes": { + "base": null, + "refs": { + "LifecycleRuleAndOperator$ObjectSizeGreaterThan": "

Minimum object size to which the rule applies.

", + "LifecycleRuleFilter$ObjectSizeGreaterThan": "

Minimum object size to which the rule applies.

" + } + }, + "ObjectSizeLessThanBytes": { + "base": null, + "refs": { + "LifecycleRuleAndOperator$ObjectSizeLessThan": "

Maximum object size to which the rule applies.

", + "LifecycleRuleFilter$ObjectSizeLessThan": "

Maximum object size to which the rule applies.

" + } + }, "OperationName": { "base": null, "refs": { diff --git a/models/apis/s3control/2018-08-20/endpoint-rule-set-1.json b/models/apis/s3control/2018-08-20/endpoint-rule-set-1.json index f739e6328c..204d68a7d9 100644 --- a/models/apis/s3control/2018-08-20/endpoint-rule-set-1.json +++ b/models/apis/s3control/2018-08-20/endpoint-rule-set-1.json @@ -305,9 +305,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{Region}", "disableDoubleEncoding": true, - "signingName": "s3-outposts" + "signingName": "s3-outposts", + "signingRegion": "{Region}" } ] }, @@ -333,9 +333,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{Region}", "disableDoubleEncoding": true, - "signingName": "s3-outposts" + "signingName": "s3-outposts", + "signingRegion": "{Region}" } ] }, @@ -351,9 +351,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{Region}", "disableDoubleEncoding": true, - "signingName": "s3-outposts" + "signingName": "s3-outposts", + "signingRegion": "{Region}" } ] }, @@ -822,9 +822,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{accessPointArn#region}", "disableDoubleEncoding": true, - "signingName": "s3-outposts" + "signingName": "s3-outposts", + "signingRegion": "{accessPointArn#region}" } ] }, @@ -865,9 +865,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{accessPointArn#region}", "disableDoubleEncoding": true, - "signingName": "s3-outposts" + "signingName": "s3-outposts", + "signingRegion": "{accessPointArn#region}" } ] }, @@ -890,9 +890,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{accessPointArn#region}", "disableDoubleEncoding": true, - "signingName": "s3-outposts" + "signingName": "s3-outposts", + "signingRegion": "{accessPointArn#region}" } ] }, @@ -1454,9 +1454,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{bucketArn#region}", "disableDoubleEncoding": true, - "signingName": "s3-outposts" + "signingName": "s3-outposts", + "signingRegion": "{bucketArn#region}" } ] }, @@ -1497,9 +1497,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{bucketArn#region}", "disableDoubleEncoding": true, - "signingName": "s3-outposts" + "signingName": "s3-outposts", + "signingRegion": "{bucketArn#region}" } ] }, @@ -1522,9 +1522,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{bucketArn#region}", "disableDoubleEncoding": true, - "signingName": "s3-outposts" + "signingName": "s3-outposts", + "signingRegion": "{bucketArn#region}" } ] }, @@ -1876,9 +1876,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{Region}", "disableDoubleEncoding": true, - "signingName": "s3" + "signingName": "s3", + "signingRegion": "{Region}" } ] }, @@ -1894,9 +1894,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{Region}", "disableDoubleEncoding": true, - "signingName": "s3" + "signingName": "s3", + "signingRegion": "{Region}" } ] }, @@ -1964,9 +1964,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{Region}", "disableDoubleEncoding": true, - "signingName": "s3" + "signingName": "s3", + "signingRegion": "{Region}" } ] }, @@ -2001,9 +2001,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{Region}", "disableDoubleEncoding": true, - "signingName": "s3" + "signingName": "s3", + "signingRegion": "{Region}" } ] }, @@ -2063,9 +2063,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{Region}", "disableDoubleEncoding": true, - "signingName": "s3" + "signingName": "s3", + "signingRegion": "{Region}" } ] }, @@ -2100,9 +2100,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{Region}", "disableDoubleEncoding": true, - "signingName": "s3" + "signingName": "s3", + "signingRegion": "{Region}" } ] }, @@ -2162,9 +2162,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{Region}", "disableDoubleEncoding": true, - "signingName": "s3" + "signingName": "s3", + "signingRegion": "{Region}" } ] }, @@ -2199,9 +2199,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{Region}", "disableDoubleEncoding": true, - "signingName": "s3" + "signingName": "s3", + "signingRegion": "{Region}" } ] }, @@ -2261,9 +2261,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{Region}", "disableDoubleEncoding": true, - "signingName": "s3" + "signingName": "s3", + "signingRegion": "{Region}" } ] }, @@ -2298,9 +2298,9 @@ "authSchemes": [ { "name": "sigv4", - "signingRegion": "{Region}", "disableDoubleEncoding": true, - "signingName": "s3" + "signingName": "s3", + "signingRegion": "{Region}" } ] }, diff --git a/models/apis/s3control/2018-08-20/endpoint-tests-1.json b/models/apis/s3control/2018-08-20/endpoint-tests-1.json index 98a67a9280..52b802a319 100644 --- a/models/apis/s3control/2018-08-20/endpoint-tests-1.json +++ b/models/apis/s3control/2018-08-20/endpoint-tests-1.json @@ -51,7 +51,6 @@ "AccountId": "123456789012", "Region": "us-west-2", "RequiresAccountId": true, - "S3Control::UseArnRegion": false, "UseDualStack": false, "UseFIPS": false } @@ -107,7 +106,6 @@ "AccountId": "123456789012", "Region": "us-west-2", "RequiresAccountId": true, - "S3Control::UseArnRegion": true, "UseDualStack": false, "UseFIPS": false } @@ -387,7 +385,6 @@ "AccountId": "123456789012", "Region": "us-gov-west-1", "RequiresAccountId": true, - "S3Control::UseArnRegion": true, "UseDualStack": false, "UseFIPS": true } @@ -557,7 +554,6 @@ "AccountId": "123456789012", "Region": "us-gov-west-1", "RequiresAccountId": true, - "S3Control::UseArnRegion": true, "UseDualStack": false, "UseFIPS": true } @@ -727,7 +723,6 @@ "AccountId": "123456789012", "Region": "us-gov-west-1", "RequiresAccountId": true, - "S3Control::UseArnRegion": true, "UseDualStack": false, "UseFIPS": true } @@ -1585,7 +1580,6 @@ "Bucket": "arn:aws:s3-outposts:us-east-1:123456789012:outpost:op-01234567890123456:bucket:mybucket", "Region": "us-west-2", "RequiresAccountId": true, - "S3Control::UseArnRegion": true, "UseDualStack": false, "UseFIPS": false } @@ -1630,7 +1624,6 @@ "Bucket": "arn:aws-us-gov:s3-outposts:us-gov-east-1:123456789012:outpost:op-01234567890123456:bucket:mybucket", "Region": "us-gov-east-1", "RequiresAccountId": true, - "S3Control::UseArnRegion": true, "UseDualStack": false, "UseFIPS": false } @@ -1824,7 +1817,6 @@ "Bucket": "arn:aws:s3-outposts:us-east-1:123456789012:outpost:op-01234567890123456:bucket:mybucket", "Region": "us-west-2", "RequiresAccountId": true, - "S3Control::UseArnRegion": true, "UseDualStack": false, "UseFIPS": false } @@ -1869,7 +1861,6 @@ "Bucket": "arn:aws-us-gov:s3-outposts:us-gov-east-1:123456789012:outpost:op-01234567890123456:bucket:mybucket", "Region": "us-gov-east-1", "RequiresAccountId": true, - "S3Control::UseArnRegion": true, "UseDualStack": false, "UseFIPS": false } @@ -2063,7 +2054,6 @@ "Bucket": "arn:aws:s3-outposts:us-east-1:123456789012:outpost:op-01234567890123456:bucket:mybucket", "Region": "us-west-2", "RequiresAccountId": true, - "S3Control::UseArnRegion": true, "UseDualStack": false, "UseFIPS": false } @@ -2108,7 +2098,6 @@ "Bucket": "arn:aws-us-gov:s3-outposts:us-gov-east-1:123456789012:outpost:op-01234567890123456:bucket:mybucket", "Region": "us-gov-east-1", "RequiresAccountId": true, - "S3Control::UseArnRegion": true, "UseDualStack": false, "UseFIPS": false } diff --git a/models/apis/sagemaker/2017-07-24/api-2.json b/models/apis/sagemaker/2017-07-24/api-2.json index 10b445fa7f..5bd4b9949c 100644 --- a/models/apis/sagemaker/2017-07-24/api-2.json +++ b/models/apis/sagemaker/2017-07-24/api-2.json @@ -12866,7 +12866,7 @@ "Environment":{"shape":"EnvironmentMap"}, "ModelInput":{"shape":"ModelInput"}, "Framework":{"shape":"String"}, - "FrameworkVersion":{"shape":"FrameworkVersion"}, + "FrameworkVersion":{"shape":"ModelPackageFrameworkVersion"}, "NearestModelName":{"shape":"String"} } }, @@ -12876,6 +12876,12 @@ "max":15, "min":1 }, + "ModelPackageFrameworkVersion":{ + "type":"string", + "max":10, + "min":3, + "pattern":"[0-9]\\.[A-Za-z0-9.-]+" + }, "ModelPackageGroup":{ "type":"structure", "members":{ diff --git a/models/apis/sagemaker/2017-07-24/docs-2.json b/models/apis/sagemaker/2017-07-24/docs-2.json index 57ee465cec..b35c21a90c 100644 --- a/models/apis/sagemaker/2017-07-24/docs-2.json +++ b/models/apis/sagemaker/2017-07-24/docs-2.json @@ -5095,8 +5095,7 @@ "FrameworkVersion": { "base": null, "refs": { - "InputConfig$FrameworkVersion": "

Specifies the framework version to use. This API field is only supported for the MXNet, PyTorch, TensorFlow and TensorFlow Lite frameworks.

For information about framework versions supported for cloud targets and edge devices, see Cloud Supported Instance Types and Frameworks and Edge Supported Frameworks.

", - "ModelPackageContainerDefinition$FrameworkVersion": "

The framework version of the Model Package Container Image.

" + "InputConfig$FrameworkVersion": "

Specifies the framework version to use. This API field is only supported for the MXNet, PyTorch, TensorFlow and TensorFlow Lite frameworks.

For information about framework versions supported for cloud targets and edge devices, see Cloud Supported Instance Types and Frameworks and Edge Supported Frameworks.

" } }, "GenerateCandidateDefinitionsOnly": { @@ -7609,6 +7608,12 @@ "InferenceSpecification$Containers": "

The Amazon ECR registry path of the Docker image that contains the inference code.

" } }, + "ModelPackageFrameworkVersion": { + "base": null, + "refs": { + "ModelPackageContainerDefinition$FrameworkVersion": "

The framework version of the Model Package Container Image.

" + } + }, "ModelPackageGroup": { "base": "

A group of versioned models in the model registry.

", "refs": { diff --git a/models/apis/sagemaker/2017-07-24/endpoint-tests-1.json b/models/apis/sagemaker/2017-07-24/endpoint-tests-1.json index 152c211312..4503c943f8 100644 --- a/models/apis/sagemaker/2017-07-24/endpoint-tests-1.json +++ b/models/apis/sagemaker/2017-07-24/endpoint-tests-1.json @@ -8,8 +8,8 @@ } }, "params": { - "Region": "ap-south-1", "UseFIPS": true, + "Region": "ap-south-1", "UseDualStack": true } }, @@ -21,8 +21,8 @@ } }, "params": { - "Region": "ap-south-1", "UseFIPS": true, + "Region": "ap-south-1", "UseDualStack": false } }, @@ -34,8 +34,8 @@ } }, "params": { - "Region": "ap-south-1", "UseFIPS": false, + "Region": "ap-south-1", "UseDualStack": true } }, @@ -47,8 +47,8 @@ } }, "params": { - "Region": "ap-south-1", "UseFIPS": false, + "Region": "ap-south-1", "UseDualStack": false } }, @@ -60,8 +60,8 @@ } }, "params": { - "Region": "eu-south-1", "UseFIPS": true, + "Region": "eu-south-1", "UseDualStack": true } }, @@ -73,8 +73,8 @@ } }, "params": { - "Region": "eu-south-1", "UseFIPS": true, + "Region": "eu-south-1", "UseDualStack": false } }, @@ -86,8 +86,8 @@ } }, "params": { - "Region": "eu-south-1", "UseFIPS": false, + "Region": "eu-south-1", "UseDualStack": true } }, @@ -99,8 +99,8 @@ } }, "params": { - "Region": "eu-south-1", "UseFIPS": false, + "Region": "eu-south-1", "UseDualStack": false } }, @@ -112,8 +112,8 @@ } }, "params": { - "Region": "us-gov-east-1", "UseFIPS": true, + "Region": "us-gov-east-1", "UseDualStack": true } }, @@ -125,8 +125,8 @@ } }, "params": { - "Region": "us-gov-east-1", "UseFIPS": true, + "Region": "us-gov-east-1", "UseDualStack": false } }, @@ -138,8 +138,8 @@ } }, "params": { - "Region": "us-gov-east-1", "UseFIPS": false, + "Region": "us-gov-east-1", "UseDualStack": true } }, @@ -151,8 +151,8 @@ } }, "params": { - "Region": "us-gov-east-1", "UseFIPS": false, + "Region": "us-gov-east-1", "UseDualStack": false } }, @@ -164,8 +164,8 @@ } }, "params": { - "Region": "me-central-1", "UseFIPS": true, + "Region": "me-central-1", "UseDualStack": true } }, @@ -177,8 +177,8 @@ } }, "params": { - "Region": "me-central-1", "UseFIPS": true, + "Region": "me-central-1", "UseDualStack": false } }, @@ -190,8 +190,8 @@ } }, "params": { - "Region": "me-central-1", "UseFIPS": false, + "Region": "me-central-1", "UseDualStack": true } }, @@ -203,8 +203,8 @@ } }, "params": { - "Region": "me-central-1", "UseFIPS": false, + "Region": "me-central-1", "UseDualStack": false } }, @@ -216,8 +216,8 @@ } }, "params": { - "Region": "ca-central-1", "UseFIPS": true, + "Region": "ca-central-1", "UseDualStack": true } }, @@ -229,8 +229,8 @@ } }, "params": { - "Region": "ca-central-1", "UseFIPS": true, + "Region": "ca-central-1", "UseDualStack": false } }, @@ -242,8 +242,8 @@ } }, "params": { - "Region": "ca-central-1", "UseFIPS": false, + "Region": "ca-central-1", "UseDualStack": true } }, @@ -255,8 +255,8 @@ } }, "params": { - "Region": "ca-central-1", "UseFIPS": false, + "Region": "ca-central-1", "UseDualStack": false } }, @@ -268,8 +268,8 @@ } }, "params": { - "Region": "eu-central-1", "UseFIPS": true, + "Region": "eu-central-1", "UseDualStack": true } }, @@ -281,8 +281,8 @@ } }, "params": { - "Region": "eu-central-1", "UseFIPS": true, + "Region": "eu-central-1", "UseDualStack": false } }, @@ -294,8 +294,8 @@ } }, "params": { - "Region": "eu-central-1", "UseFIPS": false, + "Region": "eu-central-1", "UseDualStack": true } }, @@ -307,8 +307,8 @@ } }, "params": { - "Region": "eu-central-1", "UseFIPS": false, + "Region": "eu-central-1", "UseDualStack": false } }, @@ -320,8 +320,8 @@ } }, "params": { - "Region": "us-west-1", "UseFIPS": true, + "Region": "us-west-1", "UseDualStack": true } }, @@ -333,8 +333,8 @@ } }, "params": { - "Region": "us-west-1", "UseFIPS": true, + "Region": "us-west-1", "UseDualStack": false } }, @@ -346,8 +346,8 @@ } }, "params": { - "Region": "us-west-1", "UseFIPS": false, + "Region": "us-west-1", "UseDualStack": true } }, @@ -359,8 +359,8 @@ } }, "params": { - "Region": "us-west-1", "UseFIPS": false, + "Region": "us-west-1", "UseDualStack": false } }, @@ -372,8 +372,8 @@ } }, "params": { - "Region": "us-west-2", "UseFIPS": true, + "Region": "us-west-2", "UseDualStack": true } }, @@ -385,8 +385,8 @@ } }, "params": { - "Region": "us-west-2", "UseFIPS": true, + "Region": "us-west-2", "UseDualStack": false } }, @@ -398,8 +398,8 @@ } }, "params": { - "Region": "us-west-2", "UseFIPS": false, + "Region": "us-west-2", "UseDualStack": true } }, @@ -411,8 +411,8 @@ } }, "params": { - "Region": "us-west-2", "UseFIPS": false, + "Region": "us-west-2", "UseDualStack": false } }, @@ -424,8 +424,8 @@ } }, "params": { - "Region": "af-south-1", "UseFIPS": true, + "Region": "af-south-1", "UseDualStack": true } }, @@ -437,8 +437,8 @@ } }, "params": { - "Region": "af-south-1", "UseFIPS": true, + "Region": "af-south-1", "UseDualStack": false } }, @@ -450,8 +450,8 @@ } }, "params": { - "Region": "af-south-1", "UseFIPS": false, + "Region": "af-south-1", "UseDualStack": true } }, @@ -463,8 +463,8 @@ } }, "params": { - "Region": "af-south-1", "UseFIPS": false, + "Region": "af-south-1", "UseDualStack": false } }, @@ -476,8 +476,8 @@ } }, "params": { - "Region": "eu-north-1", "UseFIPS": true, + "Region": "eu-north-1", "UseDualStack": true } }, @@ -489,8 +489,8 @@ } }, "params": { - "Region": "eu-north-1", "UseFIPS": true, + "Region": "eu-north-1", "UseDualStack": false } }, @@ -502,8 +502,8 @@ } }, "params": { - "Region": "eu-north-1", "UseFIPS": false, + "Region": "eu-north-1", "UseDualStack": true } }, @@ -515,8 +515,8 @@ } }, "params": { - "Region": "eu-north-1", "UseFIPS": false, + "Region": "eu-north-1", "UseDualStack": false } }, @@ -528,8 +528,8 @@ } }, "params": { - "Region": "eu-west-3", "UseFIPS": true, + "Region": "eu-west-3", "UseDualStack": true } }, @@ -541,8 +541,8 @@ } }, "params": { - "Region": "eu-west-3", "UseFIPS": true, + "Region": "eu-west-3", "UseDualStack": false } }, @@ -554,8 +554,8 @@ } }, "params": { - "Region": "eu-west-3", "UseFIPS": false, + "Region": "eu-west-3", "UseDualStack": true } }, @@ -567,8 +567,8 @@ } }, "params": { - "Region": "eu-west-3", "UseFIPS": false, + "Region": "eu-west-3", "UseDualStack": false } }, @@ -580,8 +580,8 @@ } }, "params": { - "Region": "eu-west-2", "UseFIPS": true, + "Region": "eu-west-2", "UseDualStack": true } }, @@ -593,8 +593,8 @@ } }, "params": { - "Region": "eu-west-2", "UseFIPS": true, + "Region": "eu-west-2", "UseDualStack": false } }, @@ -606,8 +606,8 @@ } }, "params": { - "Region": "eu-west-2", "UseFIPS": false, + "Region": "eu-west-2", "UseDualStack": true } }, @@ -619,8 +619,8 @@ } }, "params": { - "Region": "eu-west-2", "UseFIPS": false, + "Region": "eu-west-2", "UseDualStack": false } }, @@ -632,8 +632,8 @@ } }, "params": { - "Region": "eu-west-1", "UseFIPS": true, + "Region": "eu-west-1", "UseDualStack": true } }, @@ -645,8 +645,8 @@ } }, "params": { - "Region": "eu-west-1", "UseFIPS": true, + "Region": "eu-west-1", "UseDualStack": false } }, @@ -658,8 +658,8 @@ } }, "params": { - "Region": "eu-west-1", "UseFIPS": false, + "Region": "eu-west-1", "UseDualStack": true } }, @@ -671,8 +671,8 @@ } }, "params": { - "Region": "eu-west-1", "UseFIPS": false, + "Region": "eu-west-1", "UseDualStack": false } }, @@ -684,8 +684,8 @@ } }, "params": { - "Region": "ap-northeast-3", "UseFIPS": true, + "Region": "ap-northeast-3", "UseDualStack": true } }, @@ -697,8 +697,8 @@ } }, "params": { - "Region": "ap-northeast-3", "UseFIPS": true, + "Region": "ap-northeast-3", "UseDualStack": false } }, @@ -710,8 +710,8 @@ } }, "params": { - "Region": "ap-northeast-3", "UseFIPS": false, + "Region": "ap-northeast-3", "UseDualStack": true } }, @@ -723,8 +723,8 @@ } }, "params": { - "Region": "ap-northeast-3", "UseFIPS": false, + "Region": "ap-northeast-3", "UseDualStack": false } }, @@ -736,8 +736,8 @@ } }, "params": { - "Region": "ap-northeast-2", "UseFIPS": true, + "Region": "ap-northeast-2", "UseDualStack": true } }, @@ -749,8 +749,8 @@ } }, "params": { - "Region": "ap-northeast-2", "UseFIPS": true, + "Region": "ap-northeast-2", "UseDualStack": false } }, @@ -762,8 +762,8 @@ } }, "params": { - "Region": "ap-northeast-2", "UseFIPS": false, + "Region": "ap-northeast-2", "UseDualStack": true } }, @@ -775,8 +775,8 @@ } }, "params": { - "Region": "ap-northeast-2", "UseFIPS": false, + "Region": "ap-northeast-2", "UseDualStack": false } }, @@ -788,8 +788,8 @@ } }, "params": { - "Region": "ap-northeast-1", "UseFIPS": true, + "Region": "ap-northeast-1", "UseDualStack": true } }, @@ -801,8 +801,8 @@ } }, "params": { - "Region": "ap-northeast-1", "UseFIPS": true, + "Region": "ap-northeast-1", "UseDualStack": false } }, @@ -814,8 +814,8 @@ } }, "params": { - "Region": "ap-northeast-1", "UseFIPS": false, + "Region": "ap-northeast-1", "UseDualStack": true } }, @@ -827,8 +827,8 @@ } }, "params": { - "Region": "ap-northeast-1", "UseFIPS": false, + "Region": "ap-northeast-1", "UseDualStack": false } }, @@ -840,8 +840,8 @@ } }, "params": { - "Region": "me-south-1", "UseFIPS": true, + "Region": "me-south-1", "UseDualStack": true } }, @@ -853,8 +853,8 @@ } }, "params": { - "Region": "me-south-1", "UseFIPS": true, + "Region": "me-south-1", "UseDualStack": false } }, @@ -866,8 +866,8 @@ } }, "params": { - "Region": "me-south-1", "UseFIPS": false, + "Region": "me-south-1", "UseDualStack": true } }, @@ -879,8 +879,8 @@ } }, "params": { - "Region": "me-south-1", "UseFIPS": false, + "Region": "me-south-1", "UseDualStack": false } }, @@ -892,8 +892,8 @@ } }, "params": { - "Region": "sa-east-1", "UseFIPS": true, + "Region": "sa-east-1", "UseDualStack": true } }, @@ -905,8 +905,8 @@ } }, "params": { - "Region": "sa-east-1", "UseFIPS": true, + "Region": "sa-east-1", "UseDualStack": false } }, @@ -918,8 +918,8 @@ } }, "params": { - "Region": "sa-east-1", "UseFIPS": false, + "Region": "sa-east-1", "UseDualStack": true } }, @@ -931,8 +931,8 @@ } }, "params": { - "Region": "sa-east-1", "UseFIPS": false, + "Region": "sa-east-1", "UseDualStack": false } }, @@ -944,8 +944,8 @@ } }, "params": { - "Region": "ap-east-1", "UseFIPS": true, + "Region": "ap-east-1", "UseDualStack": true } }, @@ -957,8 +957,8 @@ } }, "params": { - "Region": "ap-east-1", "UseFIPS": true, + "Region": "ap-east-1", "UseDualStack": false } }, @@ -970,8 +970,8 @@ } }, "params": { - "Region": "ap-east-1", "UseFIPS": false, + "Region": "ap-east-1", "UseDualStack": true } }, @@ -983,8 +983,8 @@ } }, "params": { - "Region": "ap-east-1", "UseFIPS": false, + "Region": "ap-east-1", "UseDualStack": false } }, @@ -996,8 +996,8 @@ } }, "params": { - "Region": "cn-north-1", "UseFIPS": true, + "Region": "cn-north-1", "UseDualStack": true } }, @@ -1009,8 +1009,8 @@ } }, "params": { - "Region": "cn-north-1", "UseFIPS": true, + "Region": "cn-north-1", "UseDualStack": false } }, @@ -1022,8 +1022,8 @@ } }, "params": { - "Region": "cn-north-1", "UseFIPS": false, + "Region": "cn-north-1", "UseDualStack": true } }, @@ -1035,8 +1035,8 @@ } }, "params": { - "Region": "cn-north-1", "UseFIPS": false, + "Region": "cn-north-1", "UseDualStack": false } }, @@ -1048,8 +1048,8 @@ } }, "params": { - "Region": "us-gov-west-1", "UseFIPS": true, + "Region": "us-gov-west-1", "UseDualStack": true } }, @@ -1061,8 +1061,8 @@ } }, "params": { - "Region": "us-gov-west-1", "UseFIPS": true, + "Region": "us-gov-west-1", "UseDualStack": false } }, @@ -1074,8 +1074,8 @@ } }, "params": { - "Region": "us-gov-west-1", "UseFIPS": false, + "Region": "us-gov-west-1", "UseDualStack": true } }, @@ -1087,8 +1087,8 @@ } }, "params": { - "Region": "us-gov-west-1", "UseFIPS": false, + "Region": "us-gov-west-1", "UseDualStack": false } }, @@ -1100,8 +1100,8 @@ } }, "params": { - "Region": "ap-southeast-1", "UseFIPS": true, + "Region": "ap-southeast-1", "UseDualStack": true } }, @@ -1113,8 +1113,8 @@ } }, "params": { - "Region": "ap-southeast-1", "UseFIPS": true, + "Region": "ap-southeast-1", "UseDualStack": false } }, @@ -1126,8 +1126,8 @@ } }, "params": { - "Region": "ap-southeast-1", "UseFIPS": false, + "Region": "ap-southeast-1", "UseDualStack": true } }, @@ -1139,8 +1139,8 @@ } }, "params": { - "Region": "ap-southeast-1", "UseFIPS": false, + "Region": "ap-southeast-1", "UseDualStack": false } }, @@ -1152,8 +1152,8 @@ } }, "params": { - "Region": "ap-southeast-2", "UseFIPS": true, + "Region": "ap-southeast-2", "UseDualStack": true } }, @@ -1165,8 +1165,8 @@ } }, "params": { - "Region": "ap-southeast-2", "UseFIPS": true, + "Region": "ap-southeast-2", "UseDualStack": false } }, @@ -1178,8 +1178,8 @@ } }, "params": { - "Region": "ap-southeast-2", "UseFIPS": false, + "Region": "ap-southeast-2", "UseDualStack": true } }, @@ -1191,8 +1191,8 @@ } }, "params": { - "Region": "ap-southeast-2", "UseFIPS": false, + "Region": "ap-southeast-2", "UseDualStack": false } }, @@ -1202,8 +1202,8 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "us-iso-east-1", "UseFIPS": true, + "Region": "us-iso-east-1", "UseDualStack": true } }, @@ -1215,8 +1215,8 @@ } }, "params": { - "Region": "us-iso-east-1", "UseFIPS": true, + "Region": "us-iso-east-1", "UseDualStack": false } }, @@ -1226,8 +1226,8 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "us-iso-east-1", "UseFIPS": false, + "Region": "us-iso-east-1", "UseDualStack": true } }, @@ -1239,8 +1239,8 @@ } }, "params": { - "Region": "us-iso-east-1", "UseFIPS": false, + "Region": "us-iso-east-1", "UseDualStack": false } }, @@ -1252,8 +1252,8 @@ } }, "params": { - "Region": "ap-southeast-3", "UseFIPS": true, + "Region": "ap-southeast-3", "UseDualStack": true } }, @@ -1265,8 +1265,8 @@ } }, "params": { - "Region": "ap-southeast-3", "UseFIPS": true, + "Region": "ap-southeast-3", "UseDualStack": false } }, @@ -1278,8 +1278,8 @@ } }, "params": { - "Region": "ap-southeast-3", "UseFIPS": false, + "Region": "ap-southeast-3", "UseDualStack": true } }, @@ -1291,8 +1291,8 @@ } }, "params": { - "Region": "ap-southeast-3", "UseFIPS": false, + "Region": "ap-southeast-3", "UseDualStack": false } }, @@ -1304,8 +1304,8 @@ } }, "params": { - "Region": "us-east-1", "UseFIPS": true, + "Region": "us-east-1", "UseDualStack": true } }, @@ -1317,8 +1317,8 @@ } }, "params": { - "Region": "us-east-1", "UseFIPS": true, + "Region": "us-east-1", "UseDualStack": false } }, @@ -1330,8 +1330,8 @@ } }, "params": { - "Region": "us-east-1", "UseFIPS": false, + "Region": "us-east-1", "UseDualStack": true } }, @@ -1343,8 +1343,8 @@ } }, "params": { - "Region": "us-east-1", "UseFIPS": false, + "Region": "us-east-1", "UseDualStack": false } }, @@ -1356,8 +1356,8 @@ } }, "params": { - "Region": "us-east-2", "UseFIPS": true, + "Region": "us-east-2", "UseDualStack": true } }, @@ -1369,8 +1369,8 @@ } }, "params": { - "Region": "us-east-2", "UseFIPS": true, + "Region": "us-east-2", "UseDualStack": false } }, @@ -1382,8 +1382,8 @@ } }, "params": { - "Region": "us-east-2", "UseFIPS": false, + "Region": "us-east-2", "UseDualStack": true } }, @@ -1395,8 +1395,8 @@ } }, "params": { - "Region": "us-east-2", "UseFIPS": false, + "Region": "us-east-2", "UseDualStack": false } }, @@ -1408,8 +1408,8 @@ } }, "params": { - "Region": "cn-northwest-1", "UseFIPS": true, + "Region": "cn-northwest-1", "UseDualStack": true } }, @@ -1421,8 +1421,8 @@ } }, "params": { - "Region": "cn-northwest-1", "UseFIPS": true, + "Region": "cn-northwest-1", "UseDualStack": false } }, @@ -1434,8 +1434,8 @@ } }, "params": { - "Region": "cn-northwest-1", "UseFIPS": false, + "Region": "cn-northwest-1", "UseDualStack": true } }, @@ -1447,8 +1447,8 @@ } }, "params": { - "Region": "cn-northwest-1", "UseFIPS": false, + "Region": "cn-northwest-1", "UseDualStack": false } }, @@ -1458,8 +1458,8 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "us-isob-east-1", "UseFIPS": true, + "Region": "us-isob-east-1", "UseDualStack": true } }, @@ -1471,8 +1471,8 @@ } }, "params": { - "Region": "us-isob-east-1", "UseFIPS": true, + "Region": "us-isob-east-1", "UseDualStack": false } }, @@ -1482,8 +1482,8 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "us-isob-east-1", "UseFIPS": false, + "Region": "us-isob-east-1", "UseDualStack": true } }, @@ -1495,8 +1495,8 @@ } }, "params": { - "Region": "us-isob-east-1", "UseFIPS": false, + "Region": "us-isob-east-1", "UseDualStack": false } }, @@ -1508,8 +1508,8 @@ } }, "params": { - "Region": "us-east-1", "UseFIPS": false, + "Region": "us-east-1", "UseDualStack": false, "Endpoint": "https://example.com" } @@ -1520,8 +1520,8 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "Region": "us-east-1", "UseFIPS": true, + "Region": "us-east-1", "UseDualStack": false, "Endpoint": "https://example.com" } @@ -1532,8 +1532,8 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "Region": "us-east-1", "UseFIPS": false, + "Region": "us-east-1", "UseDualStack": true, "Endpoint": "https://example.com" } diff --git a/models/apis/ssm-incidents/2018-05-10/api-2.json b/models/apis/ssm-incidents/2018-05-10/api-2.json index 19e519d3c3..3b3b4007a8 100644 --- a/models/apis/ssm-incidents/2018-05-10/api-2.json +++ b/models/apis/ssm-incidents/2018-05-10/api-2.json @@ -638,7 +638,8 @@ "shape":"ClientToken", "idempotencyToken":true }, - "regions":{"shape":"RegionMapInput"} + "regions":{"shape":"RegionMapInput"}, + "tags":{"shape":"TagMap"} } }, "CreateReplicationSetOutput":{ diff --git a/models/apis/ssm-incidents/2018-05-10/docs-2.json b/models/apis/ssm-incidents/2018-05-10/docs-2.json index bc4076ac08..5496c53cd1 100644 --- a/models/apis/ssm-incidents/2018-05-10/docs-2.json +++ b/models/apis/ssm-incidents/2018-05-10/docs-2.json @@ -21,7 +21,7 @@ "ListResponsePlans": "

Lists all response plans in your account.

", "ListTagsForResource": "

Lists the tags that are attached to the specified response plan.

", "ListTimelineEvents": "

Lists timeline events for the specified incident record.

", - "PutResourcePolicy": "

Adds a resource policy to the specified response plan. The resource policy is used to share the response plan using Resource Access Manager (RAM). For more information about cross-account sharing, see Setting up cross-account functionality.

", + "PutResourcePolicy": "

Adds a resource policy to the specified response plan. The resource policy is used to share the response plan using Resource Access Manager (RAM). For more information about cross-account sharing, see Cross-Region and cross-account incident management.

", "StartIncident": "

Used to start an incident from CloudWatch alarms, EventBridge events, or manually.

", "TagResource": "

Adds a tag to a response plan.

", "UntagResource": "

Removes a tag from a resource.

", @@ -87,7 +87,7 @@ "ListRelatedItemsInput$incidentRecordArn": "

The Amazon Resource Name (ARN) of the incident record containing the listed related items.

", "ListTimelineEventsInput$incidentRecordArn": "

The Amazon Resource Name (ARN) of the incident that includes the timeline event.

", "NotificationTargetItem$snsTopicArn": "

The Amazon Resource Name (ARN) of the SNS topic.

", - "PutResourcePolicyInput$resourceArn": "

The Amazon Resource Name (ARN) of the response plan you're adding the resource policy to.

", + "PutResourcePolicyInput$resourceArn": "

The Amazon Resource Name (ARN) of the response plan to add the resource policy to.

", "ReplicationSet$arn": "

The Amazon Resource Name (ARN) of the replication set.

", "ReplicationSet$createdBy": "

Details about who created the replication set.

", "ReplicationSet$lastModifiedBy": "

Who last modified the replication set.

", @@ -97,7 +97,7 @@ "StartIncidentOutput$incidentRecordArn": "

The ARN of the newly created incident record.

", "TimelineEvent$incidentRecordArn": "

The Amazon Resource Name (ARN) of the incident that the event occurred during.

", "TriggerDetails$triggerArn": "

The Amazon Resource Name (ARN) of the source that detected the incident.

", - "UpdateDeletionProtectionInput$arn": "

The Amazon Resource Name (ARN) of the replication set you're updating.

", + "UpdateDeletionProtectionInput$arn": "

The Amazon Resource Name (ARN) of the replication set to update.

", "UpdateIncidentRecordInput$arn": "

The Amazon Resource Name (ARN) of the incident record you are updating.

", "UpdateRelatedItemsInput$incidentRecordArn": "

The Amazon Resource Name (ARN) of the incident record containing the related items you are updating.

", "UpdateReplicationSetInput$arn": "

The Amazon Resource Name (ARN) of the replication set you're updating.

", @@ -127,7 +127,7 @@ "base": null, "refs": { "ReplicationSet$deletionProtected": "

Determines if the replication set deletion protection is enabled or not. If deletion protection is enabled, you can't delete the last Amazon Web Services Region in the replication set.

", - "UpdateDeletionProtectionInput$deletionProtected": "

Details if deletion protection is enabled or disabled in your account.

" + "UpdateDeletionProtectionInput$deletionProtected": "

Specifies if deletion protection is turned on or off in your account.

" } }, "ChatChannel": { @@ -149,14 +149,14 @@ "ClientToken": { "base": null, "refs": { - "CreateReplicationSetInput$clientToken": "

A token ensuring that the operation is called only once with the specified details.

", + "CreateReplicationSetInput$clientToken": "

A token that ensures that the operation is called only once with the specified details.

", "CreateResponsePlanInput$clientToken": "

A token ensuring that the operation is called only once with the specified details.

", "CreateTimelineEventInput$clientToken": "

A token ensuring that the action is called only once with the specified details.

", "StartIncidentInput$clientToken": "

A token ensuring that the operation is called only once with the specified details.

", - "UpdateDeletionProtectionInput$clientToken": "

A token ensuring that the operation is called only once with the specified details.

", + "UpdateDeletionProtectionInput$clientToken": "

A token that ensures that the operation is called only once with the specified details.

", "UpdateIncidentRecordInput$clientToken": "

A token that ensures that the operation is called only once with the specified details.

", "UpdateRelatedItemsInput$clientToken": "

A token ensuring that the operation is called only once with the specified details.

", - "UpdateReplicationSetInput$clientToken": "

A token ensuring that the operation is called only once with the specified details.

", + "UpdateReplicationSetInput$clientToken": "

A token that ensures that the operation is called only once with the specified details.

", "UpdateResponsePlanInput$clientToken": "

A token ensuring that the operation is called only once with the specified details.

", "UpdateTimelineEventInput$clientToken": "

A token ensuring that the operation is called only once with the specified details.

" } @@ -293,9 +293,9 @@ "EngagementSet": { "base": null, "refs": { - "CreateResponsePlanInput$engagements": "

The contacts and escalation plans that the response plan engages during an incident.

", - "GetResponsePlanOutput$engagements": "

The contacts and escalation plans that the response plan engages during an incident.

", - "UpdateResponsePlanInput$engagements": "

The contacts and escalation plans that Incident Manager engages at the start of the incident.

" + "CreateResponsePlanInput$engagements": "

The Amazon Resource Name (ARN) for the contacts and escalation plans that the response plan engages during an incident.

", + "GetResponsePlanOutput$engagements": "

The Amazon Resource Name (ARN) for the contacts and escalation plans that the response plan engages during an incident.

", + "UpdateResponsePlanInput$engagements": "

The Amazon Resource Name (ARN) for the contacts and escalation plans that the response plan engages during an incident.

" } }, "EventData": { @@ -576,7 +576,7 @@ "MaxResults": { "base": null, "refs": { - "GetResourcePoliciesInput$maxResults": "

The maximum number of resource policies to display per page of results.

", + "GetResourcePoliciesInput$maxResults": "

The maximum number of resource policies to display for each page of results.

", "ListIncidentRecordsInput$maxResults": "

The maximum number of results per page.

", "ListRelatedItemsInput$maxResults": "

The maximum number of related items per page.

", "ListReplicationSetsInput$maxResults": "

The maximum number of results per page.

", @@ -936,22 +936,23 @@ "TagKeyList": { "base": null, "refs": { - "UntagResourceRequest$tagKeys": "

The name of the tag you're removing from the response plan.

" + "UntagResourceRequest$tagKeys": "

The name of the tag to remove from the response plan.

" } }, "TagMap": { "base": null, "refs": { + "CreateReplicationSetInput$tags": "

A list of tags to add to the replication set.

", "CreateResponsePlanInput$tags": "

A list of tags that you are adding to the response plan.

", - "IncidentTemplate$incidentTags": "

Tags to apply to an incident when calling the StartIncident API action.

", + "IncidentTemplate$incidentTags": "

Tags to assign to the template. When the StartIncident API action is called, Incident Manager assigns the tags specified in the template to the incident.

", "ListTagsForResourceResponse$tags": "

A list of tags for the response plan.

", - "TagResourceRequest$tags": "

A list of tags that you are adding to the response plan.

" + "TagResourceRequest$tags": "

A list of tags to add to the response plan.

" } }, "TagMapUpdate": { "base": null, "refs": { - "UpdateResponsePlanInput$incidentTemplateTags": "

Tags to apply to an incident when calling the StartIncident API action. To call this action, you must also have permission to call the TagResource API action for the incident record resource.

" + "UpdateResponsePlanInput$incidentTemplateTags": "

Tags to assign to the template. When the StartIncident API action is called, Incident Manager assigns the tags specified in the template to the incident. To call this action, you must also have permission to call the TagResource API action for the incident record resource.

" } }, "TagResourceRequest": { diff --git a/models/apis/ssm-incidents/2018-05-10/endpoint-rule-set-1.json b/models/apis/ssm-incidents/2018-05-10/endpoint-rule-set-1.json new file mode 100644 index 0000000000..575ce3d8c2 --- /dev/null +++ b/models/apis/ssm-incidents/2018-05-10/endpoint-rule-set-1.json @@ -0,0 +1,315 @@ +{ + "version": "1.0", + "parameters": { + "Region": { + "builtIn": "AWS::Region", + "required": false, + "documentation": "The AWS region used to dispatch the request.", + "type": "String" + }, + "UseDualStack": { + "builtIn": "AWS::UseDualStack", + "required": true, + "default": false, + "documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.", + "type": "Boolean" + }, + "UseFIPS": { + "builtIn": "AWS::UseFIPS", + "required": true, + "default": false, + "documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.", + "type": "Boolean" + }, + "Endpoint": { + "builtIn": "SDK::Endpoint", + "required": false, + "documentation": "Override the endpoint used to send this request", + "type": "String" + } + }, + "rules": [ + { + "conditions": [ + { + "fn": "aws.partition", + "argv": [ + { + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Endpoint" + } + ] + }, + { + "fn": "parseURL", + "argv": [ + { + "ref": "Endpoint" + } + ], + "assign": "url" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://ssm-incidents-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://ssm-incidents-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://ssm-incidents.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" + } + ] + }, + { + "conditions": [], + "endpoint": { + "url": "https://ssm-incidents.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] +} \ No newline at end of file diff --git a/models/apis/ssm-incidents/2018-05-10/endpoint-tests-1.json b/models/apis/ssm-incidents/2018-05-10/endpoint-tests-1.json new file mode 100644 index 0000000000..9be57ba056 --- /dev/null +++ b/models/apis/ssm-incidents/2018-05-10/endpoint-tests-1.json @@ -0,0 +1,875 @@ +{ + "testCases": [ + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.ap-south-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.ap-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.ap-south-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.ap-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.ca-central-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ca-central-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.ca-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ca-central-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.ca-central-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ca-central-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.ca-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ca-central-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.eu-central-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-central-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.eu-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-central-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.eu-central-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-central-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.eu-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-central-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.us-west-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.us-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.us-west-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.us-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.us-west-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.us-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.us-west-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.us-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.eu-north-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-north-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.eu-north-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-north-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.eu-north-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-north-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.eu-north-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-north-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.eu-west-3.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-3", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.eu-west-3.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-3", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.eu-west-3.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-3", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.eu-west-3.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-3", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.eu-west-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.eu-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.eu-west-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.eu-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.eu-west-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.eu-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.eu-west-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.eu-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.ap-northeast-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-2", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-2", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.ap-northeast-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-2", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-2", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.ap-northeast-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.ap-northeast-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-1", + "UseDualStack": false + } + }, + { + "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.sa-east-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "sa-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.sa-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "sa-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.sa-east-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "sa-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.sa-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "sa-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.ap-southeast-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.ap-southeast-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.ap-southeast-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-2", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-2", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.ap-southeast-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-2", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-2", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.us-east-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.us-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.us-east-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.us-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.us-east-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents-fips.us-east-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-2", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.us-east-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://ssm-incidents.us-east-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-2", + "UseDualStack": false + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips enabled and dualstack disabled", + "expect": { + "error": "Invalid Configuration: FIPS and custom endpoint are not supported" + }, + "params": { + "UseFIPS": true, + "Region": "us-east-1", + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack enabled", + "expect": { + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": true, + "Endpoint": "https://example.com" + } + } + ], + "version": "1.0" +} \ No newline at end of file diff --git a/models/endpoints/endpoints.json b/models/endpoints/endpoints.json index 4b10aa4e1a..8385438b74 100644 --- a/models/endpoints/endpoints.json +++ b/models/endpoints/endpoints.json @@ -8468,7 +8468,12 @@ "deprecated" : true, "hostname" : "lambda-fips.us-west-2.amazonaws.com" }, - "me-central-1" : { }, + "me-central-1" : { + "variants" : [ { + "hostname" : "lambda.me-central-1.api.aws", + "tags" : [ "dualstack" ] + } ] + }, "me-south-1" : { "variants" : [ { "hostname" : "lambda.me-south-1.api.aws", diff --git a/service/iotsitewise/api.go b/service/iotsitewise/api.go index 1432e8ff79..f06d6660f9 100644 --- a/service/iotsitewise/api.go +++ b/service/iotsitewise/api.go @@ -1073,8 +1073,8 @@ func (c *IoTSiteWise) CreateAccessPolicyRequest(input *CreateAccessPolicyInput) // CreateAccessPolicy API operation for AWS IoT SiteWise. // -// Creates an access policy that grants the specified identity (Amazon Web Services -// SSO user, Amazon Web Services SSO group, or IAM user) access to the specified +// Creates an access policy that grants the specified identity (IAM Identity +// Center user, IAM Identity Center group, or IAM user) access to the specified // IoT SiteWise Monitor portal or project resource. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -1737,8 +1737,8 @@ func (c *IoTSiteWise) CreatePortalRequest(input *CreatePortalInput) (req *reques // CreatePortal API operation for AWS IoT SiteWise. // // Creates a portal, which can contain projects and dashboards. IoT SiteWise -// Monitor uses Amazon Web Services SSO or IAM to authenticate portal users -// and manage user permissions. +// Monitor uses IAM Identity Center or IAM to authenticate portal users and +// manage user permissions. // // Before you can sign in to a new portal, you must add at least one identity // to that portal. For more information, see Adding or removing portal administrators @@ -4964,9 +4964,9 @@ func (c *IoTSiteWise) ListAccessPoliciesRequest(input *ListAccessPoliciesInput) // ListAccessPolicies API operation for AWS IoT SiteWise. // -// Retrieves a paginated list of access policies for an identity (an Amazon -// Web Services SSO user, an Amazon Web Services SSO group, or an IAM user) -// or an IoT SiteWise Monitor resource (a portal or project). +// Retrieves a paginated list of access policies for an identity (an IAM Identity +// Center user, an IAM Identity Center group, or an IAM user) or an IoT SiteWise +// Monitor resource (a portal or project). // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -5065,6 +5065,161 @@ func (c *IoTSiteWise) ListAccessPoliciesPagesWithContext(ctx aws.Context, input return p.Err() } +const opListAssetModelProperties = "ListAssetModelProperties" + +// ListAssetModelPropertiesRequest generates a "aws/request.Request" representing the +// client's request for the ListAssetModelProperties operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See ListAssetModelProperties for more information on using the ListAssetModelProperties +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the ListAssetModelPropertiesRequest method. +// req, resp := client.ListAssetModelPropertiesRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/iotsitewise-2019-12-02/ListAssetModelProperties +func (c *IoTSiteWise) ListAssetModelPropertiesRequest(input *ListAssetModelPropertiesInput) (req *request.Request, output *ListAssetModelPropertiesOutput) { + op := &request.Operation{ + Name: opListAssetModelProperties, + HTTPMethod: "GET", + HTTPPath: "/asset-models/{assetModelId}/properties", + Paginator: &request.Paginator{ + InputTokens: []string{"nextToken"}, + OutputTokens: []string{"nextToken"}, + LimitToken: "maxResults", + TruncationToken: "", + }, + } + + if input == nil { + input = &ListAssetModelPropertiesInput{} + } + + output = &ListAssetModelPropertiesOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Build.PushBackNamed(protocol.NewHostPrefixHandler("api.", nil)) + req.Handlers.Build.PushBackNamed(protocol.ValidateEndpointHostHandler) + return +} + +// ListAssetModelProperties API operation for AWS IoT SiteWise. +// +// Retrieves a paginated list of properties associated with an asset model. +// If you update properties associated with the model before you finish listing +// all the properties, you need to start all over again. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS IoT SiteWise's +// API operation ListAssetModelProperties for usage and error information. +// +// Returned Error Types: +// +// - InvalidRequestException +// The request isn't valid. This can occur if your request contains malformed +// JSON or unsupported characters. Check your request and try again. +// +// - InternalFailureException +// IoT SiteWise can't process your request right now. Try again later. +// +// - ResourceNotFoundException +// The requested resource can't be found. +// +// - ThrottlingException +// Your request exceeded a rate limit. For example, you might have exceeded +// the number of IoT SiteWise assets that can be created per second, the allowed +// number of messages per second, and so on. +// +// For more information, see Quotas (https://docs.aws.amazon.com/iot-sitewise/latest/userguide/quotas.html) +// in the IoT SiteWise User Guide. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/iotsitewise-2019-12-02/ListAssetModelProperties +func (c *IoTSiteWise) ListAssetModelProperties(input *ListAssetModelPropertiesInput) (*ListAssetModelPropertiesOutput, error) { + req, out := c.ListAssetModelPropertiesRequest(input) + return out, req.Send() +} + +// ListAssetModelPropertiesWithContext is the same as ListAssetModelProperties with the addition of +// the ability to pass a context and additional request options. +// +// See ListAssetModelProperties for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *IoTSiteWise) ListAssetModelPropertiesWithContext(ctx aws.Context, input *ListAssetModelPropertiesInput, opts ...request.Option) (*ListAssetModelPropertiesOutput, error) { + req, out := c.ListAssetModelPropertiesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListAssetModelPropertiesPages iterates over the pages of a ListAssetModelProperties operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListAssetModelProperties method for more information on how to use this operation. +// +// Note: This operation can generate multiple requests to a service. +// +// // Example iterating over at most 3 pages of a ListAssetModelProperties operation. +// pageNum := 0 +// err := client.ListAssetModelPropertiesPages(params, +// func(page *iotsitewise.ListAssetModelPropertiesOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +func (c *IoTSiteWise) ListAssetModelPropertiesPages(input *ListAssetModelPropertiesInput, fn func(*ListAssetModelPropertiesOutput, bool) bool) error { + return c.ListAssetModelPropertiesPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListAssetModelPropertiesPagesWithContext same as ListAssetModelPropertiesPages except +// it takes a Context and allows setting request options on the pages. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *IoTSiteWise) ListAssetModelPropertiesPagesWithContext(ctx aws.Context, input *ListAssetModelPropertiesInput, fn func(*ListAssetModelPropertiesOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListAssetModelPropertiesInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListAssetModelPropertiesRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListAssetModelPropertiesOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + const opListAssetModels = "ListAssetModels" // ListAssetModelsRequest generates a "aws/request.Request" representing the @@ -5215,6 +5370,161 @@ func (c *IoTSiteWise) ListAssetModelsPagesWithContext(ctx aws.Context, input *Li return p.Err() } +const opListAssetProperties = "ListAssetProperties" + +// ListAssetPropertiesRequest generates a "aws/request.Request" representing the +// client's request for the ListAssetProperties operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See ListAssetProperties for more information on using the ListAssetProperties +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the ListAssetPropertiesRequest method. +// req, resp := client.ListAssetPropertiesRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/iotsitewise-2019-12-02/ListAssetProperties +func (c *IoTSiteWise) ListAssetPropertiesRequest(input *ListAssetPropertiesInput) (req *request.Request, output *ListAssetPropertiesOutput) { + op := &request.Operation{ + Name: opListAssetProperties, + HTTPMethod: "GET", + HTTPPath: "/assets/{assetId}/properties", + Paginator: &request.Paginator{ + InputTokens: []string{"nextToken"}, + OutputTokens: []string{"nextToken"}, + LimitToken: "maxResults", + TruncationToken: "", + }, + } + + if input == nil { + input = &ListAssetPropertiesInput{} + } + + output = &ListAssetPropertiesOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Build.PushBackNamed(protocol.NewHostPrefixHandler("api.", nil)) + req.Handlers.Build.PushBackNamed(protocol.ValidateEndpointHostHandler) + return +} + +// ListAssetProperties API operation for AWS IoT SiteWise. +// +// Retrieves a paginated list of properties associated with an asset. If you +// update properties associated with the model before you finish listing all +// the properties, you need to start all over again. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS IoT SiteWise's +// API operation ListAssetProperties for usage and error information. +// +// Returned Error Types: +// +// - InvalidRequestException +// The request isn't valid. This can occur if your request contains malformed +// JSON or unsupported characters. Check your request and try again. +// +// - InternalFailureException +// IoT SiteWise can't process your request right now. Try again later. +// +// - ResourceNotFoundException +// The requested resource can't be found. +// +// - ThrottlingException +// Your request exceeded a rate limit. For example, you might have exceeded +// the number of IoT SiteWise assets that can be created per second, the allowed +// number of messages per second, and so on. +// +// For more information, see Quotas (https://docs.aws.amazon.com/iot-sitewise/latest/userguide/quotas.html) +// in the IoT SiteWise User Guide. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/iotsitewise-2019-12-02/ListAssetProperties +func (c *IoTSiteWise) ListAssetProperties(input *ListAssetPropertiesInput) (*ListAssetPropertiesOutput, error) { + req, out := c.ListAssetPropertiesRequest(input) + return out, req.Send() +} + +// ListAssetPropertiesWithContext is the same as ListAssetProperties with the addition of +// the ability to pass a context and additional request options. +// +// See ListAssetProperties for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *IoTSiteWise) ListAssetPropertiesWithContext(ctx aws.Context, input *ListAssetPropertiesInput, opts ...request.Option) (*ListAssetPropertiesOutput, error) { + req, out := c.ListAssetPropertiesRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListAssetPropertiesPages iterates over the pages of a ListAssetProperties operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListAssetProperties method for more information on how to use this operation. +// +// Note: This operation can generate multiple requests to a service. +// +// // Example iterating over at most 3 pages of a ListAssetProperties operation. +// pageNum := 0 +// err := client.ListAssetPropertiesPages(params, +// func(page *iotsitewise.ListAssetPropertiesOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +func (c *IoTSiteWise) ListAssetPropertiesPages(input *ListAssetPropertiesInput, fn func(*ListAssetPropertiesOutput, bool) bool) error { + return c.ListAssetPropertiesPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListAssetPropertiesPagesWithContext same as ListAssetPropertiesPages except +// it takes a Context and allows setting request options on the pages. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *IoTSiteWise) ListAssetPropertiesPagesWithContext(ctx aws.Context, input *ListAssetPropertiesInput, fn func(*ListAssetPropertiesOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListAssetPropertiesInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListAssetPropertiesRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListAssetPropertiesOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + const opListAssetRelationships = "ListAssetRelationships" // ListAssetRelationshipsRequest generates a "aws/request.Request" representing the @@ -8368,8 +8678,8 @@ type AccessPolicySummary struct { // Id is a required field Id *string `locationName:"id" min:"36" type:"string" required:"true"` - // The identity (an Amazon Web Services SSO user, an Amazon Web Services SSO - // group, or an IAM user). + // The identity (an IAM Identity Center user, an IAM Identity Center group, + // or an IAM user). // // Identity is a required field Identity *Identity `locationName:"identity" type:"structure" required:"true"` @@ -8654,6 +8964,9 @@ type AssetCompositeModel struct { // The description of the composite model. Description *string `locationName:"description" min:"1" type:"string"` + // The ID of the asset composite model. + Id *string `locationName:"id" min:"36" type:"string"` + // The name of the composite model. // // Name is a required field @@ -8695,6 +9008,12 @@ func (s *AssetCompositeModel) SetDescription(v string) *AssetCompositeModel { return s } +// SetId sets the Id field's value. +func (s *AssetCompositeModel) SetId(v string) *AssetCompositeModel { + s.Id = &v + return s +} + // SetName sets the Name field's value. func (s *AssetCompositeModel) SetName(v string) *AssetCompositeModel { s.Name = &v @@ -8865,6 +9184,9 @@ type AssetModelCompositeModel struct { // The description of the composite model. Description *string `locationName:"description" min:"1" type:"string"` + // The ID of the asset model composite model. + Id *string `locationName:"id" min:"36" type:"string"` + // The name of the composite model. // // Name is a required field @@ -8904,6 +9226,9 @@ func (s *AssetModelCompositeModel) Validate() error { if s.Description != nil && len(*s.Description) < 1 { invalidParams.Add(request.NewErrParamMinLen("Description", 1)) } + if s.Id != nil && len(*s.Id) < 36 { + invalidParams.Add(request.NewErrParamMinLen("Id", 36)) + } if s.Name == nil { invalidParams.Add(request.NewErrParamRequired("Name")) } @@ -8939,6 +9264,12 @@ func (s *AssetModelCompositeModel) SetDescription(v string) *AssetModelComposite return s } +// SetId sets the Id field's value. +func (s *AssetModelCompositeModel) SetId(v string) *AssetModelCompositeModel { + s.Id = &v + return s +} + // SetName sets the Name field's value. func (s *AssetModelCompositeModel) SetName(v string) *AssetModelCompositeModel { s.Name = &v @@ -9450,6 +9781,100 @@ func (s *AssetModelPropertyDefinition) SetUnit(v string) *AssetModelPropertyDefi return s } +// Contains a summary of a property associated with a model. +type AssetModelPropertySummary struct { + _ struct{} `type:"structure"` + + // The ID of the composite model that contains the asset model property. + AssetModelCompositeModelId *string `locationName:"assetModelCompositeModelId" min:"36" type:"string"` + + // The data type of the property. + // + // DataType is a required field + DataType *string `locationName:"dataType" type:"string" required:"true" enum:"PropertyDataType"` + + // The data type of the structure for this property. This parameter exists on + // properties that have the STRUCT data type. + DataTypeSpec *string `locationName:"dataTypeSpec" min:"1" type:"string"` + + // The ID of the property. + Id *string `locationName:"id" min:"36" type:"string"` + + // The name of the property. + // + // Name is a required field + Name *string `locationName:"name" min:"1" type:"string" required:"true"` + + // Contains a property type, which can be one of attribute, measurement, metric, + // or transform. + // + // Type is a required field + Type *PropertyType `locationName:"type" type:"structure" required:"true"` + + // The unit (such as Newtons or RPM) of the property. + Unit *string `locationName:"unit" min:"1" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s AssetModelPropertySummary) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s AssetModelPropertySummary) GoString() string { + return s.String() +} + +// SetAssetModelCompositeModelId sets the AssetModelCompositeModelId field's value. +func (s *AssetModelPropertySummary) SetAssetModelCompositeModelId(v string) *AssetModelPropertySummary { + s.AssetModelCompositeModelId = &v + return s +} + +// SetDataType sets the DataType field's value. +func (s *AssetModelPropertySummary) SetDataType(v string) *AssetModelPropertySummary { + s.DataType = &v + return s +} + +// SetDataTypeSpec sets the DataTypeSpec field's value. +func (s *AssetModelPropertySummary) SetDataTypeSpec(v string) *AssetModelPropertySummary { + s.DataTypeSpec = &v + return s +} + +// SetId sets the Id field's value. +func (s *AssetModelPropertySummary) SetId(v string) *AssetModelPropertySummary { + s.Id = &v + return s +} + +// SetName sets the Name field's value. +func (s *AssetModelPropertySummary) SetName(v string) *AssetModelPropertySummary { + s.Name = &v + return s +} + +// SetType sets the Type field's value. +func (s *AssetModelPropertySummary) SetType(v *PropertyType) *AssetModelPropertySummary { + s.Type = v + return s +} + +// SetUnit sets the Unit field's value. +func (s *AssetModelPropertySummary) SetUnit(v string) *AssetModelPropertySummary { + s.Unit = &v + return s +} + // Contains current status information for an asset model. For more information, // see Asset and model states (https://docs.aws.amazon.com/iot-sitewise/latest/userguide/asset-and-model-states.html) // in the IoT SiteWise User Guide. @@ -9671,26 +10096,100 @@ func (s *AssetProperty) SetDataTypeSpec(v string) *AssetProperty { return s } -// SetId sets the Id field's value. -func (s *AssetProperty) SetId(v string) *AssetProperty { - s.Id = &v +// SetId sets the Id field's value. +func (s *AssetProperty) SetId(v string) *AssetProperty { + s.Id = &v + return s +} + +// SetName sets the Name field's value. +func (s *AssetProperty) SetName(v string) *AssetProperty { + s.Name = &v + return s +} + +// SetNotification sets the Notification field's value. +func (s *AssetProperty) SetNotification(v *PropertyNotification) *AssetProperty { + s.Notification = v + return s +} + +// SetUnit sets the Unit field's value. +func (s *AssetProperty) SetUnit(v string) *AssetProperty { + s.Unit = &v + return s +} + +// Contains a summary of a property associated with an asset. +type AssetPropertySummary struct { + _ struct{} `type:"structure"` + + // The alias that identifies the property, such as an OPC-UA server data stream + // path (for example, /company/windfarm/3/turbine/7/temperature). For more information, + // see Mapping industrial data streams to asset properties (https://docs.aws.amazon.com/iot-sitewise/latest/userguide/connect-data-streams.html) + // in the IoT SiteWise User Guide. + Alias *string `locationName:"alias" min:"1" type:"string"` + + // The ID of the composite model that contains the asset property. + AssetCompositeModelId *string `locationName:"assetCompositeModelId" min:"36" type:"string"` + + // The ID of the property. + Id *string `locationName:"id" min:"36" type:"string"` + + // Contains asset property value notification information. When the notification + // state is enabled, IoT SiteWise publishes property value updates to a unique + // MQTT topic. For more information, see Interacting with other services (https://docs.aws.amazon.com/iot-sitewise/latest/userguide/interact-with-other-services.html) + // in the IoT SiteWise User Guide. + Notification *PropertyNotification `locationName:"notification" type:"structure"` + + // The unit of measure (such as Newtons or RPM) of the asset property. + Unit *string `locationName:"unit" min:"1" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s AssetPropertySummary) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s AssetPropertySummary) GoString() string { + return s.String() +} + +// SetAlias sets the Alias field's value. +func (s *AssetPropertySummary) SetAlias(v string) *AssetPropertySummary { + s.Alias = &v + return s +} + +// SetAssetCompositeModelId sets the AssetCompositeModelId field's value. +func (s *AssetPropertySummary) SetAssetCompositeModelId(v string) *AssetPropertySummary { + s.AssetCompositeModelId = &v return s } -// SetName sets the Name field's value. -func (s *AssetProperty) SetName(v string) *AssetProperty { - s.Name = &v +// SetId sets the Id field's value. +func (s *AssetPropertySummary) SetId(v string) *AssetPropertySummary { + s.Id = &v return s } // SetNotification sets the Notification field's value. -func (s *AssetProperty) SetNotification(v *PropertyNotification) *AssetProperty { +func (s *AssetPropertySummary) SetNotification(v *PropertyNotification) *AssetPropertySummary { s.Notification = v return s } // SetUnit sets the Unit field's value. -func (s *AssetProperty) SetUnit(v string) *AssetProperty { +func (s *AssetPropertySummary) SetUnit(v string) *AssetPropertySummary { s.Unit = &v return s } @@ -12331,6 +12830,9 @@ type CompositeModelProperty struct { // AssetProperty is a required field AssetProperty *Property `locationName:"assetProperty" type:"structure" required:"true"` + // The ID of the composite model that contains the property. + Id *string `locationName:"id" min:"36" type:"string"` + // The name of the property. // // Name is a required field @@ -12366,6 +12868,12 @@ func (s *CompositeModelProperty) SetAssetProperty(v *Property) *CompositeModelPr return s } +// SetId sets the Id field's value. +func (s *CompositeModelProperty) SetId(v string) *CompositeModelProperty { + s.Id = &v + return s +} + // SetName sets the Name field's value. func (s *CompositeModelProperty) SetName(v string) *CompositeModelProperty { s.Name = &v @@ -12544,8 +13052,8 @@ func (s *ConflictingOperationException) RequestID() string { type CreateAccessPolicyInput struct { _ struct{} `type:"structure"` - // The identity for this access policy. Choose an Amazon Web Services SSO user, - // an Amazon Web Services SSO group, or an IAM user. + // The identity for this access policy. Choose an IAM Identity Center user, + // an IAM Identity Center group, or an IAM user. // // AccessPolicyIdentity is a required field AccessPolicyIdentity *Identity `locationName:"accessPolicyIdentity" type:"structure" required:"true"` @@ -13620,10 +14128,10 @@ type CreatePortalInput struct { // The service to use to authenticate users to the portal. Choose from the following // options: // - // * SSO – The portal uses Amazon Web Services Single Sign On to authenticate - // users and manage user permissions. Before you can create a portal that - // uses Amazon Web Services SSO, you must enable Amazon Web Services SSO. - // For more information, see Enabling Amazon Web Services SSO (https://docs.aws.amazon.com/iot-sitewise/latest/userguide/monitor-get-started.html#mon-gs-sso) + // * SSO – The portal uses IAM Identity Center (successor to Single Sign-On) + // to authenticate users and manage user permissions. Before you can create + // a portal that uses IAM Identity Center, you must enable IAM Identity Center. + // For more information, see Enabling IAM Identity Center (https://docs.aws.amazon.com/iot-sitewise/latest/userguide/monitor-get-started.html#mon-gs-sso) // in the IoT SiteWise User Guide. This option is only available in Amazon // Web Services Regions other than the China Regions. // @@ -13812,9 +14320,9 @@ type CreatePortalOutput struct { PortalId *string `locationName:"portalId" min:"36" type:"string" required:"true"` // The URL for the IoT SiteWise Monitor portal. You can use this URL to access - // portals that use Amazon Web Services SSO for authentication. For portals - // that use IAM for authentication, you must use the IoT SiteWise console to - // get a URL that you can use to access the portal. + // portals that use IAM Identity Center for authentication. For portals that + // use IAM for authentication, you must use the IoT SiteWise console to get + // a URL that you can use to access the portal. // // PortalStartUrl is a required field PortalStartUrl *string `locationName:"portalStartUrl" min:"1" type:"string" required:"true"` @@ -13825,8 +14333,8 @@ type CreatePortalOutput struct { // PortalStatus is a required field PortalStatus *PortalStatus `locationName:"portalStatus" type:"structure" required:"true"` - // The associated Amazon Web Services SSO application ID, if the portal uses - // Amazon Web Services SSO. + // The associated IAM Identity Center application ID, if the portal uses IAM + // Identity Center. // // SsoApplicationId is a required field SsoApplicationId *string `locationName:"ssoApplicationId" min:"1" type:"string" required:"true"` @@ -15000,8 +15508,8 @@ type DescribeAccessPolicyOutput struct { // AccessPolicyId is a required field AccessPolicyId *string `locationName:"accessPolicyId" min:"36" type:"string" required:"true"` - // The identity (Amazon Web Services SSO user, Amazon Web Services SSO group, - // or IAM user) to which this access policy applies. + // The identity (IAM Identity Center user, IAM Identity Center group, or IAM + // user) to which this access policy applies. // // AccessPolicyIdentity is a required field AccessPolicyIdentity *Identity `locationName:"accessPolicyIdentity" type:"structure" required:"true"` @@ -15091,6 +15599,9 @@ type DescribeAssetInput struct { // // AssetId is a required field AssetId *string `location:"uri" locationName:"assetId" min:"36" type:"string" required:"true"` + + // Whether or not to exclude asset properties from the response. + ExcludeProperties *bool `location:"querystring" locationName:"excludeProperties" type:"boolean"` } // String returns the string representation. @@ -15133,6 +15644,12 @@ func (s *DescribeAssetInput) SetAssetId(v string) *DescribeAssetInput { return s } +// SetExcludeProperties sets the ExcludeProperties field's value. +func (s *DescribeAssetInput) SetExcludeProperties(v bool) *DescribeAssetInput { + s.ExcludeProperties = &v + return s +} + type DescribeAssetModelInput struct { _ struct{} `type:"structure" nopayload:"true"` @@ -15140,6 +15657,9 @@ type DescribeAssetModelInput struct { // // AssetModelId is a required field AssetModelId *string `location:"uri" locationName:"assetModelId" min:"36" type:"string" required:"true"` + + // Whether or not to exclude asset model properties from the response. + ExcludeProperties *bool `location:"querystring" locationName:"excludeProperties" type:"boolean"` } // String returns the string representation. @@ -15182,6 +15702,12 @@ func (s *DescribeAssetModelInput) SetAssetModelId(v string) *DescribeAssetModelI return s } +// SetExcludeProperties sets the ExcludeProperties field's value. +func (s *DescribeAssetModelInput) SetExcludeProperties(v bool) *DescribeAssetModelInput { + s.ExcludeProperties = &v + return s +} + type DescribeAssetModelOutput struct { _ struct{} `type:"structure"` @@ -16464,9 +16990,9 @@ type DescribePortalOutput struct { // The service to use to authenticate users to the portal. PortalAuthMode *string `locationName:"portalAuthMode" type:"string" enum:"AuthMode"` - // The Amazon Web Services SSO application generated client ID (used with Amazon - // Web Services SSO APIs). IoT SiteWise includes portalClientId for only portals - // that use Amazon Web Services SSO to authenticate users. + // The IAM Identity Center application generated client ID (used with IAM Identity + // Center APIs). IoT SiteWise includes portalClientId for only portals that + // use IAM Identity Center to authenticate users. // // PortalClientId is a required field PortalClientId *string `locationName:"portalClientId" min:"1" type:"string" required:"true"` @@ -16503,9 +17029,9 @@ type DescribePortalOutput struct { PortalName *string `locationName:"portalName" min:"1" type:"string" required:"true"` // The URL for the IoT SiteWise Monitor portal. You can use this URL to access - // portals that use Amazon Web Services SSO for authentication. For portals - // that use IAM for authentication, you must use the IoT SiteWise console to - // get a URL that you can use to access the portal. + // portals that use IAM Identity Center for authentication. For portals that + // use IAM for authentication, you must use the IoT SiteWise console to get + // a URL that you can use to access the portal. // // PortalStartUrl is a required field PortalStartUrl *string `locationName:"portalStartUrl" min:"1" type:"string" required:"true"` @@ -18843,7 +19369,7 @@ func (s *GreengrassV2) SetCoreDeviceThingName(v string) *GreengrassV2 { type GroupIdentity struct { _ struct{} `type:"structure"` - // The Amazon Web Services SSO ID of the group. + // The IAM Identity Center ID of the group. // // Id is a required field Id *string `locationName:"id" min:"1" type:"string" required:"true"` @@ -18999,14 +19525,13 @@ func (s *IAMUserIdentity) SetArn(v string) *IAMUserIdentity { // Contains an identity that can access an IoT SiteWise Monitor resource. // -// Currently, you can't use Amazon Web Services APIs to retrieve Amazon Web -// Services SSO identity IDs. You can find the Amazon Web Services SSO identity -// IDs in the URL of user and group pages in the Amazon Web Services SSO console -// (https://console.aws.amazon.com/singlesignon). +// Currently, you can't use Amazon Web Services APIs to retrieve IAM Identity +// Center identity IDs. You can find the IAM Identity Center identity IDs in +// the URL of user and group pages in the IAM Identity Center console (https://console.aws.amazon.com/singlesignon). type Identity struct { _ struct{} `type:"structure"` - // An Amazon Web Services SSO group identity. + // An IAM Identity Center group identity. Group *GroupIdentity `locationName:"group" type:"structure"` // An IAM role identity. @@ -19015,7 +19540,7 @@ type Identity struct { // An IAM user identity. IamUser *IAMUserIdentity `locationName:"iamUser" type:"structure"` - // An Amazon Web Services SSO user identity. + // An IAM Identity Center user identity. User *UserIdentity `locationName:"user" type:"structure"` } @@ -19645,8 +20170,8 @@ type ListAccessPoliciesInput struct { // GROUP for identityType. IdentityId *string `location:"querystring" locationName:"identityId" min:"1" type:"string"` - // The type of identity (Amazon Web Services SSO user, Amazon Web Services SSO - // group, or IAM user). This parameter is required if you specify identityId. + // The type of identity (IAM Identity Center user, IAM Identity Center group, + // or IAM user). This parameter is required if you specify identityId. IdentityType *string `location:"querystring" locationName:"identityType" type:"string" enum:"IdentityType"` // The maximum number of results to return for each paginated request. @@ -19793,6 +20318,142 @@ func (s *ListAccessPoliciesOutput) SetNextToken(v string) *ListAccessPoliciesOut return s } +type ListAssetModelPropertiesInput struct { + _ struct{} `type:"structure" nopayload:"true"` + + // The ID of the asset model. + // + // AssetModelId is a required field + AssetModelId *string `location:"uri" locationName:"assetModelId" min:"36" type:"string" required:"true"` + + // Filters the requested list of asset model properties. You can choose one + // of the following options: + // + // * ALL – The list includes all asset model properties for a given asset + // model ID. + // + // * BASE – The list includes only base asset model properties for a given + // asset model ID. + // + // Default: BASE + Filter *string `location:"querystring" locationName:"filter" type:"string" enum:"ListAssetModelPropertiesFilter"` + + // The maximum number of results to return for each paginated request. If not + // specified, the default value is 50. + MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` + + // The token to be used for the next set of paginated results. + NextToken *string `location:"querystring" locationName:"nextToken" min:"1" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListAssetModelPropertiesInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListAssetModelPropertiesInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListAssetModelPropertiesInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListAssetModelPropertiesInput"} + if s.AssetModelId == nil { + invalidParams.Add(request.NewErrParamRequired("AssetModelId")) + } + if s.AssetModelId != nil && len(*s.AssetModelId) < 36 { + invalidParams.Add(request.NewErrParamMinLen("AssetModelId", 36)) + } + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + if s.NextToken != nil && len(*s.NextToken) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NextToken", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAssetModelId sets the AssetModelId field's value. +func (s *ListAssetModelPropertiesInput) SetAssetModelId(v string) *ListAssetModelPropertiesInput { + s.AssetModelId = &v + return s +} + +// SetFilter sets the Filter field's value. +func (s *ListAssetModelPropertiesInput) SetFilter(v string) *ListAssetModelPropertiesInput { + s.Filter = &v + return s +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListAssetModelPropertiesInput) SetMaxResults(v int64) *ListAssetModelPropertiesInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListAssetModelPropertiesInput) SetNextToken(v string) *ListAssetModelPropertiesInput { + s.NextToken = &v + return s +} + +type ListAssetModelPropertiesOutput struct { + _ struct{} `type:"structure"` + + // A list that summarizes the properties associated with the specified asset + // model. + // + // AssetModelPropertySummaries is a required field + AssetModelPropertySummaries []*AssetModelPropertySummary `locationName:"assetModelPropertySummaries" type:"list" required:"true"` + + // The token for the next set of results, or null if there are no additional + // results. + NextToken *string `locationName:"nextToken" min:"1" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListAssetModelPropertiesOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListAssetModelPropertiesOutput) GoString() string { + return s.String() +} + +// SetAssetModelPropertySummaries sets the AssetModelPropertySummaries field's value. +func (s *ListAssetModelPropertiesOutput) SetAssetModelPropertySummaries(v []*AssetModelPropertySummary) *ListAssetModelPropertiesOutput { + s.AssetModelPropertySummaries = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListAssetModelPropertiesOutput) SetNextToken(v string) *ListAssetModelPropertiesOutput { + s.NextToken = &v + return s +} + type ListAssetModelsInput struct { _ struct{} `type:"structure" nopayload:"true"` @@ -19894,6 +20555,141 @@ func (s *ListAssetModelsOutput) SetNextToken(v string) *ListAssetModelsOutput { return s } +type ListAssetPropertiesInput struct { + _ struct{} `type:"structure" nopayload:"true"` + + // The ID of the asset. + // + // AssetId is a required field + AssetId *string `location:"uri" locationName:"assetId" min:"36" type:"string" required:"true"` + + // Filters the requested list of asset properties. You can choose one of the + // following options: + // + // * ALL – The list includes all asset properties for a given asset model + // ID. + // + // * BASE – The list includes only base asset properties for a given asset + // model ID. + // + // Default: BASE + Filter *string `location:"querystring" locationName:"filter" type:"string" enum:"ListAssetPropertiesFilter"` + + // The maximum number of results to return for each paginated request. If not + // specified, the default value is 50. + MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` + + // The token to be used for the next set of paginated results. + NextToken *string `location:"querystring" locationName:"nextToken" min:"1" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListAssetPropertiesInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListAssetPropertiesInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListAssetPropertiesInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListAssetPropertiesInput"} + if s.AssetId == nil { + invalidParams.Add(request.NewErrParamRequired("AssetId")) + } + if s.AssetId != nil && len(*s.AssetId) < 36 { + invalidParams.Add(request.NewErrParamMinLen("AssetId", 36)) + } + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + if s.NextToken != nil && len(*s.NextToken) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NextToken", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAssetId sets the AssetId field's value. +func (s *ListAssetPropertiesInput) SetAssetId(v string) *ListAssetPropertiesInput { + s.AssetId = &v + return s +} + +// SetFilter sets the Filter field's value. +func (s *ListAssetPropertiesInput) SetFilter(v string) *ListAssetPropertiesInput { + s.Filter = &v + return s +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListAssetPropertiesInput) SetMaxResults(v int64) *ListAssetPropertiesInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListAssetPropertiesInput) SetNextToken(v string) *ListAssetPropertiesInput { + s.NextToken = &v + return s +} + +type ListAssetPropertiesOutput struct { + _ struct{} `type:"structure"` + + // A list that summarizes the properties associated with the specified asset. + // + // AssetPropertySummaries is a required field + AssetPropertySummaries []*AssetPropertySummary `locationName:"assetPropertySummaries" type:"list" required:"true"` + + // The token for the next set of results, or null if there are no additional + // results. + NextToken *string `locationName:"nextToken" min:"1" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListAssetPropertiesOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListAssetPropertiesOutput) GoString() string { + return s.String() +} + +// SetAssetPropertySummaries sets the AssetPropertySummaries field's value. +func (s *ListAssetPropertiesOutput) SetAssetPropertySummaries(v []*AssetPropertySummary) *ListAssetPropertiesOutput { + s.AssetPropertySummaries = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListAssetPropertiesOutput) SetNextToken(v string) *ListAssetPropertiesOutput { + s.NextToken = &v + return s +} + type ListAssetRelationshipsInput struct { _ struct{} `type:"structure" nopayload:"true"` @@ -21788,9 +22584,9 @@ type PortalSummary struct { RoleArn *string `locationName:"roleArn" min:"1" type:"string"` // The URL for the IoT SiteWise Monitor portal. You can use this URL to access - // portals that use Amazon Web Services SSO for authentication. For portals - // that use IAM for authentication, you must use the IoT SiteWise console to - // get a URL that you can use to access the portal. + // portals that use IAM Identity Center for authentication. For portals that + // use IAM for authentication, you must use the IoT SiteWise console to get + // a URL that you can use to access the portal. // // StartUrl is a required field StartUrl *string `locationName:"startUrl" min:"1" type:"string" required:"true"` @@ -23887,8 +24683,8 @@ type UpdateAccessPolicyInput struct { // AccessPolicyId is a required field AccessPolicyId *string `location:"uri" locationName:"accessPolicyId" min:"36" type:"string" required:"true"` - // The identity for this access policy. Choose an Amazon Web Services SSO user, - // an Amazon Web Services SSO group, or an IAM user. + // The identity for this access policy. Choose an IAM Identity Center user, + // an IAM Identity Center group, or an IAM user. // // AccessPolicyIdentity is a required field AccessPolicyIdentity *Identity `locationName:"accessPolicyIdentity" type:"structure" required:"true"` @@ -25183,7 +25979,7 @@ func (s UpdateProjectOutput) GoString() string { type UserIdentity struct { _ struct{} `type:"structure"` - // The Amazon Web Services SSO ID of the user. + // The IAM Identity Center ID of the user. // // Id is a required field Id *string `locationName:"id" min:"1" type:"string" required:"true"` @@ -25854,6 +26650,38 @@ func JobStatus_Values() []string { } } +const ( + // ListAssetModelPropertiesFilterAll is a ListAssetModelPropertiesFilter enum value + ListAssetModelPropertiesFilterAll = "ALL" + + // ListAssetModelPropertiesFilterBase is a ListAssetModelPropertiesFilter enum value + ListAssetModelPropertiesFilterBase = "BASE" +) + +// ListAssetModelPropertiesFilter_Values returns all elements of the ListAssetModelPropertiesFilter enum +func ListAssetModelPropertiesFilter_Values() []string { + return []string{ + ListAssetModelPropertiesFilterAll, + ListAssetModelPropertiesFilterBase, + } +} + +const ( + // ListAssetPropertiesFilterAll is a ListAssetPropertiesFilter enum value + ListAssetPropertiesFilterAll = "ALL" + + // ListAssetPropertiesFilterBase is a ListAssetPropertiesFilter enum value + ListAssetPropertiesFilterBase = "BASE" +) + +// ListAssetPropertiesFilter_Values returns all elements of the ListAssetPropertiesFilter enum +func ListAssetPropertiesFilter_Values() []string { + return []string{ + ListAssetPropertiesFilterAll, + ListAssetPropertiesFilterBase, + } +} + const ( // ListAssetsFilterAll is a ListAssetsFilter enum value ListAssetsFilterAll = "ALL" diff --git a/service/iotsitewise/iotsitewiseiface/interface.go b/service/iotsitewise/iotsitewiseiface/interface.go index 4d02b30a80..8a39bc19a8 100644 --- a/service/iotsitewise/iotsitewiseiface/interface.go +++ b/service/iotsitewise/iotsitewiseiface/interface.go @@ -261,6 +261,13 @@ type IoTSiteWiseAPI interface { ListAccessPoliciesPages(*iotsitewise.ListAccessPoliciesInput, func(*iotsitewise.ListAccessPoliciesOutput, bool) bool) error ListAccessPoliciesPagesWithContext(aws.Context, *iotsitewise.ListAccessPoliciesInput, func(*iotsitewise.ListAccessPoliciesOutput, bool) bool, ...request.Option) error + ListAssetModelProperties(*iotsitewise.ListAssetModelPropertiesInput) (*iotsitewise.ListAssetModelPropertiesOutput, error) + ListAssetModelPropertiesWithContext(aws.Context, *iotsitewise.ListAssetModelPropertiesInput, ...request.Option) (*iotsitewise.ListAssetModelPropertiesOutput, error) + ListAssetModelPropertiesRequest(*iotsitewise.ListAssetModelPropertiesInput) (*request.Request, *iotsitewise.ListAssetModelPropertiesOutput) + + ListAssetModelPropertiesPages(*iotsitewise.ListAssetModelPropertiesInput, func(*iotsitewise.ListAssetModelPropertiesOutput, bool) bool) error + ListAssetModelPropertiesPagesWithContext(aws.Context, *iotsitewise.ListAssetModelPropertiesInput, func(*iotsitewise.ListAssetModelPropertiesOutput, bool) bool, ...request.Option) error + ListAssetModels(*iotsitewise.ListAssetModelsInput) (*iotsitewise.ListAssetModelsOutput, error) ListAssetModelsWithContext(aws.Context, *iotsitewise.ListAssetModelsInput, ...request.Option) (*iotsitewise.ListAssetModelsOutput, error) ListAssetModelsRequest(*iotsitewise.ListAssetModelsInput) (*request.Request, *iotsitewise.ListAssetModelsOutput) @@ -268,6 +275,13 @@ type IoTSiteWiseAPI interface { ListAssetModelsPages(*iotsitewise.ListAssetModelsInput, func(*iotsitewise.ListAssetModelsOutput, bool) bool) error ListAssetModelsPagesWithContext(aws.Context, *iotsitewise.ListAssetModelsInput, func(*iotsitewise.ListAssetModelsOutput, bool) bool, ...request.Option) error + ListAssetProperties(*iotsitewise.ListAssetPropertiesInput) (*iotsitewise.ListAssetPropertiesOutput, error) + ListAssetPropertiesWithContext(aws.Context, *iotsitewise.ListAssetPropertiesInput, ...request.Option) (*iotsitewise.ListAssetPropertiesOutput, error) + ListAssetPropertiesRequest(*iotsitewise.ListAssetPropertiesInput) (*request.Request, *iotsitewise.ListAssetPropertiesOutput) + + ListAssetPropertiesPages(*iotsitewise.ListAssetPropertiesInput, func(*iotsitewise.ListAssetPropertiesOutput, bool) bool) error + ListAssetPropertiesPagesWithContext(aws.Context, *iotsitewise.ListAssetPropertiesInput, func(*iotsitewise.ListAssetPropertiesOutput, bool) bool, ...request.Option) error + ListAssetRelationships(*iotsitewise.ListAssetRelationshipsInput) (*iotsitewise.ListAssetRelationshipsOutput, error) ListAssetRelationshipsWithContext(aws.Context, *iotsitewise.ListAssetRelationshipsInput, ...request.Option) (*iotsitewise.ListAssetRelationshipsOutput, error) ListAssetRelationshipsRequest(*iotsitewise.ListAssetRelationshipsInput) (*request.Request, *iotsitewise.ListAssetRelationshipsOutput) diff --git a/service/s3control/api.go b/service/s3control/api.go index dbb40b753e..7f28e97a48 100644 --- a/service/s3control/api.go +++ b/service/s3control/api.go @@ -13310,8 +13310,6 @@ type LifecycleRule struct { ID *string `type:"string"` // The noncurrent version expiration of the lifecycle rule. - // - // This is not supported by Amazon S3 on Outposts buckets. NoncurrentVersionExpiration *NoncurrentVersionExpiration `type:"structure"` // Specifies the transition rule for the lifecycle rule that describes when @@ -13423,6 +13421,12 @@ func (s *LifecycleRule) SetTransitions(v []*Transition) *LifecycleRule { type LifecycleRuleAndOperator struct { _ struct{} `type:"structure"` + // Minimum object size to which the rule applies. + ObjectSizeGreaterThan *int64 `type:"long"` + + // Maximum object size to which the rule applies. + ObjectSizeLessThan *int64 `type:"long"` + // Prefix identifying one or more objects to which the rule applies. Prefix *string `type:"string"` @@ -13469,6 +13473,18 @@ func (s *LifecycleRuleAndOperator) Validate() error { return nil } +// SetObjectSizeGreaterThan sets the ObjectSizeGreaterThan field's value. +func (s *LifecycleRuleAndOperator) SetObjectSizeGreaterThan(v int64) *LifecycleRuleAndOperator { + s.ObjectSizeGreaterThan = &v + return s +} + +// SetObjectSizeLessThan sets the ObjectSizeLessThan field's value. +func (s *LifecycleRuleAndOperator) SetObjectSizeLessThan(v int64) *LifecycleRuleAndOperator { + s.ObjectSizeLessThan = &v + return s +} + // SetPrefix sets the Prefix field's value. func (s *LifecycleRuleAndOperator) SetPrefix(v string) *LifecycleRuleAndOperator { s.Prefix = &v @@ -13488,6 +13504,12 @@ type LifecycleRuleFilter struct { // The container for the AND condition for the lifecycle rule. And *LifecycleRuleAndOperator `type:"structure"` + // Minimum object size to which the rule applies. + ObjectSizeGreaterThan *int64 `type:"long"` + + // Maximum object size to which the rule applies. + ObjectSizeLessThan *int64 `type:"long"` + // Prefix identifying one or more objects to which the rule applies. // // Replacement must be made for object keys containing special characters (such @@ -13542,6 +13564,18 @@ func (s *LifecycleRuleFilter) SetAnd(v *LifecycleRuleAndOperator) *LifecycleRule return s } +// SetObjectSizeGreaterThan sets the ObjectSizeGreaterThan field's value. +func (s *LifecycleRuleFilter) SetObjectSizeGreaterThan(v int64) *LifecycleRuleFilter { + s.ObjectSizeGreaterThan = &v + return s +} + +// SetObjectSizeLessThan sets the ObjectSizeLessThan field's value. +func (s *LifecycleRuleFilter) SetObjectSizeLessThan(v int64) *LifecycleRuleFilter { + s.ObjectSizeLessThan = &v + return s +} + // SetPrefix sets the Prefix field's value. func (s *LifecycleRuleFilter) SetPrefix(v string) *LifecycleRuleFilter { s.Prefix = &v @@ -14657,6 +14691,13 @@ func (s *MultiRegionAccessPointsAsyncResponse) SetRegions(v []*MultiRegionAccess type NoncurrentVersionExpiration struct { _ struct{} `type:"structure"` + // Specifies how many noncurrent versions S3 on Outposts will retain. If there + // are this many more recent noncurrent versions, S3 on Outposts will take the + // associated action. For more information about noncurrent versions, see Lifecycle + // configuration elements (https://docs.aws.amazon.com/AmazonS3/latest/userguide/intro-lifecycle-rules.html) + // in the Amazon S3 User Guide. + NewerNoncurrentVersions *int64 `type:"integer"` + // Specifies the number of days an object is noncurrent before Amazon S3 can // perform the associated action. For information about the noncurrent days // calculations, see How Amazon S3 Calculates When an Object Became Noncurrent @@ -14683,6 +14724,12 @@ func (s NoncurrentVersionExpiration) GoString() string { return s.String() } +// SetNewerNoncurrentVersions sets the NewerNoncurrentVersions field's value. +func (s *NoncurrentVersionExpiration) SetNewerNoncurrentVersions(v int64) *NoncurrentVersionExpiration { + s.NewerNoncurrentVersions = &v + return s +} + // SetNoncurrentDays sets the NoncurrentDays field's value. func (s *NoncurrentVersionExpiration) SetNoncurrentDays(v int64) *NoncurrentVersionExpiration { s.NoncurrentDays = &v @@ -14782,7 +14829,8 @@ func (s *ObjectLambdaAccessPoint) SetObjectLambdaAccessPointArn(v string) *Objec type ObjectLambdaConfiguration struct { _ struct{} `type:"structure"` - // A container for allowed features. Valid inputs are GetObject-Range and GetObject-PartNumber. + // A container for allowed features. Valid inputs are GetObject-Range, GetObject-PartNumber, + // HeadObject-Range, and HeadObject-PartNumber. AllowedFeatures []*string `locationNameList:"AllowedFeature" type:"list" enum:"ObjectLambdaAllowedFeature"` // A container for whether the CloudWatch metrics configuration is enabled. @@ -14923,7 +14971,7 @@ type ObjectLambdaTransformationConfiguration struct { _ struct{} `type:"structure"` // A container for the action of an Object Lambda Access Point configuration. - // Valid input is GetObject. + // Valid inputs are GetObject, ListObjects, HeadObject, and ListObjectsV2. // // Actions is a required field Actions []*string `locationNameList:"Action" type:"list" required:"true" enum:"ObjectLambdaTransformationConfigurationAction"` diff --git a/service/ssmincidents/api.go b/service/ssmincidents/api.go index 41df55957a..356631b9f6 100644 --- a/service/ssmincidents/api.go +++ b/service/ssmincidents/api.go @@ -2168,8 +2168,8 @@ func (c *SSMIncidents) PutResourcePolicyRequest(input *PutResourcePolicyInput) ( // // Adds a resource policy to the specified response plan. The resource policy // is used to share the response plan using Resource Access Manager (RAM). For -// more information about cross-account sharing, see Setting up cross-account -// functionality (https://docs.aws.amazon.com/incident-manager/latest/userguide/xa.html). +// more information about cross-account sharing, see Cross-Region and cross-account +// incident management (https://docs.aws.amazon.com/incident-manager/latest/userguide/incident-manager-cross-account-cross-region.html). // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -3524,7 +3524,7 @@ func (s *ConflictException) RequestID() string { type CreateReplicationSetInput struct { _ struct{} `type:"structure"` - // A token ensuring that the operation is called only once with the specified + // A token that ensures that the operation is called only once with the specified // details. ClientToken *string `locationName:"clientToken" type:"string" idempotencyToken:"true"` @@ -3533,6 +3533,9 @@ type CreateReplicationSetInput struct { // // Regions is a required field Regions map[string]*RegionMapInputValue `locationName:"regions" min:"1" type:"map" required:"true"` + + // A list of tags to add to the replication set. + Tags map[string]*string `locationName:"tags" min:"1" type:"map"` } // String returns the string representation. @@ -3562,6 +3565,9 @@ func (s *CreateReplicationSetInput) Validate() error { if s.Regions != nil && len(s.Regions) < 1 { invalidParams.Add(request.NewErrParamMinLen("Regions", 1)) } + if s.Tags != nil && len(s.Tags) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Tags", 1)) + } if invalidParams.Len() > 0 { return invalidParams @@ -3581,6 +3587,12 @@ func (s *CreateReplicationSetInput) SetRegions(v map[string]*RegionMapInputValue return s } +// SetTags sets the Tags field's value. +func (s *CreateReplicationSetInput) SetTags(v map[string]*string) *CreateReplicationSetInput { + s.Tags = v + return s +} + type CreateReplicationSetOutput struct { _ struct{} `type:"structure"` @@ -3630,8 +3642,8 @@ type CreateResponsePlanInput struct { // The long format of the response plan name. This field can contain spaces. DisplayName *string `locationName:"displayName" type:"string"` - // The contacts and escalation plans that the response plan engages during an - // incident. + // The Amazon Resource Name (ARN) for the contacts and escalation plans that + // the response plan engages during an incident. Engagements []*string `locationName:"engagements" type:"list"` // Details used to create an incident when using this response plan. @@ -4707,7 +4719,7 @@ func (s *GetReplicationSetOutput) SetReplicationSet(v *ReplicationSet) *GetRepli type GetResourcePoliciesInput struct { _ struct{} `type:"structure"` - // The maximum number of resource policies to display per page of results. + // The maximum number of resource policies to display for each page of results. MaxResults *int64 `locationName:"maxResults" min:"1" type:"integer"` // The pagination token to continue to the next page of results. @@ -4877,8 +4889,8 @@ type GetResponsePlanOutput struct { // The long format name of the response plan. Can contain spaces. DisplayName *string `locationName:"displayName" type:"string"` - // The contacts and escalation plans that the response plan engages during an - // incident. + // The Amazon Resource Name (ARN) for the contacts and escalation plans that + // the response plan engages during an incident. Engagements []*string `locationName:"engagements" type:"list"` // Details used to create the incident when using this response plan. @@ -5395,7 +5407,8 @@ type IncidentTemplate struct { // Impact is a required field Impact *int64 `locationName:"impact" min:"1" type:"integer" required:"true"` - // Tags to apply to an incident when calling the StartIncident API action. + // Tags to assign to the template. When the StartIncident API action is called, + // Incident Manager assigns the tags specified in the template to the incident. IncidentTags map[string]*string `locationName:"incidentTags" min:"1" type:"map"` // The Amazon SNS targets that are notified when updates are made to an incident. @@ -6381,8 +6394,8 @@ type PutResourcePolicyInput struct { // Policy is a required field Policy *string `locationName:"policy" type:"string" required:"true"` - // The Amazon Resource Name (ARN) of the response plan you're adding the resource - // policy to. + // The Amazon Resource Name (ARN) of the response plan to add the resource policy + // to. // // ResourceArn is a required field ResourceArn *string `locationName:"resourceArn" type:"string" required:"true"` @@ -7339,7 +7352,7 @@ type TagResourceInput struct { // ResourceArn is a required field ResourceArn *string `location:"uri" locationName:"resourceArn" type:"string" required:"true"` - // A list of tags that you are adding to the response plan. + // A list of tags to add to the response plan. // // Tags is a required field Tags map[string]*string `locationName:"tags" min:"1" type:"map" required:"true"` @@ -7675,7 +7688,7 @@ type UntagResourceInput struct { // ResourceArn is a required field ResourceArn *string `location:"uri" locationName:"resourceArn" type:"string" required:"true"` - // The name of the tag you're removing from the response plan. + // The name of the tag to remove from the response plan. // // TagKeys is a required field TagKeys []*string `location:"querystring" locationName:"tagKeys" min:"1" type:"list" required:"true"` @@ -7758,16 +7771,16 @@ func (s UntagResourceOutput) GoString() string { type UpdateDeletionProtectionInput struct { _ struct{} `type:"structure"` - // The Amazon Resource Name (ARN) of the replication set you're updating. + // The Amazon Resource Name (ARN) of the replication set to update. // // Arn is a required field Arn *string `locationName:"arn" type:"string" required:"true"` - // A token ensuring that the operation is called only once with the specified + // A token that ensures that the operation is called only once with the specified // details. ClientToken *string `locationName:"clientToken" type:"string" idempotencyToken:"true"` - // Details if deletion protection is enabled or disabled in your account. + // Specifies if deletion protection is turned on or off in your account. // // DeletionProtected is a required field DeletionProtected *bool `locationName:"deletionProtected" type:"boolean" required:"true"` @@ -8179,7 +8192,7 @@ type UpdateReplicationSetInput struct { // Arn is a required field Arn *string `locationName:"arn" type:"string" required:"true"` - // A token ensuring that the operation is called only once with the specified + // A token that ensures that the operation is called only once with the specified // details. ClientToken *string `locationName:"clientToken" type:"string" idempotencyToken:"true"` } @@ -8295,8 +8308,8 @@ type UpdateResponsePlanInput struct { // spaces. DisplayName *string `locationName:"displayName" type:"string"` - // The contacts and escalation plans that Incident Manager engages at the start - // of the incident. + // The Amazon Resource Name (ARN) for the contacts and escalation plans that + // the response plan engages during an incident. Engagements []*string `locationName:"engagements" type:"list"` // The string Incident Manager uses to prevent duplicate incidents from being @@ -8326,9 +8339,10 @@ type UpdateResponsePlanInput struct { // what's currently happening, and next steps. IncidentTemplateSummary *string `locationName:"incidentTemplateSummary" type:"string"` - // Tags to apply to an incident when calling the StartIncident API action. To - // call this action, you must also have permission to call the TagResource API - // action for the incident record resource. + // Tags to assign to the template. When the StartIncident API action is called, + // Incident Manager assigns the tags specified in the template to the incident. + // To call this action, you must also have permission to call the TagResource + // API action for the incident record resource. IncidentTemplateTags map[string]*string `locationName:"incidentTemplateTags" type:"map"` // The short format name of the incident. The title can't contain spaces.