Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump smithy-kotlin version and sync aws-models #1046

Merged
merged 3 commits into from
Sep 15, 2023
Merged

chore: bump smithy-kotlin version and sync aws-models #1046

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82a180f
chore: bump smithy-kotlin version and sync aws-models
aajtodd Sep 15, 2023
a594b5d
revert appstream model
aajtodd Sep 15, 2023
d3b5816
revert kinesis-video-archived-media which requires a newer version of…
aajtodd Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/6dad55e6-3cd4-486b-9e73-46c5ead34234.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "6dad55e6-3cd4-486b-9e73-46c5ead34234",
"type": "misc",
"description": "Sync smithy-kotlin and AWS service models."
}
89 changes: 77 additions & 12 deletions codegen/sdk/aws-models/appstream.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,8 +1187,13 @@
"DesiredInstances": {
"target": "com.amazonaws.appstream#Integer",
"traits": {
"smithy.api#documentation": "<p>The desired number of streaming instances.</p>",
"smithy.api#required": {}
"smithy.api#documentation": "<p>The desired number of streaming instances.</p>"
}
},
"DesiredSessions": {
"target": "com.amazonaws.appstream#Integer",
"traits": {
"smithy.api#documentation": "<p>The desired number of user sessions for a multi-session fleet. This is not allowed for single-session fleets.</p>\n <p>When you create a fleet, you must set either the DesiredSessions or DesiredInstances attribute, based on the type of fleet you create. You can’t define both attributes or leave both attributes blank.</p>"
}
}
},
Expand Down Expand Up @@ -1223,6 +1228,30 @@
"traits": {
"smithy.api#documentation": "<p>The number of currently available instances that can be used to stream\n sessions.</p>"
}
},
"DesiredUserSessions": {
"target": "com.amazonaws.appstream#Integer",
"traits": {
"smithy.api#documentation": "<p>The total number of sessions slots that are either running or pending. This represents the total number of concurrent streaming sessions your fleet can support in a steady state.</p>\n <p>DesiredUserSessionCapacity = ActualUserSessionCapacity + PendingUserSessionCapacity</p>\n <p>This only applies to multi-session fleets.</p>"
}
},
"AvailableUserSessions": {
"target": "com.amazonaws.appstream#Integer",
"traits": {
"smithy.api#documentation": "<p>The number of idle session slots currently available for user sessions.</p>\n <p>AvailableUserSessionCapacity = ActualUserSessionCapacity - ActiveUserSessions</p>\n <p>This only applies to multi-session fleets.</p>"
}
},
"ActiveUserSessions": {
"target": "com.amazonaws.appstream#Integer",
"traits": {
"smithy.api#documentation": "<p>The number of user sessions currently being used for streaming sessions. This only applies to multi-session fleets.</p>"
}
},
"ActualUserSessions": {
"target": "com.amazonaws.appstream#Integer",
"traits": {
"smithy.api#documentation": "<p>The total number of session slots that are available for streaming or are currently streaming.</p>\n <p>ActualUserSessionCapacity = AvailableUserSessionCapacity + ActiveUserSessions</p>\n <p>This only applies to multi-session fleets.</p>"
}
}
},
"traits": {
Expand Down Expand Up @@ -1988,7 +2017,7 @@
"MaxUserDurationInSeconds": {
"target": "com.amazonaws.appstream#Integer",
"traits": {
"smithy.api#documentation": "<p>The maximum amount of time that a streaming session can remain active, in seconds. If users are still connected to a streaming instance five minutes before this limit is reached, they are prompted to save any open documents before being disconnected. After this time elapses, the instance is terminated and replaced by a new instance.</p>\n <p>Specify a value between 600 and 360000.</p>"
"smithy.api#documentation": "<p>The maximum amount of time that a streaming session can remain active, in seconds. If users are still connected to a streaming instance five minutes before this limit is reached, they are prompted to save any open documents before being disconnected. After this time elapses, the instance is terminated and replaced by a new instance.</p>\n <p>Specify a value between 600 and 432000.</p>"
}
},
"DisconnectTimeoutInSeconds": {
Expand Down Expand Up @@ -2068,6 +2097,12 @@
"traits": {
"smithy.api#documentation": "<p>The S3 location of the session scripts configuration zip file. This only applies to Elastic fleets.</p>"
}
},
"MaxSessionsPerInstance": {
"target": "com.amazonaws.appstream#Integer",
"traits": {
"smithy.api#documentation": "<p>The maximum number of user sessions on an instance. This only applies to multi-session fleets.</p>"
}
}
},
"traits": {
Expand Down Expand Up @@ -3828,7 +3863,7 @@
"matcher": {
"output": {
"path": "Fleets[].State",
"expected": "RUNNING",
"expected": "ACTIVE",
"comparator": "allStringEquals"
}
}
Expand All @@ -3838,7 +3873,7 @@
"matcher": {
"output": {
"path": "Fleets[].State",
"expected": "STOPPING",
"expected": "PENDING_DEACTIVATE",
"comparator": "anyStringEquals"
}
}
Expand All @@ -3848,7 +3883,7 @@
"matcher": {
"output": {
"path": "Fleets[].State",
"expected": "STOPPED",
"expected": "INACTIVE",
"comparator": "anyStringEquals"
}
}
Expand All @@ -3863,7 +3898,7 @@
"matcher": {
"output": {
"path": "Fleets[].State",
"expected": "STOPPED",
"expected": "INACTIVE",
"comparator": "allStringEquals"
}
}
Expand All @@ -3873,7 +3908,7 @@
"matcher": {
"output": {
"path": "Fleets[].State",
"expected": "STARTING",
"expected": "PENDING_ACTIVATE",
"comparator": "anyStringEquals"
}
}
Expand All @@ -3883,7 +3918,7 @@
"matcher": {
"output": {
"path": "Fleets[].State",
"expected": "RUNNING",
"expected": "ACTIVE",
"comparator": "anyStringEquals"
}
}
Expand Down Expand Up @@ -4191,14 +4226,14 @@
"type": "structure",
"members": {
"StackName": {
"target": "com.amazonaws.appstream#String",
"target": "com.amazonaws.appstream#Name",
"traits": {
"smithy.api#documentation": "<p>The name of the stack. This value is case-sensitive.</p>",
"smithy.api#required": {}
}
},
"FleetName": {
"target": "com.amazonaws.appstream#String",
"target": "com.amazonaws.appstream#Name",
"traits": {
"smithy.api#documentation": "<p>The name of the fleet. This value is case-sensitive.</p>",
"smithy.api#required": {}
Expand Down Expand Up @@ -4227,6 +4262,12 @@
"traits": {
"smithy.api#documentation": "<p>The authentication method. Specify <code>API</code> for a user\n authenticated using a streaming URL or <code>SAML</code> for a SAML federated user. \n The default is to authenticate users using a streaming URL.</p>"
}
},
"InstanceId": {
"target": "com.amazonaws.appstream#String",
"traits": {
"smithy.api#documentation": "<p>The identifier for the instance hosting the session.</p>"
}
}
},
"traits": {
Expand Down Expand Up @@ -5337,6 +5378,12 @@
"traits": {
"smithy.api#documentation": "<p>The S3 location of the session scripts configuration zip file. This only applies to Elastic fleets.</p>"
}
},
"MaxSessionsPerInstance": {
"target": "com.amazonaws.appstream#Integer",
"traits": {
"smithy.api#documentation": "<p>The maximum number of user sessions on an instance. This only applies to multi-session fleets.</p>"
}
}
},
"traits": {
Expand Down Expand Up @@ -5381,6 +5428,12 @@
"traits": {
"smithy.api#enumValue": "SESSION_SCRIPT_S3_LOCATION"
}
},
"MAX_SESSIONS_PER_INSTANCE": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "MAX_SESSIONS_PER_INSTANCE"
}
}
},
"traits": {
Expand Down Expand Up @@ -8039,6 +8092,12 @@
"traits": {
"smithy.api#documentation": "<p>The network details for the streaming session.</p>"
}
},
"InstanceId": {
"target": "com.amazonaws.appstream#String",
"traits": {
"smithy.api#documentation": "<p>The identifier for the instance hosting the session.</p>"
}
}
},
"traits": {
Expand Down Expand Up @@ -9407,7 +9466,7 @@
}
},
"Name": {
"target": "com.amazonaws.appstream#String",
"target": "com.amazonaws.appstream#Name",
"traits": {
"smithy.api#documentation": "<p>A unique name for the fleet.</p>"
}
Expand Down Expand Up @@ -9521,6 +9580,12 @@
"traits": {
"smithy.api#documentation": "<p>The S3 location of the session scripts configuration zip file. This only applies to Elastic fleets. </p>"
}
},
"MaxSessionsPerInstance": {
"target": "com.amazonaws.appstream#Integer",
"traits": {
"smithy.api#documentation": "<p>The maximum number of user sessions on an instance. This only applies to multi-session fleets.</p>"
}
}
},
"traits": {
Expand Down
2 changes: 1 addition & 1 deletion codegen/sdk/aws-models/cloud9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@
"imageId": {
"target": "com.amazonaws.cloud9#ImageId",
"traits": {
"smithy.api#documentation": "<p>The identifier for the Amazon Machine Image (AMI) that's used to create the EC2 instance.\n To choose an AMI for the instance, you must specify a valid AMI alias or a valid Amazon EC2 Systems Manager (SSM)\n path.</p>\n <p>The default Amazon Linux AMI is currently used if the parameter isn't explicitly assigned\n a value in the request. Because Amazon Linux AMI has ended standard support as of December 31,\n 2020, we recommend you choose Amazon Linux 2, which includes long term support through\n 2023.</p>\n <p>From December 31, 2023, the parameter for Amazon Linux will no longer be available when\n you specify an AMI for your instance. Amazon Linux 2 will then become the default AMI, which\n is used to launch your instance if no parameter is explicitly defined.</p>\n <p>\n <b>AMI aliases </b>\n </p>\n <ul>\n <li>\n <p>\n <b>Amazon Linux (default):\n <code>amazonlinux-1-x86_64</code>\n </b>\n </p>\n </li>\n <li>\n <p>Amazon Linux 2: <code>amazonlinux-2-x86_64</code>\n </p>\n </li>\n <li>\n <p>Ubuntu 18.04: <code>ubuntu-18.04-x86_64</code>\n </p>\n </li>\n <li>\n <p>Ubuntu 22.04: <code>ubuntu-22.04-x86_64</code>\n </p>\n </li>\n </ul>\n <p>\n <b>SSM paths</b>\n </p>\n <ul>\n <li>\n <p>\n <b>Amazon Linux (default):\n <code>resolve:ssm:/aws/service/cloud9/amis/amazonlinux-1-x86_64</code>\n </b>\n </p>\n </li>\n <li>\n <p>Amazon Linux 2:\n <code>resolve:ssm:/aws/service/cloud9/amis/amazonlinux-2-x86_64</code>\n </p>\n </li>\n <li>\n <p>Ubuntu 18.04:\n <code>resolve:ssm:/aws/service/cloud9/amis/ubuntu-18.04-x86_64</code>\n </p>\n </li>\n <li>\n <p>Ubuntu 22.04:\n <code>resolve:ssm:/aws/service/cloud9/amis/ubuntu-22.04-x86_64</code>\n </p>\n </li>\n </ul>"
"smithy.api#documentation": "<p>The identifier for the Amazon Machine Image (AMI) that's used to create the EC2 instance.\n To choose an AMI for the instance, you must specify a valid AMI alias or a valid Amazon EC2 Systems Manager (SSM)\n path.</p>\n <p>The default Amazon Linux AMI is currently used if the parameter isn't explicitly assigned\n a value in the request. Because Amazon Linux AMI has ended standard support as of December 31,\n 2020, we recommend you choose Amazon Linux 2, which includes long term support through\n 2023.</p>\n <p>From December 31, 2023, the parameter for Amazon Linux will no longer be available when\n you specify an AMI for your instance. Amazon Linux 2 will then become the default AMI, which\n is used to launch your instance if no parameter is explicitly defined.</p>\n <p>Since Ubuntu 18.04 has ended standard support as of May 31, 2023, we recommend you choose Ubuntu 22.04.</p>\n <p>\n <b>AMI aliases </b>\n </p>\n <ul>\n <li>\n <p>\n <b>Amazon Linux (default):\n <code>amazonlinux-1-x86_64</code>\n </b>\n </p>\n </li>\n <li>\n <p>Amazon Linux 2: <code>amazonlinux-2-x86_64</code>\n </p>\n </li>\n <li>\n <p>Ubuntu 18.04: <code>ubuntu-18.04-x86_64</code>\n </p>\n </li>\n <li>\n <p>Ubuntu 22.04: <code>ubuntu-22.04-x86_64</code>\n </p>\n </li>\n </ul>\n <p>\n <b>SSM paths</b>\n </p>\n <ul>\n <li>\n <p>\n <b>Amazon Linux (default):\n <code>resolve:ssm:/aws/service/cloud9/amis/amazonlinux-1-x86_64</code>\n </b>\n </p>\n </li>\n <li>\n <p>Amazon Linux 2:\n <code>resolve:ssm:/aws/service/cloud9/amis/amazonlinux-2-x86_64</code>\n </p>\n </li>\n <li>\n <p>Ubuntu 18.04:\n <code>resolve:ssm:/aws/service/cloud9/amis/ubuntu-18.04-x86_64</code>\n </p>\n </li>\n <li>\n <p>Ubuntu 22.04:\n <code>resolve:ssm:/aws/service/cloud9/amis/ubuntu-22.04-x86_64</code>\n </p>\n </li>\n </ul>"
}
},
"automaticStopTimeMinutes": {
Expand Down
Loading