Skip to content

Commit fb7405c

Browse files
authored
Merge branch 'main' into main
2 parents 99b534b + cd65ac0 commit fb7405c

File tree

167 files changed

+6308
-1826
lines changed

Some content is hidden

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

167 files changed

+6308
-1826
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.585
1+
1.11.587

generated/src/aws-cpp-sdk-controlcatalog/include/aws/controlcatalog/ControlCatalogClient.h

Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ namespace Aws
1616
namespace ControlCatalog
1717
{
1818
/**
19-
* <p>Welcome to the Amazon Web Services Control Catalog API reference. This guide
20-
* is for developers who need detailed information about how to programmatically
21-
* identify and filter the common controls and related metadata that are available
22-
* to Amazon Web Services customers. This API reference provides descriptions,
23-
* syntax, and usage examples for each of the actions and data types that are
24-
* supported by Amazon Web Services Control Catalog. </p> <p>Use the following
25-
* links to get started with the Amazon Web Services Control Catalog API:</p> <ul>
26-
* <li> <p> <a
19+
* <p>Welcome to the Control Catalog API reference. This guide is for developers
20+
* who need detailed information about how to programmatically identify and filter
21+
* the common controls and related metadata that are available to Amazon Web
22+
* Services customers. This API reference provides descriptions, syntax, and usage
23+
* examples for each of the actions and data types that are supported by Control
24+
* Catalog. </p> <p>Use the following links to get started with the Control Catalog
25+
* API:</p> <ul> <li> <p> <a
2726
* href="https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_Operations.html">Actions</a>:
2827
* An alphabetical list of all Control Catalog API operations.</p> </li> <li> <p>
2928
* <a
@@ -157,11 +156,38 @@ namespace ControlCatalog
157156
}
158157

159158
/**
160-
* <p>Returns a paginated list of all available controls in the Amazon Web Services
161-
* Control Catalog library. Allows you to discover available controls. The list of
162-
* controls is given as structures of type <i>controlSummary</i>. The ARN is
163-
* returned in the global <i>controlcatalog</i> format, as shown in the
164-
* examples.</p><p><h3>See Also:</h3> <a
159+
* <p>Returns a paginated list of control mappings from the Control Catalog.
160+
* Control mappings show relationships between controls and other entities, such as
161+
* common controls or compliance frameworks.</p><p><h3>See Also:</h3> <a
162+
* href="http://docs.aws.amazon.com/goto/WebAPI/controlcatalog-2018-05-10/ListControlMappings">AWS
163+
* API Reference</a></p>
164+
*/
165+
virtual Model::ListControlMappingsOutcome ListControlMappings(const Model::ListControlMappingsRequest& request = {}) const;
166+
167+
/**
168+
* A Callable wrapper for ListControlMappings that returns a future to the operation so that it can be executed in parallel to other requests.
169+
*/
170+
template<typename ListControlMappingsRequestT = Model::ListControlMappingsRequest>
171+
Model::ListControlMappingsOutcomeCallable ListControlMappingsCallable(const ListControlMappingsRequestT& request = {}) const
172+
{
173+
return SubmitCallable(&ControlCatalogClient::ListControlMappings, request);
174+
}
175+
176+
/**
177+
* An Async wrapper for ListControlMappings that queues the request into a thread executor and triggers associated callback when operation has finished.
178+
*/
179+
template<typename ListControlMappingsRequestT = Model::ListControlMappingsRequest>
180+
void ListControlMappingsAsync(const ListControlMappingsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr, const ListControlMappingsRequestT& request = {}) const
181+
{
182+
return SubmitAsync(&ControlCatalogClient::ListControlMappings, request, handler, context);
183+
}
184+
185+
/**
186+
* <p>Returns a paginated list of all available controls in the Control Catalog
187+
* library. Allows you to discover available controls. The list of controls is
188+
* given as structures of type <i>controlSummary</i>. The ARN is returned in the
189+
* global <i>controlcatalog</i> format, as shown in the examples.</p><p><h3>See
190+
* Also:</h3> <a
165191
* href="http://docs.aws.amazon.com/goto/WebAPI/controlcatalog-2018-05-10/ListControls">AWS
166192
* API Reference</a></p>
167193
*/
@@ -186,8 +212,8 @@ namespace ControlCatalog
186212
}
187213

188214
/**
189-
* <p>Returns a paginated list of domains from the Amazon Web Services Control
190-
* Catalog.</p><p><h3>See Also:</h3> <a
215+
* <p>Returns a paginated list of domains from the Control Catalog.</p><p><h3>See
216+
* Also:</h3> <a
191217
* href="http://docs.aws.amazon.com/goto/WebAPI/controlcatalog-2018-05-10/ListDomains">AWS
192218
* API Reference</a></p>
193219
*/
@@ -212,10 +238,10 @@ namespace ControlCatalog
212238
}
213239

214240
/**
215-
* <p>Returns a paginated list of objectives from the Amazon Web Services Control
216-
* Catalog.</p> <p>You can apply an optional filter to see the objectives that
217-
* belong to a specific domain. If you dont provide a filter, the operation
218-
* returns all objectives. </p><p><h3>See Also:</h3> <a
241+
* <p>Returns a paginated list of objectives from the Control Catalog.</p> <p>You
242+
* can apply an optional filter to see the objectives that belong to a specific
243+
* domain. If you don���t provide a filter, the operation returns all objectives.
244+
* </p><p><h3>See Also:</h3> <a
219245
* href="http://docs.aws.amazon.com/goto/WebAPI/controlcatalog-2018-05-10/ListObjectives">AWS
220246
* API Reference</a></p>
221247
*/

generated/src/aws-cpp-sdk-controlcatalog/include/aws/controlcatalog/ControlCatalogServiceClientModel.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@
2020
/* Service model headers required in ControlCatalogClient header */
2121
#include <aws/controlcatalog/model/GetControlResult.h>
2222
#include <aws/controlcatalog/model/ListCommonControlsResult.h>
23+
#include <aws/controlcatalog/model/ListControlMappingsResult.h>
2324
#include <aws/controlcatalog/model/ListControlsResult.h>
2425
#include <aws/controlcatalog/model/ListDomainsResult.h>
2526
#include <aws/controlcatalog/model/ListObjectivesResult.h>
27+
#include <aws/controlcatalog/model/ListControlMappingsRequest.h>
2628
#include <aws/controlcatalog/model/ListCommonControlsRequest.h>
2729
#include <aws/controlcatalog/model/ListDomainsRequest.h>
2830
#include <aws/controlcatalog/model/ListControlsRequest.h>
@@ -69,6 +71,7 @@ namespace Aws
6971
/* Service model forward declarations required in ControlCatalogClient header */
7072
class GetControlRequest;
7173
class ListCommonControlsRequest;
74+
class ListControlMappingsRequest;
7275
class ListControlsRequest;
7376
class ListDomainsRequest;
7477
class ListObjectivesRequest;
@@ -77,6 +80,7 @@ namespace Aws
7780
/* Service model Outcome class definitions */
7881
typedef Aws::Utils::Outcome<GetControlResult, ControlCatalogError> GetControlOutcome;
7982
typedef Aws::Utils::Outcome<ListCommonControlsResult, ControlCatalogError> ListCommonControlsOutcome;
83+
typedef Aws::Utils::Outcome<ListControlMappingsResult, ControlCatalogError> ListControlMappingsOutcome;
8084
typedef Aws::Utils::Outcome<ListControlsResult, ControlCatalogError> ListControlsOutcome;
8185
typedef Aws::Utils::Outcome<ListDomainsResult, ControlCatalogError> ListDomainsOutcome;
8286
typedef Aws::Utils::Outcome<ListObjectivesResult, ControlCatalogError> ListObjectivesOutcome;
@@ -85,6 +89,7 @@ namespace Aws
8589
/* Service model Outcome callable definitions */
8690
typedef std::future<GetControlOutcome> GetControlOutcomeCallable;
8791
typedef std::future<ListCommonControlsOutcome> ListCommonControlsOutcomeCallable;
92+
typedef std::future<ListControlMappingsOutcome> ListControlMappingsOutcomeCallable;
8893
typedef std::future<ListControlsOutcome> ListControlsOutcomeCallable;
8994
typedef std::future<ListDomainsOutcome> ListDomainsOutcomeCallable;
9095
typedef std::future<ListObjectivesOutcome> ListObjectivesOutcomeCallable;
@@ -96,6 +101,7 @@ namespace Aws
96101
/* Service model async handlers definitions */
97102
typedef std::function<void(const ControlCatalogClient*, const Model::GetControlRequest&, const Model::GetControlOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetControlResponseReceivedHandler;
98103
typedef std::function<void(const ControlCatalogClient*, const Model::ListCommonControlsRequest&, const Model::ListCommonControlsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListCommonControlsResponseReceivedHandler;
104+
typedef std::function<void(const ControlCatalogClient*, const Model::ListControlMappingsRequest&, const Model::ListControlMappingsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListControlMappingsResponseReceivedHandler;
99105
typedef std::function<void(const ControlCatalogClient*, const Model::ListControlsRequest&, const Model::ListControlsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListControlsResponseReceivedHandler;
100106
typedef std::function<void(const ControlCatalogClient*, const Model::ListDomainsRequest&, const Model::ListDomainsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListDomainsResponseReceivedHandler;
101107
typedef std::function<void(const ControlCatalogClient*, const Model::ListObjectivesRequest&, const Model::ListObjectivesOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListObjectivesResponseReceivedHandler;

generated/src/aws-cpp-sdk-controlcatalog/include/aws/controlcatalog/model/CommonControlFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace Model
4343
/**
4444
* <p>The objective that's used as filter criteria.</p> <p>You can use this
4545
* parameter to specify one objective ARN at a time. Passing multiple ARNs in the
46-
* <code>CommonControlFilter</code> isn’t currently supported.</p>
46+
* <code>CommonControlFilter</code> isn’t supported.</p>
4747
*/
4848
inline const Aws::Vector<ObjectiveResourceFilter>& GetObjectives() const { return m_objectives; }
4949
inline bool ObjectivesHasBeenSet() const { return m_objectivesHasBeenSet; }
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
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/controlcatalog/ControlCatalog_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 ControlCatalog
22+
{
23+
namespace Model
24+
{
25+
26+
/**
27+
* <p>A structure that contains details about a common control mapping. In
28+
* particular, it returns the Amazon Resource Name (ARN) of the common
29+
* control.</p><p><h3>See Also:</h3> <a
30+
* href="http://docs.aws.amazon.com/goto/WebAPI/controlcatalog-2018-05-10/CommonControlMappingDetails">AWS
31+
* API Reference</a></p>
32+
*/
33+
class CommonControlMappingDetails
34+
{
35+
public:
36+
AWS_CONTROLCATALOG_API CommonControlMappingDetails() = default;
37+
AWS_CONTROLCATALOG_API CommonControlMappingDetails(Aws::Utils::Json::JsonView jsonValue);
38+
AWS_CONTROLCATALOG_API CommonControlMappingDetails& operator=(Aws::Utils::Json::JsonView jsonValue);
39+
AWS_CONTROLCATALOG_API Aws::Utils::Json::JsonValue Jsonize() const;
40+
41+
42+
///@{
43+
/**
44+
* <p>The Amazon Resource Name (ARN) that identifies the common control in the
45+
* mapping.</p>
46+
*/
47+
inline const Aws::String& GetCommonControlArn() const { return m_commonControlArn; }
48+
inline bool CommonControlArnHasBeenSet() const { return m_commonControlArnHasBeenSet; }
49+
template<typename CommonControlArnT = Aws::String>
50+
void SetCommonControlArn(CommonControlArnT&& value) { m_commonControlArnHasBeenSet = true; m_commonControlArn = std::forward<CommonControlArnT>(value); }
51+
template<typename CommonControlArnT = Aws::String>
52+
CommonControlMappingDetails& WithCommonControlArn(CommonControlArnT&& value) { SetCommonControlArn(std::forward<CommonControlArnT>(value)); return *this;}
53+
///@}
54+
private:
55+
56+
Aws::String m_commonControlArn;
57+
bool m_commonControlArnHasBeenSet = false;
58+
};
59+
60+
} // namespace Model
61+
} // namespace ControlCatalog
62+
} // namespace Aws
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
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/controlcatalog/ControlCatalog_EXPORTS.h>
8+
#include <aws/controlcatalog/model/ImplementationFilter.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 ControlCatalog
22+
{
23+
namespace Model
24+
{
25+
26+
/**
27+
* <p>A structure that defines filtering criteria for the ListControls operation.
28+
* You can use this filter to narrow down the list of controls based on their
29+
* implementation details.</p><p><h3>See Also:</h3> <a
30+
* href="http://docs.aws.amazon.com/goto/WebAPI/controlcatalog-2018-05-10/ControlFilter">AWS
31+
* API Reference</a></p>
32+
*/
33+
class ControlFilter
34+
{
35+
public:
36+
AWS_CONTROLCATALOG_API ControlFilter() = default;
37+
AWS_CONTROLCATALOG_API ControlFilter(Aws::Utils::Json::JsonView jsonValue);
38+
AWS_CONTROLCATALOG_API ControlFilter& operator=(Aws::Utils::Json::JsonView jsonValue);
39+
AWS_CONTROLCATALOG_API Aws::Utils::Json::JsonValue Jsonize() const;
40+
41+
42+
///@{
43+
/**
44+
* <p>A filter that narrows the results to controls with specific implementation
45+
* types or identifiers. This field allows you to find controls that are
46+
* implemented by specific Amazon Web Services services or with specific service
47+
* identifiers.</p>
48+
*/
49+
inline const ImplementationFilter& GetImplementations() const { return m_implementations; }
50+
inline bool ImplementationsHasBeenSet() const { return m_implementationsHasBeenSet; }
51+
template<typename ImplementationsT = ImplementationFilter>
52+
void SetImplementations(ImplementationsT&& value) { m_implementationsHasBeenSet = true; m_implementations = std::forward<ImplementationsT>(value); }
53+
template<typename ImplementationsT = ImplementationFilter>
54+
ControlFilter& WithImplementations(ImplementationsT&& value) { SetImplementations(std::forward<ImplementationsT>(value)); return *this;}
55+
///@}
56+
private:
57+
58+
ImplementationFilter m_implementations;
59+
bool m_implementationsHasBeenSet = false;
60+
};
61+
62+
} // namespace Model
63+
} // namespace ControlCatalog
64+
} // namespace Aws
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
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/controlcatalog/ControlCatalog_EXPORTS.h>
8+
#include <aws/core/utils/memory/stl/AWSString.h>
9+
#include <aws/controlcatalog/model/MappingType.h>
10+
#include <aws/controlcatalog/model/Mapping.h>
11+
#include <utility>
12+
13+
namespace Aws
14+
{
15+
namespace Utils
16+
{
17+
namespace Json
18+
{
19+
class JsonValue;
20+
class JsonView;
21+
} // namespace Json
22+
} // namespace Utils
23+
namespace ControlCatalog
24+
{
25+
namespace Model
26+
{
27+
28+
/**
29+
* <p>A structure that contains information about a control mapping, including the
30+
* control ARN, mapping type, and mapping details.</p><p><h3>See Also:</h3> <a
31+
* href="http://docs.aws.amazon.com/goto/WebAPI/controlcatalog-2018-05-10/ControlMapping">AWS
32+
* API Reference</a></p>
33+
*/
34+
class ControlMapping
35+
{
36+
public:
37+
AWS_CONTROLCATALOG_API ControlMapping() = default;
38+
AWS_CONTROLCATALOG_API ControlMapping(Aws::Utils::Json::JsonView jsonValue);
39+
AWS_CONTROLCATALOG_API ControlMapping& operator=(Aws::Utils::Json::JsonView jsonValue);
40+
AWS_CONTROLCATALOG_API Aws::Utils::Json::JsonValue Jsonize() const;
41+
42+
43+
///@{
44+
/**
45+
* <p>The Amazon Resource Name (ARN) that identifies the control in the
46+
* mapping.</p>
47+
*/
48+
inline const Aws::String& GetControlArn() const { return m_controlArn; }
49+
inline bool ControlArnHasBeenSet() const { return m_controlArnHasBeenSet; }
50+
template<typename ControlArnT = Aws::String>
51+
void SetControlArn(ControlArnT&& value) { m_controlArnHasBeenSet = true; m_controlArn = std::forward<ControlArnT>(value); }
52+
template<typename ControlArnT = Aws::String>
53+
ControlMapping& WithControlArn(ControlArnT&& value) { SetControlArn(std::forward<ControlArnT>(value)); return *this;}
54+
///@}
55+
56+
///@{
57+
/**
58+
* <p>The type of mapping relationship between the control and other entities.
59+
* Indicates whether the mapping is to a framework or common control.</p>
60+
*/
61+
inline MappingType GetMappingType() const { return m_mappingType; }
62+
inline bool MappingTypeHasBeenSet() const { return m_mappingTypeHasBeenSet; }
63+
inline void SetMappingType(MappingType value) { m_mappingTypeHasBeenSet = true; m_mappingType = value; }
64+
inline ControlMapping& WithMappingType(MappingType value) { SetMappingType(value); return *this;}
65+
///@}
66+
67+
///@{
68+
/**
69+
* <p>The details of the mapping relationship, containing either framework or
70+
* common control information.</p>
71+
*/
72+
inline const Mapping& GetMapping() const { return m_mapping; }
73+
inline bool MappingHasBeenSet() const { return m_mappingHasBeenSet; }
74+
template<typename MappingT = Mapping>
75+
void SetMapping(MappingT&& value) { m_mappingHasBeenSet = true; m_mapping = std::forward<MappingT>(value); }
76+
template<typename MappingT = Mapping>
77+
ControlMapping& WithMapping(MappingT&& value) { SetMapping(std::forward<MappingT>(value)); return *this;}
78+
///@}
79+
private:
80+
81+
Aws::String m_controlArn;
82+
bool m_controlArnHasBeenSet = false;
83+
84+
MappingType m_mappingType{MappingType::NOT_SET};
85+
bool m_mappingTypeHasBeenSet = false;
86+
87+
Mapping m_mapping;
88+
bool m_mappingHasBeenSet = false;
89+
};
90+
91+
} // namespace Model
92+
} // namespace ControlCatalog
93+
} // namespace Aws

0 commit comments

Comments
 (0)