Skip to content

Commit

Permalink
This is a general availability (GA) release of Connector for SCEP, a …
Browse files Browse the repository at this point in the history
…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.
  • Loading branch information
aws-sdk-cpp-automation committed Sep 16, 2024
1 parent 167d347 commit 297d526
Show file tree
Hide file tree
Showing 73 changed files with 2,934 additions and 232 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.405
1.11.406
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,10 @@ namespace Model

///@{
/**
* <p>VPC configuration (optional). Configuration parameters for the private
* Virtual Private Cloud (VPC) that contains the resources you are using for this
* job.</p>
* <p>The configuration of the Virtual Private Cloud (VPC) that contains the
* resources that you're using for this job. For more information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/vpc-model-customization.html">Protect
* your model customization jobs using a VPC</a>.</p>
*/
inline const VpcConfig& GetVpcConfig() const{ return m_vpcConfig; }
inline bool VpcConfigHasBeenSet() const { return m_vpcConfigHasBeenSet; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <aws/core/utils/memory/stl/AWSString.h>
#include <aws/bedrock/model/ModelInvocationJobInputDataConfig.h>
#include <aws/bedrock/model/ModelInvocationJobOutputDataConfig.h>
#include <aws/bedrock/model/VpcConfig.h>
#include <aws/core/utils/memory/stl/AWSVector.h>
#include <aws/bedrock/model/Tag.h>
#include <utility>
Expand Down Expand Up @@ -126,6 +127,21 @@ namespace Model
inline CreateModelInvocationJobRequest& WithOutputDataConfig(ModelInvocationJobOutputDataConfig&& value) { SetOutputDataConfig(std::move(value)); return *this;}
///@}

///@{
/**
* <p>The configuration of the Virtual Private Cloud (VPC) for the data in the
* batch inference job. For more information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/batch-inference-vpc">Protect
* batch inference jobs using a VPC</a>.</p>
*/
inline const VpcConfig& GetVpcConfig() const{ return m_vpcConfig; }
inline bool VpcConfigHasBeenSet() const { return m_vpcConfigHasBeenSet; }
inline void SetVpcConfig(const VpcConfig& value) { m_vpcConfigHasBeenSet = true; m_vpcConfig = value; }
inline void SetVpcConfig(VpcConfig&& value) { m_vpcConfigHasBeenSet = true; m_vpcConfig = std::move(value); }
inline CreateModelInvocationJobRequest& WithVpcConfig(const VpcConfig& value) { SetVpcConfig(value); return *this;}
inline CreateModelInvocationJobRequest& WithVpcConfig(VpcConfig&& value) { SetVpcConfig(std::move(value)); return *this;}
///@}

///@{
/**
* <p>The number of hours after which to force the batch inference job to time
Expand Down Expand Up @@ -173,6 +189,9 @@ namespace Model
ModelInvocationJobOutputDataConfig m_outputDataConfig;
bool m_outputDataConfigHasBeenSet = false;

VpcConfig m_vpcConfig;
bool m_vpcConfigHasBeenSet = false;

int m_timeoutDurationInHours;
bool m_timeoutDurationInHoursHasBeenSet = false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <aws/core/utils/DateTime.h>
#include <aws/bedrock/model/ModelInvocationJobInputDataConfig.h>
#include <aws/bedrock/model/ModelInvocationJobOutputDataConfig.h>
#include <aws/bedrock/model/VpcConfig.h>
#include <utility>

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

///@{
/**
* <p>The configuration of the Virtual Private Cloud (VPC) for the data in the
* batch inference job. For more information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/batch-inference-vpc">Protect
* batch inference jobs using a VPC</a>.</p>
*/
inline const VpcConfig& GetVpcConfig() const{ return m_vpcConfig; }
inline void SetVpcConfig(const VpcConfig& value) { m_vpcConfig = value; }
inline void SetVpcConfig(VpcConfig&& value) { m_vpcConfig = std::move(value); }
inline GetModelInvocationJobResult& WithVpcConfig(const VpcConfig& value) { SetVpcConfig(value); return *this;}
inline GetModelInvocationJobResult& WithVpcConfig(VpcConfig&& value) { SetVpcConfig(std::move(value)); return *this;}
///@}

///@{
/**
* <p>The number of hours after which batch inference job was set to time out.</p>
Expand Down Expand Up @@ -245,6 +260,8 @@ namespace Model

ModelInvocationJobOutputDataConfig m_outputDataConfig;

VpcConfig m_vpcConfig;

int m_timeoutDurationInHours;

Aws::Utils::DateTime m_jobExpirationTime;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace Model
{

/**
* <p>Contains the configuration of the S3 location of the output
* <p>Contains the configuration of the S3 location of the input
* data.</p><p><h3>See Also:</h3> <a
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/ModelInvocationJobS3InputDataConfig">AWS
* API Reference</a></p>
Expand Down Expand Up @@ -64,13 +64,31 @@ namespace Model
inline ModelInvocationJobS3InputDataConfig& WithS3Uri(Aws::String&& value) { SetS3Uri(std::move(value)); return *this;}
inline ModelInvocationJobS3InputDataConfig& WithS3Uri(const char* value) { SetS3Uri(value); return *this;}
///@}

///@{
/**
* <p>The ID of the Amazon Web Services account that owns the S3 bucket containing
* the input data.</p>
*/
inline const Aws::String& GetS3BucketOwner() const{ return m_s3BucketOwner; }
inline bool S3BucketOwnerHasBeenSet() const { return m_s3BucketOwnerHasBeenSet; }
inline void SetS3BucketOwner(const Aws::String& value) { m_s3BucketOwnerHasBeenSet = true; m_s3BucketOwner = value; }
inline void SetS3BucketOwner(Aws::String&& value) { m_s3BucketOwnerHasBeenSet = true; m_s3BucketOwner = std::move(value); }
inline void SetS3BucketOwner(const char* value) { m_s3BucketOwnerHasBeenSet = true; m_s3BucketOwner.assign(value); }
inline ModelInvocationJobS3InputDataConfig& WithS3BucketOwner(const Aws::String& value) { SetS3BucketOwner(value); return *this;}
inline ModelInvocationJobS3InputDataConfig& WithS3BucketOwner(Aws::String&& value) { SetS3BucketOwner(std::move(value)); return *this;}
inline ModelInvocationJobS3InputDataConfig& WithS3BucketOwner(const char* value) { SetS3BucketOwner(value); return *this;}
///@}
private:

S3InputFormat m_s3InputFormat;
bool m_s3InputFormatHasBeenSet = false;

Aws::String m_s3Uri;
bool m_s3UriHasBeenSet = false;

Aws::String m_s3BucketOwner;
bool m_s3BucketOwnerHasBeenSet = false;
};

} // namespace Model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,31 @@ namespace Model
inline ModelInvocationJobS3OutputDataConfig& WithS3EncryptionKeyId(Aws::String&& value) { SetS3EncryptionKeyId(std::move(value)); return *this;}
inline ModelInvocationJobS3OutputDataConfig& WithS3EncryptionKeyId(const char* value) { SetS3EncryptionKeyId(value); return *this;}
///@}

///@{
/**
* <p>The ID of the Amazon Web Services account that owns the S3 bucket containing
* the output data.</p>
*/
inline const Aws::String& GetS3BucketOwner() const{ return m_s3BucketOwner; }
inline bool S3BucketOwnerHasBeenSet() const { return m_s3BucketOwnerHasBeenSet; }
inline void SetS3BucketOwner(const Aws::String& value) { m_s3BucketOwnerHasBeenSet = true; m_s3BucketOwner = value; }
inline void SetS3BucketOwner(Aws::String&& value) { m_s3BucketOwnerHasBeenSet = true; m_s3BucketOwner = std::move(value); }
inline void SetS3BucketOwner(const char* value) { m_s3BucketOwnerHasBeenSet = true; m_s3BucketOwner.assign(value); }
inline ModelInvocationJobS3OutputDataConfig& WithS3BucketOwner(const Aws::String& value) { SetS3BucketOwner(value); return *this;}
inline ModelInvocationJobS3OutputDataConfig& WithS3BucketOwner(Aws::String&& value) { SetS3BucketOwner(std::move(value)); return *this;}
inline ModelInvocationJobS3OutputDataConfig& WithS3BucketOwner(const char* value) { SetS3BucketOwner(value); return *this;}
///@}
private:

Aws::String m_s3Uri;
bool m_s3UriHasBeenSet = false;

Aws::String m_s3EncryptionKeyId;
bool m_s3EncryptionKeyIdHasBeenSet = false;

Aws::String m_s3BucketOwner;
bool m_s3BucketOwnerHasBeenSet = false;
};

} // namespace Model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <aws/core/utils/DateTime.h>
#include <aws/bedrock/model/ModelInvocationJobInputDataConfig.h>
#include <aws/bedrock/model/ModelInvocationJobOutputDataConfig.h>
#include <aws/bedrock/model/VpcConfig.h>
#include <utility>

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

///@{
/**
* <p>The configuration of the Virtual Private Cloud (VPC) for the data in the
* batch inference job. For more information, see <a
* href="https://docs.aws.amazon.com/bedrock/latest/userguide/batch-inference-vpc">Protect
* batch inference jobs using a VPC</a>.</p>
*/
inline const VpcConfig& GetVpcConfig() const{ return m_vpcConfig; }
inline bool VpcConfigHasBeenSet() const { return m_vpcConfigHasBeenSet; }
inline void SetVpcConfig(const VpcConfig& value) { m_vpcConfigHasBeenSet = true; m_vpcConfig = value; }
inline void SetVpcConfig(VpcConfig&& value) { m_vpcConfigHasBeenSet = true; m_vpcConfig = std::move(value); }
inline ModelInvocationJobSummary& WithVpcConfig(const VpcConfig& value) { SetVpcConfig(value); return *this;}
inline ModelInvocationJobSummary& WithVpcConfig(VpcConfig&& value) { SetVpcConfig(std::move(value)); return *this;}
///@}

///@{
/**
* <p>The number of hours after which the batch inference job was set to time
Expand Down Expand Up @@ -266,6 +282,9 @@ namespace Model
ModelInvocationJobOutputDataConfig m_outputDataConfig;
bool m_outputDataConfigHasBeenSet = false;

VpcConfig m_vpcConfig;
bool m_vpcConfigHasBeenSet = false;

int m_timeoutDurationInHours;
bool m_timeoutDurationInHoursHasBeenSet = false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ namespace Model
{

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

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

///@{
/**
* <p>VPC configuration security group Ids.</p>
* <p>An array of IDs for each security group in the VPC to use.</p>
*/
inline const Aws::Vector<Aws::String>& GetSecurityGroupIds() const{ return m_securityGroupIds; }
inline bool SecurityGroupIdsHasBeenSet() const { return m_securityGroupIdsHasBeenSet; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ CreateModelInvocationJobRequest::CreateModelInvocationJobRequest() :
m_modelIdHasBeenSet(false),
m_inputDataConfigHasBeenSet(false),
m_outputDataConfigHasBeenSet(false),
m_vpcConfigHasBeenSet(false),
m_timeoutDurationInHours(0),
m_timeoutDurationInHoursHasBeenSet(false),
m_tagsHasBeenSet(false)
Expand Down Expand Up @@ -66,6 +67,12 @@ Aws::String CreateModelInvocationJobRequest::SerializePayload() const

}

if(m_vpcConfigHasBeenSet)
{
payload.WithObject("vpcConfig", m_vpcConfig.Jsonize());

}

if(m_timeoutDurationInHoursHasBeenSet)
{
payload.WithInteger("timeoutDurationInHours", m_timeoutDurationInHours);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ GetModelInvocationJobResult& GetModelInvocationJobResult::operator =(const Aws::

}

if(jsonValue.ValueExists("vpcConfig"))
{
m_vpcConfig = jsonValue.GetObject("vpcConfig");

}

if(jsonValue.ValueExists("timeoutDurationInHours"))
{
m_timeoutDurationInHours = jsonValue.GetInteger("timeoutDurationInHours");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ namespace Model
ModelInvocationJobS3InputDataConfig::ModelInvocationJobS3InputDataConfig() :
m_s3InputFormat(S3InputFormat::NOT_SET),
m_s3InputFormatHasBeenSet(false),
m_s3UriHasBeenSet(false)
m_s3UriHasBeenSet(false),
m_s3BucketOwnerHasBeenSet(false)
{
}

Expand All @@ -47,6 +48,13 @@ ModelInvocationJobS3InputDataConfig& ModelInvocationJobS3InputDataConfig::operat
m_s3UriHasBeenSet = true;
}

if(jsonValue.ValueExists("s3BucketOwner"))
{
m_s3BucketOwner = jsonValue.GetString("s3BucketOwner");

m_s3BucketOwnerHasBeenSet = true;
}

return *this;
}

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

}

if(m_s3BucketOwnerHasBeenSet)
{
payload.WithString("s3BucketOwner", m_s3BucketOwner);

}

return payload;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ namespace Model

ModelInvocationJobS3OutputDataConfig::ModelInvocationJobS3OutputDataConfig() :
m_s3UriHasBeenSet(false),
m_s3EncryptionKeyIdHasBeenSet(false)
m_s3EncryptionKeyIdHasBeenSet(false),
m_s3BucketOwnerHasBeenSet(false)
{
}

Expand All @@ -46,6 +47,13 @@ ModelInvocationJobS3OutputDataConfig& ModelInvocationJobS3OutputDataConfig::oper
m_s3EncryptionKeyIdHasBeenSet = true;
}

if(jsonValue.ValueExists("s3BucketOwner"))
{
m_s3BucketOwner = jsonValue.GetString("s3BucketOwner");

m_s3BucketOwnerHasBeenSet = true;
}

return *this;
}

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

}

if(m_s3BucketOwnerHasBeenSet)
{
payload.WithString("s3BucketOwner", m_s3BucketOwner);

}

return payload;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ ModelInvocationJobSummary::ModelInvocationJobSummary() :
m_endTimeHasBeenSet(false),
m_inputDataConfigHasBeenSet(false),
m_outputDataConfigHasBeenSet(false),
m_vpcConfigHasBeenSet(false),
m_timeoutDurationInHours(0),
m_timeoutDurationInHoursHasBeenSet(false),
m_jobExpirationTimeHasBeenSet(false)
Expand Down Expand Up @@ -130,6 +131,13 @@ ModelInvocationJobSummary& ModelInvocationJobSummary::operator =(JsonView jsonVa
m_outputDataConfigHasBeenSet = true;
}

if(jsonValue.ValueExists("vpcConfig"))
{
m_vpcConfig = jsonValue.GetObject("vpcConfig");

m_vpcConfigHasBeenSet = true;
}

if(jsonValue.ValueExists("timeoutDurationInHours"))
{
m_timeoutDurationInHours = jsonValue.GetInteger("timeoutDurationInHours");
Expand Down Expand Up @@ -219,6 +227,12 @@ JsonValue ModelInvocationJobSummary::Jsonize() const

}

if(m_vpcConfigHasBeenSet)
{
payload.WithObject("vpcConfig", m_vpcConfig.Jsonize());

}

if(m_timeoutDurationInHoursHasBeenSet)
{
payload.WithInteger("timeoutDurationInHours", m_timeoutDurationInHours);
Expand Down
Loading

0 comments on commit 297d526

Please sign in to comment.