Skip to content

Commit 320a037

Browse files
pulimsrpulimsr
authored
Merge branch 'main' into updateCrt/v0.36.1
2 parents 3be9e74 + ead0bd4 commit 320a037

File tree

208 files changed

+8876
-447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+8876
-447
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.713
1+
1.11.714

‎generated/src/aws-cpp-sdk-appstream/include/aws/appstream/model/CreateApplicationRequest.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ class CreateApplicationRequest : public AppStreamRequest {
164164

165165
///@{
166166
/**
167-
* <p>The platforms the application supports. WINDOWS_SERVER_2019 and AMAZON_LINUX2
168-
* are supported for Elastic fleets.</p>
167+
* <p>The platforms the application supports. WINDOWS_SERVER_2019, AMAZON_LINUX2
168+
* and UBUNTU_PRO_2404 are supported for Elastic fleets.</p>
169169
*/
170170
inline const Aws::Vector<PlatformType>& GetPlatforms() const { return m_platforms; }
171171
inline bool PlatformsHasBeenSet() const { return m_platformsHasBeenSet; }

‎generated/src/aws-cpp-sdk-appstream/include/aws/appstream/model/CreateFleetRequest.h‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,8 @@ class CreateFleetRequest : public AppStreamRequest {
109109
* </li> <li> <p>stream.memory.z1d.xlarge</p> </li> <li>
110110
* <p>stream.memory.z1d.2xlarge</p> </li> <li> <p>stream.memory.z1d.3xlarge</p>
111111
* </li> <li> <p>stream.memory.z1d.6xlarge</p> </li> <li>
112-
* <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics-design.large</p>
113-
* </li> <li> <p>stream.graphics-design.xlarge</p> </li> <li>
114-
* <p>stream.graphics-design.2xlarge</p> </li> <li>
115-
* <p>stream.graphics-design.4xlarge</p> </li> <li>
116-
* <p>stream.graphics.g4dn.xlarge</p> </li> <li>
117-
* <p>stream.graphics.g4dn.2xlarge</p> </li> <li>
112+
* <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics.g4dn.xlarge</p>
113+
* </li> <li> <p>stream.graphics.g4dn.2xlarge</p> </li> <li>
118114
* <p>stream.graphics.g4dn.4xlarge</p> </li> <li>
119115
* <p>stream.graphics.g4dn.8xlarge</p> </li> <li>
120116
* <p>stream.graphics.g4dn.12xlarge</p> </li> <li>
@@ -444,8 +440,8 @@ class CreateFleetRequest : public AppStreamRequest {
444440

445441
///@{
446442
/**
447-
* <p>The fleet platform. WINDOWS_SERVER_2019 and AMAZON_LINUX2 are supported for
448-
* Elastic fleets. </p>
443+
* <p>The fleet platform. WINDOWS_SERVER_2019, AMAZON_LINUX2 and UBUNTU_PRO_2404
444+
* are supported for Elastic fleets. </p>
449445
*/
450446
inline PlatformType GetPlatform() const { return m_platform; }
451447
inline bool PlatformHasBeenSet() const { return m_platformHasBeenSet; }

‎generated/src/aws-cpp-sdk-appstream/include/aws/appstream/model/CreateImageBuilderRequest.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,7 @@ class CreateImageBuilderRequest : public AppStreamRequest {
104104
* <p>stream.memory.z1d.xlarge</p> </li> <li> <p>stream.memory.z1d.2xlarge</p>
105105
* </li> <li> <p>stream.memory.z1d.3xlarge</p> </li> <li>
106106
* <p>stream.memory.z1d.6xlarge</p> </li> <li> <p>stream.memory.z1d.12xlarge</p>
107-
* </li> <li> <p>stream.graphics-design.large</p> </li> <li>
108-
* <p>stream.graphics-design.xlarge</p> </li> <li>
109-
* <p>stream.graphics-design.2xlarge</p> </li> <li>
110-
* <p>stream.graphics-design.4xlarge</p> </li> <li>
111-
* <p>stream.graphics.g4dn.xlarge</p> </li> <li>
107+
* </li> <li> <p>stream.graphics.g4dn.xlarge</p> </li> <li>
112108
* <p>stream.graphics.g4dn.2xlarge</p> </li> <li>
113109
* <p>stream.graphics.g4dn.4xlarge</p> </li> <li>
114110
* <p>stream.graphics.g4dn.8xlarge</p> </li> <li>

‎generated/src/aws-cpp-sdk-appstream/include/aws/appstream/model/Fleet.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,7 @@ class Fleet {
165165
* <p>stream.memory.z1d.xlarge</p> </li> <li> <p>stream.memory.z1d.2xlarge</p>
166166
* </li> <li> <p>stream.memory.z1d.3xlarge</p> </li> <li>
167167
* <p>stream.memory.z1d.6xlarge</p> </li> <li> <p>stream.memory.z1d.12xlarge</p>
168-
* </li> <li> <p>stream.graphics-design.large</p> </li> <li>
169-
* <p>stream.graphics-design.xlarge</p> </li> <li>
170-
* <p>stream.graphics-design.2xlarge</p> </li> <li>
171-
* <p>stream.graphics-design.4xlarge</p> </li> <li>
172-
* <p>stream.graphics.g4dn.xlarge</p> </li> <li>
168+
* </li> <li> <p>stream.graphics.g4dn.xlarge</p> </li> <li>
173169
* <p>stream.graphics.g4dn.2xlarge</p> </li> <li>
174170
* <p>stream.graphics.g4dn.4xlarge</p> </li> <li>
175171
* <p>stream.graphics.g4dn.8xlarge</p> </li> <li>

‎generated/src/aws-cpp-sdk-appstream/include/aws/appstream/model/Image.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@ class Image {
384384
* use when the customer launches a fleet or image builder. The following instances
385385
* families are supported:</p> <ul> <li> <p>General Purpose</p> </li> <li>
386386
* <p>Compute Optimized</p> </li> <li> <p>Memory Optimized</p> </li> <li>
387-
* <p>Graphics</p> </li> <li> <p>Graphics Design</p> </li> <li> <p>Graphics Pro</p>
388-
* </li> <li> <p>Graphics G4</p> </li> <li> <p>Graphics G5</p> </li> </ul>
387+
* <p>Graphics G4</p> </li> <li> <p>Graphics G5</p> </li> <li> <p>Graphics G6</p>
388+
* </li> </ul>
389389
*/
390390
inline const Aws::Vector<Aws::String>& GetSupportedInstanceFamilies() const { return m_supportedInstanceFamilies; }
391391
inline bool SupportedInstanceFamiliesHasBeenSet() const { return m_supportedInstanceFamiliesHasBeenSet; }

‎generated/src/aws-cpp-sdk-appstream/include/aws/appstream/model/ImageBuilder.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,6 @@ class ImageBuilder {
166166
* </li> <li> <p>stream.memory.z1d.2xlarge</p> </li> <li>
167167
* <p>stream.memory.z1d.3xlarge</p> </li> <li> <p>stream.memory.z1d.6xlarge</p>
168168
* </li> <li> <p>stream.memory.z1d.12xlarge</p> </li> <li>
169-
* <p>stream.graphics-design.large</p> </li> <li>
170-
* <p>stream.graphics-design.xlarge</p> </li> <li>
171-
* <p>stream.graphics-design.2xlarge</p> </li> <li>
172-
* <p>stream.graphics-design.4xlarge</p> </li> <li>
173169
* <p>stream.graphics.g4dn.xlarge</p> </li> <li>
174170
* <p>stream.graphics.g4dn.2xlarge</p> </li> <li>
175171
* <p>stream.graphics.g4dn.4xlarge</p> </li> <li>

‎generated/src/aws-cpp-sdk-appstream/include/aws/appstream/model/PlatformType.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ enum class PlatformType {
1616
WINDOWS_SERVER_2016,
1717
WINDOWS_SERVER_2019,
1818
WINDOWS_SERVER_2022,
19+
WINDOWS_SERVER_2025,
1920
AMAZON_LINUX2,
2021
RHEL8,
21-
ROCKY_LINUX8
22+
ROCKY_LINUX8,
23+
UBUNTU_PRO_2404
2224
};
2325

2426
namespace PlatformTypeMapper {

‎generated/src/aws-cpp-sdk-appstream/include/aws/appstream/model/UpdateFleetRequest.h‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,8 @@ class UpdateFleetRequest : public AppStreamRequest {
108108
* </li> <li> <p>stream.memory.z1d.xlarge</p> </li> <li>
109109
* <p>stream.memory.z1d.2xlarge</p> </li> <li> <p>stream.memory.z1d.3xlarge</p>
110110
* </li> <li> <p>stream.memory.z1d.6xlarge</p> </li> <li>
111-
* <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics-design.large</p>
112-
* </li> <li> <p>stream.graphics-design.xlarge</p> </li> <li>
113-
* <p>stream.graphics-design.2xlarge</p> </li> <li>
114-
* <p>stream.graphics-design.4xlarge</p> </li> <li>
115-
* <p>stream.graphics.g4dn.xlarge</p> </li> <li>
116-
* <p>stream.graphics.g4dn.2xlarge</p> </li> <li>
111+
* <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics.g4dn.xlarge</p>
112+
* </li> <li> <p>stream.graphics.g4dn.2xlarge</p> </li> <li>
117113
* <p>stream.graphics.g4dn.4xlarge</p> </li> <li>
118114
* <p>stream.graphics.g4dn.8xlarge</p> </li> <li>
119115
* <p>stream.graphics.g4dn.12xlarge</p> </li> <li>
@@ -411,8 +407,8 @@ class UpdateFleetRequest : public AppStreamRequest {
411407

412408
///@{
413409
/**
414-
* <p>The platform of the fleet. WINDOWS_SERVER_2019 and AMAZON_LINUX2 are
415-
* supported for Elastic fleets. </p>
410+
* <p>The platform of the fleet. WINDOWS_SERVER_2019, AMAZON_LINUX2 and
411+
* UBUNTU_PRO_2404 are supported for Elastic fleets. </p>
416412
*/
417413
inline PlatformType GetPlatform() const { return m_platform; }
418414
inline bool PlatformHasBeenSet() const { return m_platformHasBeenSet; }

‎generated/src/aws-cpp-sdk-appstream/source/model/PlatformType.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ static const int WINDOWS_HASH = HashingUtils::HashString("WINDOWS");
1919
static const int WINDOWS_SERVER_2016_HASH = HashingUtils::HashString("WINDOWS_SERVER_2016");
2020
static const int WINDOWS_SERVER_2019_HASH = HashingUtils::HashString("WINDOWS_SERVER_2019");
2121
static const int WINDOWS_SERVER_2022_HASH = HashingUtils::HashString("WINDOWS_SERVER_2022");
22+
static const int WINDOWS_SERVER_2025_HASH = HashingUtils::HashString("WINDOWS_SERVER_2025");
2223
static const int AMAZON_LINUX2_HASH = HashingUtils::HashString("AMAZON_LINUX2");
2324
static const int RHEL8_HASH = HashingUtils::HashString("RHEL8");
2425
static const int ROCKY_LINUX8_HASH = HashingUtils::HashString("ROCKY_LINUX8");
26+
static const int UBUNTU_PRO_2404_HASH = HashingUtils::HashString("UBUNTU_PRO_2404");
2527

2628
PlatformType GetPlatformTypeForName(const Aws::String& name) {
2729
int hashCode = HashingUtils::HashString(name.c_str());
@@ -33,12 +35,16 @@ PlatformType GetPlatformTypeForName(const Aws::String& name) {
3335
return PlatformType::WINDOWS_SERVER_2019;
3436
} else if (hashCode == WINDOWS_SERVER_2022_HASH) {
3537
return PlatformType::WINDOWS_SERVER_2022;
38+
} else if (hashCode == WINDOWS_SERVER_2025_HASH) {
39+
return PlatformType::WINDOWS_SERVER_2025;
3640
} else if (hashCode == AMAZON_LINUX2_HASH) {
3741
return PlatformType::AMAZON_LINUX2;
3842
} else if (hashCode == RHEL8_HASH) {
3943
return PlatformType::RHEL8;
4044
} else if (hashCode == ROCKY_LINUX8_HASH) {
4145
return PlatformType::ROCKY_LINUX8;
46+
} else if (hashCode == UBUNTU_PRO_2404_HASH) {
47+
return PlatformType::UBUNTU_PRO_2404;
4248
}
4349
EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
4450
if (overflowContainer) {
@@ -61,12 +67,16 @@ Aws::String GetNameForPlatformType(PlatformType enumValue) {
6167
return "WINDOWS_SERVER_2019";
6268
case PlatformType::WINDOWS_SERVER_2022:
6369
return "WINDOWS_SERVER_2022";
70+
case PlatformType::WINDOWS_SERVER_2025:
71+
return "WINDOWS_SERVER_2025";
6472
case PlatformType::AMAZON_LINUX2:
6573
return "AMAZON_LINUX2";
6674
case PlatformType::RHEL8:
6775
return "RHEL8";
6876
case PlatformType::ROCKY_LINUX8:
6977
return "ROCKY_LINUX8";
78+
case PlatformType::UBUNTU_PRO_2404:
79+
return "UBUNTU_PRO_2404";
7080
default:
7181
EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
7282
if (overflowContainer) {

0 commit comments

Comments
 (0)