Skip to content

Commit 101ff00

Browse files
Add ExemptAssumeRoot parameter to adapt for new AWS AssumeRoot capability.
Amazon SES Mail Manager. Extended rule string and boolean expressions to support analysis in condition evaluation. Extended ingress point string expression to support analysis in condition evaluation Added appId field to Webhook responses You can now use flow operations to either flush or capture traffic monitored in your firewall's flow table. With this release, Bedrock Evaluation will now support bring your own inference responses.
1 parent fee6fa8 commit 101ff00

File tree

77 files changed

+5861
-945
lines changed

Some content is hidden

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

77 files changed

+5861
-945
lines changed

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.529
1+
1.11.530

generated/src/aws-cpp-sdk-amplify/include/aws/amplify/AmplifyClient.h

+7-2
Original file line numberDiff line numberDiff line change
@@ -637,8 +637,13 @@ namespace Amplify
637637
}
638638

639639
/**
640-
* <p>Returns a list of artifacts for a specified app, branch, and job.
641-
* </p><p><h3>See Also:</h3> <a
640+
* <p>Returns a list of end-to-end testing artifacts for a specified app, branch,
641+
* and job.</p> <p>To return the build artifacts, use the <a
642+
* href="https://docs.aws.amazon.com/amplify/latest/APIReference/API_GetJob.html">GetJob</a>
643+
* API.</p> <p>For more information about Amplify testing support, see <a
644+
* href="https://docs.aws.amazon.com/amplify/latest/userguide/running-tests.html">Setting
645+
* up end-to-end Cypress tests for your Amplify application</a> in the <i>Amplify
646+
* Hosting User Guide</i>. </p><p><h3>See Also:</h3> <a
642647
* href="http://docs.aws.amazon.com/goto/WebAPI/amplify-2017-07-25/ListArtifacts">AWS
643648
* API Reference</a></p>
644649
*/

generated/src/aws-cpp-sdk-amplify/include/aws/amplify/model/Step.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ namespace Model
101101

102102
///@{
103103
/**
104-
* <p> The URL to the artifact for the execution step. </p>
104+
* <p> The URL to the build artifact for the execution step. </p>
105105
*/
106106
inline const Aws::String& GetArtifactsUrl() const { return m_artifactsUrl; }
107107
inline bool ArtifactsUrlHasBeenSet() const { return m_artifactsUrlHasBeenSet; }

generated/src/aws-cpp-sdk-amplify/include/aws/amplify/model/Webhook.h

+15
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,18 @@ namespace Model
7575
Webhook& WithWebhookUrl(WebhookUrlT&& value) { SetWebhookUrl(std::forward<WebhookUrlT>(value)); return *this;}
7676
///@}
7777

78+
///@{
79+
/**
80+
* <p>The unique ID of an Amplify app.</p>
81+
*/
82+
inline const Aws::String& GetAppId() const { return m_appId; }
83+
inline bool AppIdHasBeenSet() const { return m_appIdHasBeenSet; }
84+
template<typename AppIdT = Aws::String>
85+
void SetAppId(AppIdT&& value) { m_appIdHasBeenSet = true; m_appId = std::forward<AppIdT>(value); }
86+
template<typename AppIdT = Aws::String>
87+
Webhook& WithAppId(AppIdT&& value) { SetAppId(std::forward<AppIdT>(value)); return *this;}
88+
///@}
89+
7890
///@{
7991
/**
8092
* <p>The name for a branch that is part of an Amplify app. </p>
@@ -133,6 +145,9 @@ namespace Model
133145
Aws::String m_webhookUrl;
134146
bool m_webhookUrlHasBeenSet = false;
135147

148+
Aws::String m_appId;
149+
bool m_appIdHasBeenSet = false;
150+
136151
Aws::String m_branchName;
137152
bool m_branchNameHasBeenSet = false;
138153

generated/src/aws-cpp-sdk-amplify/source/model/Webhook.cpp

+11
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ Webhook& Webhook::operator =(JsonView jsonValue)
4040
m_webhookUrl = jsonValue.GetString("webhookUrl");
4141
m_webhookUrlHasBeenSet = true;
4242
}
43+
if(jsonValue.ValueExists("appId"))
44+
{
45+
m_appId = jsonValue.GetString("appId");
46+
m_appIdHasBeenSet = true;
47+
}
4348
if(jsonValue.ValueExists("branchName"))
4449
{
4550
m_branchName = jsonValue.GetString("branchName");
@@ -85,6 +90,12 @@ JsonValue Webhook::Jsonize() const
8590

8691
}
8792

93+
if(m_appIdHasBeenSet)
94+
{
95+
payload.WithString("appId", m_appId);
96+
97+
}
98+
8899
if(m_branchNameHasBeenSet)
89100
{
90101
payload.WithString("branchName", m_branchName);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
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/Bedrock_EXPORTS.h>
8+
#include <aws/bedrock/model/EvaluationModelConfigSummary.h>
9+
#include <aws/bedrock/model/EvaluationRagConfigSummary.h>
10+
#include <utility>
11+
12+
namespace Aws
13+
{
14+
namespace Utils
15+
{
16+
namespace Json
17+
{
18+
class JsonValue;
19+
class JsonView;
20+
} // namespace Json
21+
} // namespace Utils
22+
namespace Bedrock
23+
{
24+
namespace Model
25+
{
26+
27+
/**
28+
* <p>Identifies the models, Knowledge Bases, or other RAG sources evaluated in a
29+
* model or Knowledge Base evaluation job.</p><p><h3>See Also:</h3> <a
30+
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/EvaluationInferenceConfigSummary">AWS
31+
* API Reference</a></p>
32+
*/
33+
class EvaluationInferenceConfigSummary
34+
{
35+
public:
36+
AWS_BEDROCK_API EvaluationInferenceConfigSummary() = default;
37+
AWS_BEDROCK_API EvaluationInferenceConfigSummary(Aws::Utils::Json::JsonView jsonValue);
38+
AWS_BEDROCK_API EvaluationInferenceConfigSummary& operator=(Aws::Utils::Json::JsonView jsonValue);
39+
AWS_BEDROCK_API Aws::Utils::Json::JsonValue Jsonize() const;
40+
41+
42+
///@{
43+
/**
44+
* <p>A summary of the models used in an Amazon Bedrock model evaluation job. These
45+
* resources can be models in Amazon Bedrock or models outside of Amazon Bedrock
46+
* that you use to generate your own inference response data.</p>
47+
*/
48+
inline const EvaluationModelConfigSummary& GetModelConfigSummary() const { return m_modelConfigSummary; }
49+
inline bool ModelConfigSummaryHasBeenSet() const { return m_modelConfigSummaryHasBeenSet; }
50+
template<typename ModelConfigSummaryT = EvaluationModelConfigSummary>
51+
void SetModelConfigSummary(ModelConfigSummaryT&& value) { m_modelConfigSummaryHasBeenSet = true; m_modelConfigSummary = std::forward<ModelConfigSummaryT>(value); }
52+
template<typename ModelConfigSummaryT = EvaluationModelConfigSummary>
53+
EvaluationInferenceConfigSummary& WithModelConfigSummary(ModelConfigSummaryT&& value) { SetModelConfigSummary(std::forward<ModelConfigSummaryT>(value)); return *this;}
54+
///@}
55+
56+
///@{
57+
/**
58+
* <p>A summary of the RAG resources used in an Amazon Bedrock Knowledge Base
59+
* evaluation job. These resources can be Knowledge Bases in Amazon Bedrock or RAG
60+
* sources outside of Amazon Bedrock that you use to generate your own inference
61+
* response data.</p>
62+
*/
63+
inline const EvaluationRagConfigSummary& GetRagConfigSummary() const { return m_ragConfigSummary; }
64+
inline bool RagConfigSummaryHasBeenSet() const { return m_ragConfigSummaryHasBeenSet; }
65+
template<typename RagConfigSummaryT = EvaluationRagConfigSummary>
66+
void SetRagConfigSummary(RagConfigSummaryT&& value) { m_ragConfigSummaryHasBeenSet = true; m_ragConfigSummary = std::forward<RagConfigSummaryT>(value); }
67+
template<typename RagConfigSummaryT = EvaluationRagConfigSummary>
68+
EvaluationInferenceConfigSummary& WithRagConfigSummary(RagConfigSummaryT&& value) { SetRagConfigSummary(std::forward<RagConfigSummaryT>(value)); return *this;}
69+
///@}
70+
private:
71+
72+
EvaluationModelConfigSummary m_modelConfigSummary;
73+
bool m_modelConfigSummaryHasBeenSet = false;
74+
75+
EvaluationRagConfigSummary m_ragConfigSummary;
76+
bool m_ragConfigSummaryHasBeenSet = false;
77+
};
78+
79+
} // namespace Model
80+
} // namespace Bedrock
81+
} // namespace Aws

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

+17
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#pragma once
77
#include <aws/bedrock/Bedrock_EXPORTS.h>
88
#include <aws/bedrock/model/EvaluationBedrockModel.h>
9+
#include <aws/bedrock/model/EvaluationPrecomputedInferenceSource.h>
910
#include <utility>
1011

1112
namespace Aws
@@ -50,10 +51,26 @@ namespace Model
5051
template<typename BedrockModelT = EvaluationBedrockModel>
5152
EvaluationModelConfig& WithBedrockModel(BedrockModelT&& value) { SetBedrockModel(std::forward<BedrockModelT>(value)); return *this;}
5253
///@}
54+
55+
///@{
56+
/**
57+
* <p>Defines the model used to generate inference response data for a model
58+
* evaluation job where you provide your own inference response data.</p>
59+
*/
60+
inline const EvaluationPrecomputedInferenceSource& GetPrecomputedInferenceSource() const { return m_precomputedInferenceSource; }
61+
inline bool PrecomputedInferenceSourceHasBeenSet() const { return m_precomputedInferenceSourceHasBeenSet; }
62+
template<typename PrecomputedInferenceSourceT = EvaluationPrecomputedInferenceSource>
63+
void SetPrecomputedInferenceSource(PrecomputedInferenceSourceT&& value) { m_precomputedInferenceSourceHasBeenSet = true; m_precomputedInferenceSource = std::forward<PrecomputedInferenceSourceT>(value); }
64+
template<typename PrecomputedInferenceSourceT = EvaluationPrecomputedInferenceSource>
65+
EvaluationModelConfig& WithPrecomputedInferenceSource(PrecomputedInferenceSourceT&& value) { SetPrecomputedInferenceSource(std::forward<PrecomputedInferenceSourceT>(value)); return *this;}
66+
///@}
5367
private:
5468

5569
EvaluationBedrockModel m_bedrockModel;
5670
bool m_bedrockModelHasBeenSet = false;
71+
72+
EvaluationPrecomputedInferenceSource m_precomputedInferenceSource;
73+
bool m_precomputedInferenceSourceHasBeenSet = false;
5774
};
5875

5976
} // namespace Model
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
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/Bedrock_EXPORTS.h>
8+
#include <aws/core/utils/memory/stl/AWSVector.h>
9+
#include <aws/core/utils/memory/stl/AWSString.h>
10+
#include <utility>
11+
12+
namespace Aws
13+
{
14+
namespace Utils
15+
{
16+
namespace Json
17+
{
18+
class JsonValue;
19+
class JsonView;
20+
} // namespace Json
21+
} // namespace Utils
22+
namespace Bedrock
23+
{
24+
namespace Model
25+
{
26+
27+
/**
28+
* <p>A summary of the models used in an Amazon Bedrock model evaluation job. These
29+
* resources can be models in Amazon Bedrock or models outside of Amazon Bedrock
30+
* that you use to generate your own inference response data.</p><p><h3>See
31+
* Also:</h3> <a
32+
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/EvaluationModelConfigSummary">AWS
33+
* API Reference</a></p>
34+
*/
35+
class EvaluationModelConfigSummary
36+
{
37+
public:
38+
AWS_BEDROCK_API EvaluationModelConfigSummary() = default;
39+
AWS_BEDROCK_API EvaluationModelConfigSummary(Aws::Utils::Json::JsonView jsonValue);
40+
AWS_BEDROCK_API EvaluationModelConfigSummary& operator=(Aws::Utils::Json::JsonView jsonValue);
41+
AWS_BEDROCK_API Aws::Utils::Json::JsonValue Jsonize() const;
42+
43+
44+
///@{
45+
/**
46+
* <p>The Amazon Resource Names (ARNs) of the models used for the evaluation
47+
* job.</p>
48+
*/
49+
inline const Aws::Vector<Aws::String>& GetBedrockModelIdentifiers() const { return m_bedrockModelIdentifiers; }
50+
inline bool BedrockModelIdentifiersHasBeenSet() const { return m_bedrockModelIdentifiersHasBeenSet; }
51+
template<typename BedrockModelIdentifiersT = Aws::Vector<Aws::String>>
52+
void SetBedrockModelIdentifiers(BedrockModelIdentifiersT&& value) { m_bedrockModelIdentifiersHasBeenSet = true; m_bedrockModelIdentifiers = std::forward<BedrockModelIdentifiersT>(value); }
53+
template<typename BedrockModelIdentifiersT = Aws::Vector<Aws::String>>
54+
EvaluationModelConfigSummary& WithBedrockModelIdentifiers(BedrockModelIdentifiersT&& value) { SetBedrockModelIdentifiers(std::forward<BedrockModelIdentifiersT>(value)); return *this;}
55+
template<typename BedrockModelIdentifiersT = Aws::String>
56+
EvaluationModelConfigSummary& AddBedrockModelIdentifiers(BedrockModelIdentifiersT&& value) { m_bedrockModelIdentifiersHasBeenSet = true; m_bedrockModelIdentifiers.emplace_back(std::forward<BedrockModelIdentifiersT>(value)); return *this; }
57+
///@}
58+
59+
///@{
60+
/**
61+
* <p>A label that identifies the models used for a model evaluation job where you
62+
* provide your own inference response data.</p>
63+
*/
64+
inline const Aws::Vector<Aws::String>& GetPrecomputedInferenceSourceIdentifiers() const { return m_precomputedInferenceSourceIdentifiers; }
65+
inline bool PrecomputedInferenceSourceIdentifiersHasBeenSet() const { return m_precomputedInferenceSourceIdentifiersHasBeenSet; }
66+
template<typename PrecomputedInferenceSourceIdentifiersT = Aws::Vector<Aws::String>>
67+
void SetPrecomputedInferenceSourceIdentifiers(PrecomputedInferenceSourceIdentifiersT&& value) { m_precomputedInferenceSourceIdentifiersHasBeenSet = true; m_precomputedInferenceSourceIdentifiers = std::forward<PrecomputedInferenceSourceIdentifiersT>(value); }
68+
template<typename PrecomputedInferenceSourceIdentifiersT = Aws::Vector<Aws::String>>
69+
EvaluationModelConfigSummary& WithPrecomputedInferenceSourceIdentifiers(PrecomputedInferenceSourceIdentifiersT&& value) { SetPrecomputedInferenceSourceIdentifiers(std::forward<PrecomputedInferenceSourceIdentifiersT>(value)); return *this;}
70+
template<typename PrecomputedInferenceSourceIdentifiersT = Aws::String>
71+
EvaluationModelConfigSummary& AddPrecomputedInferenceSourceIdentifiers(PrecomputedInferenceSourceIdentifiersT&& value) { m_precomputedInferenceSourceIdentifiersHasBeenSet = true; m_precomputedInferenceSourceIdentifiers.emplace_back(std::forward<PrecomputedInferenceSourceIdentifiersT>(value)); return *this; }
72+
///@}
73+
private:
74+
75+
Aws::Vector<Aws::String> m_bedrockModelIdentifiers;
76+
bool m_bedrockModelIdentifiersHasBeenSet = false;
77+
78+
Aws::Vector<Aws::String> m_precomputedInferenceSourceIdentifiers;
79+
bool m_precomputedInferenceSourceIdentifiersHasBeenSet = false;
80+
};
81+
82+
} // namespace Model
83+
} // namespace Bedrock
84+
} // namespace Aws
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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/Bedrock_EXPORTS.h>
8+
#include <aws/core/utils/memory/stl/AWSString.h>
9+
#include <utility>
10+
11+
namespace Aws
12+
{
13+
namespace Utils
14+
{
15+
namespace Json
16+
{
17+
class JsonValue;
18+
class JsonView;
19+
} // namespace Json
20+
} // namespace Utils
21+
namespace Bedrock
22+
{
23+
namespace Model
24+
{
25+
26+
/**
27+
* <p>A summary of a model used for a model evaluation job where you provide your
28+
* own inference response data.</p><p><h3>See Also:</h3> <a
29+
* href="http://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/EvaluationPrecomputedInferenceSource">AWS
30+
* API Reference</a></p>
31+
*/
32+
class EvaluationPrecomputedInferenceSource
33+
{
34+
public:
35+
AWS_BEDROCK_API EvaluationPrecomputedInferenceSource() = default;
36+
AWS_BEDROCK_API EvaluationPrecomputedInferenceSource(Aws::Utils::Json::JsonView jsonValue);
37+
AWS_BEDROCK_API EvaluationPrecomputedInferenceSource& operator=(Aws::Utils::Json::JsonView jsonValue);
38+
AWS_BEDROCK_API Aws::Utils::Json::JsonValue Jsonize() const;
39+
40+
41+
///@{
42+
/**
43+
* <p>A label that identifies a model used in a model evaluation job where you
44+
* provide your own inference response data.</p>
45+
*/
46+
inline const Aws::String& GetInferenceSourceIdentifier() const { return m_inferenceSourceIdentifier; }
47+
inline bool InferenceSourceIdentifierHasBeenSet() const { return m_inferenceSourceIdentifierHasBeenSet; }
48+
template<typename InferenceSourceIdentifierT = Aws::String>
49+
void SetInferenceSourceIdentifier(InferenceSourceIdentifierT&& value) { m_inferenceSourceIdentifierHasBeenSet = true; m_inferenceSourceIdentifier = std::forward<InferenceSourceIdentifierT>(value); }
50+
template<typename InferenceSourceIdentifierT = Aws::String>
51+
EvaluationPrecomputedInferenceSource& WithInferenceSourceIdentifier(InferenceSourceIdentifierT&& value) { SetInferenceSourceIdentifier(std::forward<InferenceSourceIdentifierT>(value)); return *this;}
52+
///@}
53+
private:
54+
55+
Aws::String m_inferenceSourceIdentifier;
56+
bool m_inferenceSourceIdentifierHasBeenSet = false;
57+
};
58+
59+
} // namespace Model
60+
} // namespace Bedrock
61+
} // namespace Aws

0 commit comments

Comments
 (0)