Skip to content

Commit 297d526

Browse files
aws-sdk-cpp-automationaws-sdk-cpp-automation
committed
This is a general availability (GA) release of Connector for SCEP, a feature of AWS Private CA. Connector for SCEP links your SCEP-enabled and mobile device management systems to AWS Private CA for digital signature installation and certificate management.
Launching Global Cluster tagging. Doc only update for AWS Organizations that fixes several customer-reported issues Removing the ON_PREMISE enum from the input settings field. This release adds additional enhancements to AWS IoT Device Management Software Package Catalog and Jobs. It also adds SBOM support in Software Package Version. This feature adds cross account s3 bucket and VPC support to ModelInvocation jobs. To use a cross account bucket, pass in the accountId of the bucket to s3BucketOwner in the ModelInvocationJobInputDataConfig or ModelInvocationJobOutputDataConfig.
1 parent 167d347 commit 297d526

File tree

73 files changed

+2934
-232
lines changed

Some content is hidden

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

73 files changed

+2934
-232
lines changed

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.405
1+
1.11.406

‎generated/src/aws-cpp-sdk-bedrock/include/aws/bedrock/model/CreateModelCustomizationJobRequest.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,10 @@ namespace Model
233233

234234
///@{
235235
/**
236-
* <p>VPC configuration (optional). Configuration parameters for the private
237-
* Virtual Private Cloud (VPC) that contains the resources you are using for this
238-
* job.</p>
236+
* <p>The configuration of the Virtual Private Cloud (VPC) that contains the
237+
* resources that you're using for this job. For more information, see <a
238+
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/vpc-model-customization.html">Protect
239+
* your model customization jobs using a VPC</a>.</p>
239240
*/
240241
inline const VpcConfig& GetVpcConfig() const{ return m_vpcConfig; }
241242
inline bool VpcConfigHasBeenSet() const { return m_vpcConfigHasBeenSet; }

‎generated/src/aws-cpp-sdk-bedrock/include/aws/bedrock/model/CreateModelInvocationJobRequest.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <aws/core/utils/memory/stl/AWSString.h>
1010
#include <aws/bedrock/model/ModelInvocationJobInputDataConfig.h>
1111
#include <aws/bedrock/model/ModelInvocationJobOutputDataConfig.h>
12+
#include <aws/bedrock/model/VpcConfig.h>
1213
#include <aws/core/utils/memory/stl/AWSVector.h>
1314
#include <aws/bedrock/model/Tag.h>
1415
#include <utility>
@@ -126,6 +127,21 @@ namespace Model
126127
inline CreateModelInvocationJobRequest& WithOutputDataConfig(ModelInvocationJobOutputDataConfig&& value) { SetOutputDataConfig(std::move(value)); return *this;}
127128
///@}
128129

130+
///@{
131+
/**
132+
* <p>The configuration of the Virtual Private Cloud (VPC) for the data in the
133+
* batch inference job. For more information, see <a
134+
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/batch-inference-vpc">Protect
135+
* batch inference jobs using a VPC</a>.</p>
136+
*/
137+
inline const VpcConfig& GetVpcConfig() const{ return m_vpcConfig; }
138+
inline bool VpcConfigHasBeenSet() const { return m_vpcConfigHasBeenSet; }
139+
inline void SetVpcConfig(const VpcConfig& value) { m_vpcConfigHasBeenSet = true; m_vpcConfig = value; }
140+
inline void SetVpcConfig(VpcConfig&& value) { m_vpcConfigHasBeenSet = true; m_vpcConfig = std::move(value); }
141+
inline CreateModelInvocationJobRequest& WithVpcConfig(const VpcConfig& value) { SetVpcConfig(value); return *this;}
142+
inline CreateModelInvocationJobRequest& WithVpcConfig(VpcConfig&& value) { SetVpcConfig(std::move(value)); return *this;}
143+
///@}
144+
129145
///@{
130146
/**
131147
* <p>The number of hours after which to force the batch inference job to time
@@ -173,6 +189,9 @@ namespace Model
173189
ModelInvocationJobOutputDataConfig m_outputDataConfig;
174190
bool m_outputDataConfigHasBeenSet = false;
175191

192+
VpcConfig m_vpcConfig;
193+
bool m_vpcConfigHasBeenSet = false;
194+
176195
int m_timeoutDurationInHours;
177196
bool m_timeoutDurationInHoursHasBeenSet = false;
178197

‎generated/src/aws-cpp-sdk-bedrock/include/aws/bedrock/model/GetModelInvocationJobResult.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <aws/core/utils/DateTime.h>
1111
#include <aws/bedrock/model/ModelInvocationJobInputDataConfig.h>
1212
#include <aws/bedrock/model/ModelInvocationJobOutputDataConfig.h>
13+
#include <aws/bedrock/model/VpcConfig.h>
1314
#include <utility>
1415

1516
namespace Aws
@@ -189,6 +190,20 @@ namespace Model
189190
inline GetModelInvocationJobResult& WithOutputDataConfig(ModelInvocationJobOutputDataConfig&& value) { SetOutputDataConfig(std::move(value)); return *this;}
190191
///@}
191192

193+
///@{
194+
/**
195+
* <p>The configuration of the Virtual Private Cloud (VPC) for the data in the
196+
* batch inference job. For more information, see <a
197+
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/batch-inference-vpc">Protect
198+
* batch inference jobs using a VPC</a>.</p>
199+
*/
200+
inline const VpcConfig& GetVpcConfig() const{ return m_vpcConfig; }
201+
inline void SetVpcConfig(const VpcConfig& value) { m_vpcConfig = value; }
202+
inline void SetVpcConfig(VpcConfig&& value) { m_vpcConfig = std::move(value); }
203+
inline GetModelInvocationJobResult& WithVpcConfig(const VpcConfig& value) { SetVpcConfig(value); return *this;}
204+
inline GetModelInvocationJobResult& WithVpcConfig(VpcConfig&& value) { SetVpcConfig(std::move(value)); return *this;}
205+
///@}
206+
192207
///@{
193208
/**
194209
* <p>The number of hours after which batch inference job was set to time out.</p>
@@ -245,6 +260,8 @@ namespace Model
245260

246261
ModelInvocationJobOutputDataConfig m_outputDataConfig;
247262

263+
VpcConfig m_vpcConfig;
264+
248265
int m_timeoutDurationInHours;
249266

250267
Aws::Utils::DateTime m_jobExpirationTime;

‎generated/src/aws-cpp-sdk-bedrock/include/aws/bedrock/model/ModelInvocationJobS3InputDataConfig.h

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Model
2525
{
2626

2727
/**
28-
* <p>Contains the configuration of the S3 location of the output
28+
* <p>Contains the configuration of the S3 location of the input
2929
* data.</p><p><h3>See Also:</h3> <a
3030
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/ModelInvocationJobS3InputDataConfig">AWS
3131
* API Reference</a></p>
@@ -64,13 +64,31 @@ namespace Model
6464
inline ModelInvocationJobS3InputDataConfig& WithS3Uri(Aws::String&& value) { SetS3Uri(std::move(value)); return *this;}
6565
inline ModelInvocationJobS3InputDataConfig& WithS3Uri(const char* value) { SetS3Uri(value); return *this;}
6666
///@}
67+
68+
///@{
69+
/**
70+
* <p>The ID of the Amazon Web Services account that owns the S3 bucket containing
71+
* the input data.</p>
72+
*/
73+
inline const Aws::String& GetS3BucketOwner() const{ return m_s3BucketOwner; }
74+
inline bool S3BucketOwnerHasBeenSet() const { return m_s3BucketOwnerHasBeenSet; }
75+
inline void SetS3BucketOwner(const Aws::String& value) { m_s3BucketOwnerHasBeenSet = true; m_s3BucketOwner = value; }
76+
inline void SetS3BucketOwner(Aws::String&& value) { m_s3BucketOwnerHasBeenSet = true; m_s3BucketOwner = std::move(value); }
77+
inline void SetS3BucketOwner(const char* value) { m_s3BucketOwnerHasBeenSet = true; m_s3BucketOwner.assign(value); }
78+
inline ModelInvocationJobS3InputDataConfig& WithS3BucketOwner(const Aws::String& value) { SetS3BucketOwner(value); return *this;}
79+
inline ModelInvocationJobS3InputDataConfig& WithS3BucketOwner(Aws::String&& value) { SetS3BucketOwner(std::move(value)); return *this;}
80+
inline ModelInvocationJobS3InputDataConfig& WithS3BucketOwner(const char* value) { SetS3BucketOwner(value); return *this;}
81+
///@}
6782
private:
6883

6984
S3InputFormat m_s3InputFormat;
7085
bool m_s3InputFormatHasBeenSet = false;
7186

7287
Aws::String m_s3Uri;
7388
bool m_s3UriHasBeenSet = false;
89+
90+
Aws::String m_s3BucketOwner;
91+
bool m_s3BucketOwnerHasBeenSet = false;
7492
};
7593

7694
} // namespace Model

‎generated/src/aws-cpp-sdk-bedrock/include/aws/bedrock/model/ModelInvocationJobS3OutputDataConfig.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,31 @@ namespace Model
6666
inline ModelInvocationJobS3OutputDataConfig& WithS3EncryptionKeyId(Aws::String&& value) { SetS3EncryptionKeyId(std::move(value)); return *this;}
6767
inline ModelInvocationJobS3OutputDataConfig& WithS3EncryptionKeyId(const char* value) { SetS3EncryptionKeyId(value); return *this;}
6868
///@}
69+
70+
///@{
71+
/**
72+
* <p>The ID of the Amazon Web Services account that owns the S3 bucket containing
73+
* the output data.</p>
74+
*/
75+
inline const Aws::String& GetS3BucketOwner() const{ return m_s3BucketOwner; }
76+
inline bool S3BucketOwnerHasBeenSet() const { return m_s3BucketOwnerHasBeenSet; }
77+
inline void SetS3BucketOwner(const Aws::String& value) { m_s3BucketOwnerHasBeenSet = true; m_s3BucketOwner = value; }
78+
inline void SetS3BucketOwner(Aws::String&& value) { m_s3BucketOwnerHasBeenSet = true; m_s3BucketOwner = std::move(value); }
79+
inline void SetS3BucketOwner(const char* value) { m_s3BucketOwnerHasBeenSet = true; m_s3BucketOwner.assign(value); }
80+
inline ModelInvocationJobS3OutputDataConfig& WithS3BucketOwner(const Aws::String& value) { SetS3BucketOwner(value); return *this;}
81+
inline ModelInvocationJobS3OutputDataConfig& WithS3BucketOwner(Aws::String&& value) { SetS3BucketOwner(std::move(value)); return *this;}
82+
inline ModelInvocationJobS3OutputDataConfig& WithS3BucketOwner(const char* value) { SetS3BucketOwner(value); return *this;}
83+
///@}
6984
private:
7085

7186
Aws::String m_s3Uri;
7287
bool m_s3UriHasBeenSet = false;
7388

7489
Aws::String m_s3EncryptionKeyId;
7590
bool m_s3EncryptionKeyIdHasBeenSet = false;
91+
92+
Aws::String m_s3BucketOwner;
93+
bool m_s3BucketOwnerHasBeenSet = false;
7694
};
7795

7896
} // namespace Model

‎generated/src/aws-cpp-sdk-bedrock/include/aws/bedrock/model/ModelInvocationJobSummary.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <aws/core/utils/DateTime.h>
1111
#include <aws/bedrock/model/ModelInvocationJobInputDataConfig.h>
1212
#include <aws/bedrock/model/ModelInvocationJobOutputDataConfig.h>
13+
#include <aws/bedrock/model/VpcConfig.h>
1314
#include <utility>
1415

1516
namespace Aws
@@ -206,6 +207,21 @@ namespace Model
206207
inline ModelInvocationJobSummary& WithOutputDataConfig(ModelInvocationJobOutputDataConfig&& value) { SetOutputDataConfig(std::move(value)); return *this;}
207208
///@}
208209

210+
///@{
211+
/**
212+
* <p>The configuration of the Virtual Private Cloud (VPC) for the data in the
213+
* batch inference job. For more information, see <a
214+
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/batch-inference-vpc">Protect
215+
* batch inference jobs using a VPC</a>.</p>
216+
*/
217+
inline const VpcConfig& GetVpcConfig() const{ return m_vpcConfig; }
218+
inline bool VpcConfigHasBeenSet() const { return m_vpcConfigHasBeenSet; }
219+
inline void SetVpcConfig(const VpcConfig& value) { m_vpcConfigHasBeenSet = true; m_vpcConfig = value; }
220+
inline void SetVpcConfig(VpcConfig&& value) { m_vpcConfigHasBeenSet = true; m_vpcConfig = std::move(value); }
221+
inline ModelInvocationJobSummary& WithVpcConfig(const VpcConfig& value) { SetVpcConfig(value); return *this;}
222+
inline ModelInvocationJobSummary& WithVpcConfig(VpcConfig&& value) { SetVpcConfig(std::move(value)); return *this;}
223+
///@}
224+
209225
///@{
210226
/**
211227
* <p>The number of hours after which the batch inference job was set to time
@@ -266,6 +282,9 @@ namespace Model
266282
ModelInvocationJobOutputDataConfig m_outputDataConfig;
267283
bool m_outputDataConfigHasBeenSet = false;
268284

285+
VpcConfig m_vpcConfig;
286+
bool m_vpcConfigHasBeenSet = false;
287+
269288
int m_timeoutDurationInHours;
270289
bool m_timeoutDurationInHoursHasBeenSet = false;
271290

‎generated/src/aws-cpp-sdk-bedrock/include/aws/bedrock/model/VpcConfig.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ namespace Model
2525
{
2626

2727
/**
28-
* <p>VPC configuration.</p><p><h3>See Also:</h3> <a
28+
* <p>The configuration of a virtual private cloud (VPC). For more information, see
29+
* <a
30+
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/usingVPC.html">Protect
31+
* your data using Amazon Virtual Private Cloud and Amazon Web Services
32+
* PrivateLink</a>.</p><p><h3>See Also:</h3> <a
2933
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/VpcConfig">AWS
3034
* API Reference</a></p>
3135
*/
@@ -40,7 +44,7 @@ namespace Model
4044

4145
///@{
4246
/**
43-
* <p>VPC configuration subnets.</p>
47+
* <p>An array of IDs for each subnet in the VPC to use.</p>
4448
*/
4549
inline const Aws::Vector<Aws::String>& GetSubnetIds() const{ return m_subnetIds; }
4650
inline bool SubnetIdsHasBeenSet() const { return m_subnetIdsHasBeenSet; }
@@ -55,7 +59,7 @@ namespace Model
5559

5660
///@{
5761
/**
58-
* <p>VPC configuration security group Ids.</p>
62+
* <p>An array of IDs for each security group in the VPC to use.</p>
5963
*/
6064
inline const Aws::Vector<Aws::String>& GetSecurityGroupIds() const{ return m_securityGroupIds; }
6165
inline bool SecurityGroupIdsHasBeenSet() const { return m_securityGroupIdsHasBeenSet; }

‎generated/src/aws-cpp-sdk-bedrock/source/model/CreateModelInvocationJobRequest.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CreateModelInvocationJobRequest::CreateModelInvocationJobRequest() :
2020
m_modelIdHasBeenSet(false),
2121
m_inputDataConfigHasBeenSet(false),
2222
m_outputDataConfigHasBeenSet(false),
23+
m_vpcConfigHasBeenSet(false),
2324
m_timeoutDurationInHours(0),
2425
m_timeoutDurationInHoursHasBeenSet(false),
2526
m_tagsHasBeenSet(false)
@@ -66,6 +67,12 @@ Aws::String CreateModelInvocationJobRequest::SerializePayload() const
6667

6768
}
6869

70+
if(m_vpcConfigHasBeenSet)
71+
{
72+
payload.WithObject("vpcConfig", m_vpcConfig.Jsonize());
73+
74+
}
75+
6976
if(m_timeoutDurationInHoursHasBeenSet)
7077
{
7178
payload.WithInteger("timeoutDurationInHours", m_timeoutDurationInHours);

‎generated/src/aws-cpp-sdk-bedrock/source/model/GetModelInvocationJobResult.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@ GetModelInvocationJobResult& GetModelInvocationJobResult::operator =(const Aws::
104104

105105
}
106106

107+
if(jsonValue.ValueExists("vpcConfig"))
108+
{
109+
m_vpcConfig = jsonValue.GetObject("vpcConfig");
110+
111+
}
112+
107113
if(jsonValue.ValueExists("timeoutDurationInHours"))
108114
{
109115
m_timeoutDurationInHours = jsonValue.GetInteger("timeoutDurationInHours");

‎generated/src/aws-cpp-sdk-bedrock/source/model/ModelInvocationJobS3InputDataConfig.cpp

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ namespace Model
2121
ModelInvocationJobS3InputDataConfig::ModelInvocationJobS3InputDataConfig() :
2222
m_s3InputFormat(S3InputFormat::NOT_SET),
2323
m_s3InputFormatHasBeenSet(false),
24-
m_s3UriHasBeenSet(false)
24+
m_s3UriHasBeenSet(false),
25+
m_s3BucketOwnerHasBeenSet(false)
2526
{
2627
}
2728

@@ -47,6 +48,13 @@ ModelInvocationJobS3InputDataConfig& ModelInvocationJobS3InputDataConfig::operat
4748
m_s3UriHasBeenSet = true;
4849
}
4950

51+
if(jsonValue.ValueExists("s3BucketOwner"))
52+
{
53+
m_s3BucketOwner = jsonValue.GetString("s3BucketOwner");
54+
55+
m_s3BucketOwnerHasBeenSet = true;
56+
}
57+
5058
return *this;
5159
}
5260

@@ -65,6 +73,12 @@ JsonValue ModelInvocationJobS3InputDataConfig::Jsonize() const
6573

6674
}
6775

76+
if(m_s3BucketOwnerHasBeenSet)
77+
{
78+
payload.WithString("s3BucketOwner", m_s3BucketOwner);
79+
80+
}
81+
6882
return payload;
6983
}
7084

‎generated/src/aws-cpp-sdk-bedrock/source/model/ModelInvocationJobS3OutputDataConfig.cpp

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ namespace Model
2020

2121
ModelInvocationJobS3OutputDataConfig::ModelInvocationJobS3OutputDataConfig() :
2222
m_s3UriHasBeenSet(false),
23-
m_s3EncryptionKeyIdHasBeenSet(false)
23+
m_s3EncryptionKeyIdHasBeenSet(false),
24+
m_s3BucketOwnerHasBeenSet(false)
2425
{
2526
}
2627

@@ -46,6 +47,13 @@ ModelInvocationJobS3OutputDataConfig& ModelInvocationJobS3OutputDataConfig::oper
4647
m_s3EncryptionKeyIdHasBeenSet = true;
4748
}
4849

50+
if(jsonValue.ValueExists("s3BucketOwner"))
51+
{
52+
m_s3BucketOwner = jsonValue.GetString("s3BucketOwner");
53+
54+
m_s3BucketOwnerHasBeenSet = true;
55+
}
56+
4957
return *this;
5058
}
5159

@@ -65,6 +73,12 @@ JsonValue ModelInvocationJobS3OutputDataConfig::Jsonize() const
6573

6674
}
6775

76+
if(m_s3BucketOwnerHasBeenSet)
77+
{
78+
payload.WithString("s3BucketOwner", m_s3BucketOwner);
79+
80+
}
81+
6882
return payload;
6983
}
7084

‎generated/src/aws-cpp-sdk-bedrock/source/model/ModelInvocationJobSummary.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ ModelInvocationJobSummary::ModelInvocationJobSummary() :
3232
m_endTimeHasBeenSet(false),
3333
m_inputDataConfigHasBeenSet(false),
3434
m_outputDataConfigHasBeenSet(false),
35+
m_vpcConfigHasBeenSet(false),
3536
m_timeoutDurationInHours(0),
3637
m_timeoutDurationInHoursHasBeenSet(false),
3738
m_jobExpirationTimeHasBeenSet(false)
@@ -130,6 +131,13 @@ ModelInvocationJobSummary& ModelInvocationJobSummary::operator =(JsonView jsonVa
130131
m_outputDataConfigHasBeenSet = true;
131132
}
132133

134+
if(jsonValue.ValueExists("vpcConfig"))
135+
{
136+
m_vpcConfig = jsonValue.GetObject("vpcConfig");
137+
138+
m_vpcConfigHasBeenSet = true;
139+
}
140+
133141
if(jsonValue.ValueExists("timeoutDurationInHours"))
134142
{
135143
m_timeoutDurationInHours = jsonValue.GetInteger("timeoutDurationInHours");
@@ -219,6 +227,12 @@ JsonValue ModelInvocationJobSummary::Jsonize() const
219227

220228
}
221229

230+
if(m_vpcConfigHasBeenSet)
231+
{
232+
payload.WithObject("vpcConfig", m_vpcConfig.Jsonize());
233+
234+
}
235+
222236
if(m_timeoutDurationInHoursHasBeenSet)
223237
{
224238
payload.WithInteger("timeoutDurationInHours", m_timeoutDurationInHours);

0 commit comments

Comments
 (0)