Skip to content

Commit 9453d04

Browse files
authored
Merge branch 'main' into path-saparator
2 parents 22126ab + e107790 commit 9453d04

File tree

64 files changed

+2069
-288
lines changed

Some content is hidden

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

64 files changed

+2069
-288
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.687
1+
1.11.688

generated/src/aws-cpp-sdk-batch/include/aws/batch/model/ComputeResource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class ComputeResource {
194194
* <code>default_x86_64</code> to choose x86 based instance types (from the
195195
* <code>m6i</code>, <code>c6i</code>, <code>r6i</code>, and <code>c7i</code>
196196
* instance families) that matches the resource demands of the job queue.</p> </li>
197-
* <li> <p> <code>default_arm64</code> to choose x86 based instance types (from the
197+
* <li> <p> <code>default_arm64</code> to choose ARM based instance types (from the
198198
* <code>m6g</code>, <code>c6g</code>, <code>r6g</code>, and <code>c7g</code>
199199
* instance families) that matches the resource demands of the job queue.</p> </li>
200200
* </ul> <p>Starting on 11/01/2025 the behavior of <code>optimal</code> is

generated/src/aws-cpp-sdk-batch/include/aws/batch/model/Ec2Configuration.h

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,38 +75,37 @@ class Ec2Configuration {
7575
* instance types.</p> </dd> </dl> </dd> <dt>EKS</dt> <dd> <p>If the
7676
* <code>imageIdOverride</code> parameter isn't specified, then a recent <a
7777
* href="https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html">Amazon
78-
* EKS-optimized Amazon Linux AMI</a> (<code>EKS_AL2</code>) is used. If a new
79-
* image type is specified in an update, but neither an <code>imageId</code> nor a
80-
* <code>imageIdOverride</code> parameter is specified, then the latest Amazon EKS
81-
* optimized AMI for that image type that Batch supports is used.</p>
82-
* <p>Starting end of October 2025 Amazon EKS optimized Amazon Linux 2023 AMIs will
83-
* be the default on Batch for EKS versions prior to 1.33. Starting from Kubernetes
84-
* version 1.33, EKS optimized Amazon Linux 2023 AMIs will be the default when it
85-
* becomes supported on Batch.</p> <p>Amazon Web Services will end support for
86-
* Amazon EKS AL2-optimized and AL2-accelerated AMIs, starting 11/26/25. You can
87-
* continue using Batch-provided Amazon EKS optimized Amazon Linux 2 AMIs on your
88-
* Amazon EKS compute environments beyond the 11/26/25 end-of-support date, these
89-
* compute environments will no longer receive any new software updates, security
90-
* patches, or bug fixes from Amazon Web Services. For more information on
91-
* upgrading from AL2 to AL2023, see <a
78+
* EKS-optimized Amazon Linux 2023 AMI</a> (<code>EKS_AL2023</code>) is used. If a
79+
* new image type is specified in an update, but neither an <code>imageId</code>
80+
* nor a <code>imageIdOverride</code> parameter is specified, then the latest
81+
* Amazon EKS optimized AMI for that image type that Batch supports is used.</p>
82+
* <p>Amazon Linux 2023 AMIs are the default on Batch for Amazon
83+
* EKS.</p> <p>Amazon Web Services will end support for Amazon EKS AL2-optimized
84+
* and AL2-accelerated AMIs, starting 11/26/25. You can continue using
85+
* Batch-provided Amazon EKS optimized Amazon Linux 2 AMIs on your Amazon EKS
86+
* compute environments beyond the 11/26/25 end-of-support date, these compute
87+
* environments will no longer receive any new software updates, security patches,
88+
* or bug fixes from Amazon Web Services. For more information on upgrading from
89+
* AL2 to AL2023, see <a
9290
* href="https://docs.aws.amazon.com/batch/latest/userguide/eks-migration-2023.html">How
9391
* to upgrade from EKS AL2 to EKS AL2023</a> in the <i>Batch User Guide</i>.</p>
9492
* <dl> <dt>EKS_AL2</dt> <dd> <p> <a
9593
* href="https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html">Amazon
96-
* Linux 2</a>: Default for all non-GPU instance families.</p> </dd>
94+
* Linux 2</a>: Used for non-GPU instance families.</p> </dd>
9795
* <dt>EKS_AL2_NVIDIA</dt> <dd> <p> <a
9896
* href="https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html">Amazon
99-
* Linux 2 (accelerated)</a>: Default for all GPU instance families (for example,
97+
* Linux 2 (accelerated)</a>: Used for GPU instance families (for example,
10098
* <code>P4</code> and <code>G4</code>) and can be used for all non Amazon Web
10199
* Services Graviton-based instance types.</p> </dd> <dt>EKS_AL2023</dt> <dd> <p>
102100
* <a
103101
* href="https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html">Amazon
104-
* Linux 2023</a>: Batch supports Amazon Linux 2023.</p> <p>Amazon Linux
105-
* 2023 does not support <code>A1</code> instances.</p> </dd>
102+
* Linux 2023</a>: Default for non-GPU instance families.</p> <p>Amazon
103+
* Linux 2023 does not support <code>A1</code> instances.</p> </dd>
106104
* <dt>EKS_AL2023_NVIDIA</dt> <dd> <p> <a
107105
* href="https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html">Amazon
108-
* Linux 2023 (accelerated)</a>: GPU instance families and can be used for all non
109-
* Amazon Web Services Graviton-based instance types.</p> </dd> </dl> </dd> </dl>
106+
* Linux 2023 (accelerated)</a>: Default for GPU instance families and can be used
107+
* for all non Amazon Web Services Graviton-based instance types.</p> </dd> </dl>
108+
* </dd> </dl>
110109
*/
111110
inline const Aws::String& GetImageType() const { return m_imageType; }
112111
inline bool ImageTypeHasBeenSet() const { return m_imageTypeHasBeenSet; }
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
6+
#pragma once
7+
#include <aws/bedrock-data-automation/BedrockDataAutomation_EXPORTS.h>
8+
#include <aws/core/utils/memory/stl/AWSString.h>
9+
10+
namespace Aws {
11+
namespace BedrockDataAutomation {
12+
namespace Model {
13+
enum class AudioGenerativeOutputLanguage { NOT_SET, DEFAULT, EN };
14+
15+
namespace AudioGenerativeOutputLanguageMapper {
16+
AWS_BEDROCKDATAAUTOMATION_API AudioGenerativeOutputLanguage GetAudioGenerativeOutputLanguageForName(const Aws::String& name);
17+
18+
AWS_BEDROCKDATAAUTOMATION_API Aws::String GetNameForAudioGenerativeOutputLanguage(AudioGenerativeOutputLanguage value);
19+
} // namespace AudioGenerativeOutputLanguageMapper
20+
} // namespace Model
21+
} // namespace BedrockDataAutomation
22+
} // namespace Aws
Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
6+
#pragma once
7+
#include <aws/bedrock-data-automation/BedrockDataAutomation_EXPORTS.h>
8+
#include <aws/bedrock-data-automation/model/AudioGenerativeOutputLanguage.h>
9+
#include <aws/bedrock-data-automation/model/Language.h>
10+
#include <aws/core/utils/memory/stl/AWSVector.h>
11+
12+
#include <utility>
13+
14+
namespace Aws {
15+
namespace Utils {
16+
namespace Json {
17+
class JsonValue;
18+
class JsonView;
19+
} // namespace Json
20+
} // namespace Utils
21+
namespace BedrockDataAutomation {
22+
namespace Model {
23+
24+
/**
25+
* <p>Optional configuration for audio language settings</p><p><h3>See Also:</h3>
26+
* <a
27+
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-data-automation-2023-07-26/AudioLanguageConfiguration">AWS
28+
* API Reference</a></p>
29+
*/
30+
class AudioLanguageConfiguration {
31+
public:
32+
AWS_BEDROCKDATAAUTOMATION_API AudioLanguageConfiguration() = default;
33+
AWS_BEDROCKDATAAUTOMATION_API AudioLanguageConfiguration(Aws::Utils::Json::JsonView jsonValue);
34+
AWS_BEDROCKDATAAUTOMATION_API AudioLanguageConfiguration& operator=(Aws::Utils::Json::JsonView jsonValue);
35+
AWS_BEDROCKDATAAUTOMATION_API Aws::Utils::Json::JsonValue Jsonize() const;
36+
37+
///@{
38+
39+
inline const Aws::Vector<Language>& GetInputLanguages() const { return m_inputLanguages; }
40+
inline bool InputLanguagesHasBeenSet() const { return m_inputLanguagesHasBeenSet; }
41+
template <typename InputLanguagesT = Aws::Vector<Language>>
42+
void SetInputLanguages(InputLanguagesT&& value) {
43+
m_inputLanguagesHasBeenSet = true;
44+
m_inputLanguages = std::forward<InputLanguagesT>(value);
45+
}
46+
template <typename InputLanguagesT = Aws::Vector<Language>>
47+
AudioLanguageConfiguration& WithInputLanguages(InputLanguagesT&& value) {
48+
SetInputLanguages(std::forward<InputLanguagesT>(value));
49+
return *this;
50+
}
51+
inline AudioLanguageConfiguration& AddInputLanguages(Language value) {
52+
m_inputLanguagesHasBeenSet = true;
53+
m_inputLanguages.push_back(value);
54+
return *this;
55+
}
56+
///@}
57+
58+
///@{
59+
60+
inline AudioGenerativeOutputLanguage GetGenerativeOutputLanguage() const { return m_generativeOutputLanguage; }
61+
inline bool GenerativeOutputLanguageHasBeenSet() const { return m_generativeOutputLanguageHasBeenSet; }
62+
inline void SetGenerativeOutputLanguage(AudioGenerativeOutputLanguage value) {
63+
m_generativeOutputLanguageHasBeenSet = true;
64+
m_generativeOutputLanguage = value;
65+
}
66+
inline AudioLanguageConfiguration& WithGenerativeOutputLanguage(AudioGenerativeOutputLanguage value) {
67+
SetGenerativeOutputLanguage(value);
68+
return *this;
69+
}
70+
///@}
71+
72+
///@{
73+
/**
74+
* <p>Enable multiple language identification in audio</p>
75+
*/
76+
inline bool GetIdentifyMultipleLanguages() const { return m_identifyMultipleLanguages; }
77+
inline bool IdentifyMultipleLanguagesHasBeenSet() const { return m_identifyMultipleLanguagesHasBeenSet; }
78+
inline void SetIdentifyMultipleLanguages(bool value) {
79+
m_identifyMultipleLanguagesHasBeenSet = true;
80+
m_identifyMultipleLanguages = value;
81+
}
82+
inline AudioLanguageConfiguration& WithIdentifyMultipleLanguages(bool value) {
83+
SetIdentifyMultipleLanguages(value);
84+
return *this;
85+
}
86+
///@}
87+
private:
88+
Aws::Vector<Language> m_inputLanguages;
89+
bool m_inputLanguagesHasBeenSet = false;
90+
91+
AudioGenerativeOutputLanguage m_generativeOutputLanguage{AudioGenerativeOutputLanguage::NOT_SET};
92+
bool m_generativeOutputLanguageHasBeenSet = false;
93+
94+
bool m_identifyMultipleLanguages{false};
95+
bool m_identifyMultipleLanguagesHasBeenSet = false;
96+
};
97+
98+
} // namespace Model
99+
} // namespace BedrockDataAutomation
100+
} // namespace Aws

generated/src/aws-cpp-sdk-bedrock-data-automation/include/aws/bedrock-data-automation/model/AudioOverrideConfiguration.h

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#pragma once
77
#include <aws/bedrock-data-automation/BedrockDataAutomation_EXPORTS.h>
8+
#include <aws/bedrock-data-automation/model/AudioLanguageConfiguration.h>
89
#include <aws/bedrock-data-automation/model/ModalityProcessingConfiguration.h>
910

1011
#include <utility>
@@ -46,9 +47,28 @@ class AudioOverrideConfiguration {
4647
return *this;
4748
}
4849
///@}
50+
51+
///@{
52+
53+
inline const AudioLanguageConfiguration& GetLanguageConfiguration() const { return m_languageConfiguration; }
54+
inline bool LanguageConfigurationHasBeenSet() const { return m_languageConfigurationHasBeenSet; }
55+
template <typename LanguageConfigurationT = AudioLanguageConfiguration>
56+
void SetLanguageConfiguration(LanguageConfigurationT&& value) {
57+
m_languageConfigurationHasBeenSet = true;
58+
m_languageConfiguration = std::forward<LanguageConfigurationT>(value);
59+
}
60+
template <typename LanguageConfigurationT = AudioLanguageConfiguration>
61+
AudioOverrideConfiguration& WithLanguageConfiguration(LanguageConfigurationT&& value) {
62+
SetLanguageConfiguration(std::forward<LanguageConfigurationT>(value));
63+
return *this;
64+
}
65+
///@}
4966
private:
5067
ModalityProcessingConfiguration m_modalityProcessing;
5168
bool m_modalityProcessingHasBeenSet = false;
69+
70+
AudioLanguageConfiguration m_languageConfiguration;
71+
bool m_languageConfigurationHasBeenSet = false;
5272
};
5373

5474
} // namespace Model
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
6+
#pragma once
7+
#include <aws/bedrock-data-automation/BedrockDataAutomation_EXPORTS.h>
8+
#include <aws/core/utils/memory/stl/AWSString.h>
9+
10+
namespace Aws {
11+
namespace BedrockDataAutomation {
12+
namespace Model {
13+
enum class Language { NOT_SET, EN, DE, ES, FR, IT, PT, JA, KO, CN, TW, HK };
14+
15+
namespace LanguageMapper {
16+
AWS_BEDROCKDATAAUTOMATION_API Language GetLanguageForName(const Aws::String& name);
17+
18+
AWS_BEDROCKDATAAUTOMATION_API Aws::String GetNameForLanguage(Language value);
19+
} // namespace LanguageMapper
20+
} // namespace Model
21+
} // namespace BedrockDataAutomation
22+
} // namespace Aws
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
6+
#include <aws/bedrock-data-automation/model/AudioGenerativeOutputLanguage.h>
7+
#include <aws/core/Globals.h>
8+
#include <aws/core/utils/EnumParseOverflowContainer.h>
9+
#include <aws/core/utils/HashingUtils.h>
10+
11+
using namespace Aws::Utils;
12+
13+
namespace Aws {
14+
namespace BedrockDataAutomation {
15+
namespace Model {
16+
namespace AudioGenerativeOutputLanguageMapper {
17+
18+
static const int DEFAULT_HASH = HashingUtils::HashString("DEFAULT");
19+
static const int EN_HASH = HashingUtils::HashString("EN");
20+
21+
AudioGenerativeOutputLanguage GetAudioGenerativeOutputLanguageForName(const Aws::String& name) {
22+
int hashCode = HashingUtils::HashString(name.c_str());
23+
if (hashCode == DEFAULT_HASH) {
24+
return AudioGenerativeOutputLanguage::DEFAULT;
25+
} else if (hashCode == EN_HASH) {
26+
return AudioGenerativeOutputLanguage::EN;
27+
}
28+
EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
29+
if (overflowContainer) {
30+
overflowContainer->StoreOverflow(hashCode, name);
31+
return static_cast<AudioGenerativeOutputLanguage>(hashCode);
32+
}
33+
34+
return AudioGenerativeOutputLanguage::NOT_SET;
35+
}
36+
37+
Aws::String GetNameForAudioGenerativeOutputLanguage(AudioGenerativeOutputLanguage enumValue) {
38+
switch (enumValue) {
39+
case AudioGenerativeOutputLanguage::NOT_SET:
40+
return {};
41+
case AudioGenerativeOutputLanguage::DEFAULT:
42+
return "DEFAULT";
43+
case AudioGenerativeOutputLanguage::EN:
44+
return "EN";
45+
default:
46+
EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
47+
if (overflowContainer) {
48+
return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
49+
}
50+
51+
return {};
52+
}
53+
}
54+
55+
} // namespace AudioGenerativeOutputLanguageMapper
56+
} // namespace Model
57+
} // namespace BedrockDataAutomation
58+
} // namespace Aws
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
6+
#include <aws/bedrock-data-automation/model/AudioLanguageConfiguration.h>
7+
#include <aws/core/utils/json/JsonSerializer.h>
8+
9+
#include <utility>
10+
11+
using namespace Aws::Utils::Json;
12+
using namespace Aws::Utils;
13+
14+
namespace Aws {
15+
namespace BedrockDataAutomation {
16+
namespace Model {
17+
18+
AudioLanguageConfiguration::AudioLanguageConfiguration(JsonView jsonValue) { *this = jsonValue; }
19+
20+
AudioLanguageConfiguration& AudioLanguageConfiguration::operator=(JsonView jsonValue) {
21+
if (jsonValue.ValueExists("inputLanguages")) {
22+
Aws::Utils::Array<JsonView> inputLanguagesJsonList = jsonValue.GetArray("inputLanguages");
23+
for (unsigned inputLanguagesIndex = 0; inputLanguagesIndex < inputLanguagesJsonList.GetLength(); ++inputLanguagesIndex) {
24+
m_inputLanguages.push_back(LanguageMapper::GetLanguageForName(inputLanguagesJsonList[inputLanguagesIndex].AsString()));
25+
}
26+
m_inputLanguagesHasBeenSet = true;
27+
}
28+
if (jsonValue.ValueExists("generativeOutputLanguage")) {
29+
m_generativeOutputLanguage =
30+
AudioGenerativeOutputLanguageMapper::GetAudioGenerativeOutputLanguageForName(jsonValue.GetString("generativeOutputLanguage"));
31+
m_generativeOutputLanguageHasBeenSet = true;
32+
}
33+
if (jsonValue.ValueExists("identifyMultipleLanguages")) {
34+
m_identifyMultipleLanguages = jsonValue.GetBool("identifyMultipleLanguages");
35+
m_identifyMultipleLanguagesHasBeenSet = true;
36+
}
37+
return *this;
38+
}
39+
40+
JsonValue AudioLanguageConfiguration::Jsonize() const {
41+
JsonValue payload;
42+
43+
if (m_inputLanguagesHasBeenSet) {
44+
Aws::Utils::Array<JsonValue> inputLanguagesJsonList(m_inputLanguages.size());
45+
for (unsigned inputLanguagesIndex = 0; inputLanguagesIndex < inputLanguagesJsonList.GetLength(); ++inputLanguagesIndex) {
46+
inputLanguagesJsonList[inputLanguagesIndex].AsString(LanguageMapper::GetNameForLanguage(m_inputLanguages[inputLanguagesIndex]));
47+
}
48+
payload.WithArray("inputLanguages", std::move(inputLanguagesJsonList));
49+
}
50+
51+
if (m_generativeOutputLanguageHasBeenSet) {
52+
payload.WithString("generativeOutputLanguage",
53+
AudioGenerativeOutputLanguageMapper::GetNameForAudioGenerativeOutputLanguage(m_generativeOutputLanguage));
54+
}
55+
56+
if (m_identifyMultipleLanguagesHasBeenSet) {
57+
payload.WithBool("identifyMultipleLanguages", m_identifyMultipleLanguages);
58+
}
59+
60+
return payload;
61+
}
62+
63+
} // namespace Model
64+
} // namespace BedrockDataAutomation
65+
} // namespace Aws

0 commit comments

Comments
 (0)