Skip to content

Commit 7a3a097

Browse files
pulimsrpulimsr
authored
Merge branch 'main' into smoke-tests-env
2 parents cbaefac + 879d878 commit 7a3a097

File tree

117 files changed

+4453
-2136
lines changed

Some content is hidden

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

117 files changed

+4453
-2136
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.640
1+
1.11.641

‎generated/src/aws-cpp-sdk-cleanrooms/include/aws/cleanrooms/model/ProtectedJob.h‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <aws/cleanrooms/model/ProtectedJobStatistics.h>
1414
#include <aws/cleanrooms/model/ProtectedJobResult.h>
1515
#include <aws/cleanrooms/model/ProtectedJobError.h>
16+
#include <aws/cleanrooms/model/ProtectedJobComputeConfiguration.h>
1617
#include <utility>
1718

1819
namespace Aws
@@ -162,6 +163,18 @@ namespace Model
162163
template<typename ErrorT = ProtectedJobError>
163164
ProtectedJob& WithError(ErrorT&& value) { SetError(std::forward<ErrorT>(value)); return *this;}
164165
///@}
166+
167+
///@{
168+
/**
169+
* <p>The compute configuration for the protected job.</p>
170+
*/
171+
inline const ProtectedJobComputeConfiguration& GetComputeConfiguration() const { return m_computeConfiguration; }
172+
inline bool ComputeConfigurationHasBeenSet() const { return m_computeConfigurationHasBeenSet; }
173+
template<typename ComputeConfigurationT = ProtectedJobComputeConfiguration>
174+
void SetComputeConfiguration(ComputeConfigurationT&& value) { m_computeConfigurationHasBeenSet = true; m_computeConfiguration = std::forward<ComputeConfigurationT>(value); }
175+
template<typename ComputeConfigurationT = ProtectedJobComputeConfiguration>
176+
ProtectedJob& WithComputeConfiguration(ComputeConfigurationT&& value) { SetComputeConfiguration(std::forward<ComputeConfigurationT>(value)); return *this;}
177+
///@}
165178
private:
166179

167180
Aws::String m_id;
@@ -193,6 +206,9 @@ namespace Model
193206

194207
ProtectedJobError m_error;
195208
bool m_errorHasBeenSet = false;
209+
210+
ProtectedJobComputeConfiguration m_computeConfiguration;
211+
bool m_computeConfigurationHasBeenSet = false;
196212
};
197213

198214
} // namespace Model

‎generated/src/aws-cpp-sdk-cleanrooms/include/aws/cleanrooms/model/ProtectedJobComputeConfiguration.h‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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/cleanrooms/CleanRooms_EXPORTS.h>
8+
#include <aws/cleanrooms/model/ProtectedJobWorkerComputeConfiguration.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 CleanRooms
22+
{
23+
namespace Model
24+
{
25+
26+
/**
27+
* <p>The configuration of the compute resources for a PySpark job.</p><p><h3>See
28+
* Also:</h3> <a
29+
* href="http://docs.aws.amazon.com/goto/WebAPI/cleanrooms-2022-02-17/ProtectedJobComputeConfiguration">AWS
30+
* API Reference</a></p>
31+
*/
32+
class ProtectedJobComputeConfiguration
33+
{
34+
public:
35+
AWS_CLEANROOMS_API ProtectedJobComputeConfiguration() = default;
36+
AWS_CLEANROOMS_API ProtectedJobComputeConfiguration(Aws::Utils::Json::JsonView jsonValue);
37+
AWS_CLEANROOMS_API ProtectedJobComputeConfiguration& operator=(Aws::Utils::Json::JsonView jsonValue);
38+
AWS_CLEANROOMS_API Aws::Utils::Json::JsonValue Jsonize() const;
39+
40+
41+
///@{
42+
/**
43+
* <p>The worker configuration for the compute environment.</p>
44+
*/
45+
inline const ProtectedJobWorkerComputeConfiguration& GetWorker() const { return m_worker; }
46+
inline bool WorkerHasBeenSet() const { return m_workerHasBeenSet; }
47+
template<typename WorkerT = ProtectedJobWorkerComputeConfiguration>
48+
void SetWorker(WorkerT&& value) { m_workerHasBeenSet = true; m_worker = std::forward<WorkerT>(value); }
49+
template<typename WorkerT = ProtectedJobWorkerComputeConfiguration>
50+
ProtectedJobComputeConfiguration& WithWorker(WorkerT&& value) { SetWorker(std::forward<WorkerT>(value)); return *this;}
51+
///@}
52+
private:
53+
54+
ProtectedJobWorkerComputeConfiguration m_worker;
55+
bool m_workerHasBeenSet = false;
56+
};
57+
58+
} // namespace Model
59+
} // namespace CleanRooms
60+
} // namespace Aws

‎generated/src/aws-cpp-sdk-cleanrooms/include/aws/cleanrooms/model/ProtectedJobWorkerComputeConfiguration.h‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
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/cleanrooms/CleanRooms_EXPORTS.h>
8+
#include <aws/cleanrooms/model/ProtectedJobWorkerComputeType.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 CleanRooms
22+
{
23+
namespace Model
24+
{
25+
26+
/**
27+
* <p>The configuration of the compute resources for a PySpark job.</p><p><h3>See
28+
* Also:</h3> <a
29+
* href="http://docs.aws.amazon.com/goto/WebAPI/cleanrooms-2022-02-17/ProtectedJobWorkerComputeConfiguration">AWS
30+
* API Reference</a></p>
31+
*/
32+
class ProtectedJobWorkerComputeConfiguration
33+
{
34+
public:
35+
AWS_CLEANROOMS_API ProtectedJobWorkerComputeConfiguration() = default;
36+
AWS_CLEANROOMS_API ProtectedJobWorkerComputeConfiguration(Aws::Utils::Json::JsonView jsonValue);
37+
AWS_CLEANROOMS_API ProtectedJobWorkerComputeConfiguration& operator=(Aws::Utils::Json::JsonView jsonValue);
38+
AWS_CLEANROOMS_API Aws::Utils::Json::JsonValue Jsonize() const;
39+
40+
41+
///@{
42+
/**
43+
* <p>The worker compute configuration type.</p>
44+
*/
45+
inline ProtectedJobWorkerComputeType GetType() const { return m_type; }
46+
inline bool TypeHasBeenSet() const { return m_typeHasBeenSet; }
47+
inline void SetType(ProtectedJobWorkerComputeType value) { m_typeHasBeenSet = true; m_type = value; }
48+
inline ProtectedJobWorkerComputeConfiguration& WithType(ProtectedJobWorkerComputeType value) { SetType(value); return *this;}
49+
///@}
50+
51+
///@{
52+
/**
53+
* <p>The number of workers for a PySpark job.</p>
54+
*/
55+
inline int GetNumber() const { return m_number; }
56+
inline bool NumberHasBeenSet() const { return m_numberHasBeenSet; }
57+
inline void SetNumber(int value) { m_numberHasBeenSet = true; m_number = value; }
58+
inline ProtectedJobWorkerComputeConfiguration& WithNumber(int value) { SetNumber(value); return *this;}
59+
///@}
60+
private:
61+
62+
ProtectedJobWorkerComputeType m_type{ProtectedJobWorkerComputeType::NOT_SET};
63+
bool m_typeHasBeenSet = false;
64+
65+
int m_number{0};
66+
bool m_numberHasBeenSet = false;
67+
};
68+
69+
} // namespace Model
70+
} // namespace CleanRooms
71+
} // namespace Aws

‎generated/src/aws-cpp-sdk-cleanrooms/include/aws/cleanrooms/model/ProtectedJobWorkerComputeType.h‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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/cleanrooms/CleanRooms_EXPORTS.h>
8+
#include <aws/core/utils/memory/stl/AWSString.h>
9+
10+
namespace Aws
11+
{
12+
namespace CleanRooms
13+
{
14+
namespace Model
15+
{
16+
enum class ProtectedJobWorkerComputeType
17+
{
18+
NOT_SET,
19+
CR_1X,
20+
CR_4X
21+
};
22+
23+
namespace ProtectedJobWorkerComputeTypeMapper
24+
{
25+
AWS_CLEANROOMS_API ProtectedJobWorkerComputeType GetProtectedJobWorkerComputeTypeForName(const Aws::String& name);
26+
27+
AWS_CLEANROOMS_API Aws::String GetNameForProtectedJobWorkerComputeType(ProtectedJobWorkerComputeType value);
28+
} // namespace ProtectedJobWorkerComputeTypeMapper
29+
} // namespace Model
30+
} // namespace CleanRooms
31+
} // namespace Aws

‎generated/src/aws-cpp-sdk-cleanrooms/include/aws/cleanrooms/model/StartProtectedJobRequest.h‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <aws/core/utils/memory/stl/AWSString.h>
1111
#include <aws/cleanrooms/model/ProtectedJobParameters.h>
1212
#include <aws/cleanrooms/model/ProtectedJobResultConfigurationInput.h>
13+
#include <aws/cleanrooms/model/ProtectedJobComputeConfiguration.h>
1314
#include <utility>
1415

1516
namespace Aws
@@ -81,6 +82,18 @@ namespace Model
8182
template<typename ResultConfigurationT = ProtectedJobResultConfigurationInput>
8283
StartProtectedJobRequest& WithResultConfiguration(ResultConfigurationT&& value) { SetResultConfiguration(std::forward<ResultConfigurationT>(value)); return *this;}
8384
///@}
85+
86+
///@{
87+
/**
88+
* <p>The compute configuration for the protected job.</p>
89+
*/
90+
inline const ProtectedJobComputeConfiguration& GetComputeConfiguration() const { return m_computeConfiguration; }
91+
inline bool ComputeConfigurationHasBeenSet() const { return m_computeConfigurationHasBeenSet; }
92+
template<typename ComputeConfigurationT = ProtectedJobComputeConfiguration>
93+
void SetComputeConfiguration(ComputeConfigurationT&& value) { m_computeConfigurationHasBeenSet = true; m_computeConfiguration = std::forward<ComputeConfigurationT>(value); }
94+
template<typename ComputeConfigurationT = ProtectedJobComputeConfiguration>
95+
StartProtectedJobRequest& WithComputeConfiguration(ComputeConfigurationT&& value) { SetComputeConfiguration(std::forward<ComputeConfigurationT>(value)); return *this;}
96+
///@}
8497
private:
8598

8699
ProtectedJobType m_type{ProtectedJobType::NOT_SET};
@@ -94,6 +107,9 @@ namespace Model
94107

95108
ProtectedJobResultConfigurationInput m_resultConfiguration;
96109
bool m_resultConfigurationHasBeenSet = false;
110+
111+
ProtectedJobComputeConfiguration m_computeConfiguration;
112+
bool m_computeConfigurationHasBeenSet = false;
97113
};
98114

99115
} // namespace Model

‎generated/src/aws-cpp-sdk-cleanrooms/include/aws/cleanrooms/model/WorkerComputeConfiguration.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ namespace Model
5050

5151
///@{
5252
/**
53-
* <p> The number of workers.</p>
53+
* <p> The number of workers.</p> <p>SQL queries support a minimum value of 2 and a
54+
* maximum value of 400. </p> <p>PySpark jobs support a minimum value of 4 and a
55+
* maximum value of 128.</p>
5456
*/
5557
inline int GetNumber() const { return m_number; }
5658
inline bool NumberHasBeenSet() const { return m_numberHasBeenSet; }

‎generated/src/aws-cpp-sdk-cleanrooms/source/model/ProtectedJob.cpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ ProtectedJob& ProtectedJob::operator =(JsonView jsonValue)
7575
m_error = jsonValue.GetObject("error");
7676
m_errorHasBeenSet = true;
7777
}
78+
if(jsonValue.ValueExists("computeConfiguration"))
79+
{
80+
m_computeConfiguration = jsonValue.GetObject("computeConfiguration");
81+
m_computeConfigurationHasBeenSet = true;
82+
}
7883
return *this;
7984
}
8085

@@ -140,6 +145,12 @@ JsonValue ProtectedJob::Jsonize() const
140145

141146
}
142147

148+
if(m_computeConfigurationHasBeenSet)
149+
{
150+
payload.WithObject("computeConfiguration", m_computeConfiguration.Jsonize());
151+
152+
}
153+
143154
return payload;
144155
}
145156

‎generated/src/aws-cpp-sdk-cleanrooms/source/model/ProtectedJobComputeConfiguration.cpp‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
6+
#include <aws/cleanrooms/model/ProtectedJobComputeConfiguration.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+
{
16+
namespace CleanRooms
17+
{
18+
namespace Model
19+
{
20+
21+
ProtectedJobComputeConfiguration::ProtectedJobComputeConfiguration(JsonView jsonValue)
22+
{
23+
*this = jsonValue;
24+
}
25+
26+
ProtectedJobComputeConfiguration& ProtectedJobComputeConfiguration::operator =(JsonView jsonValue)
27+
{
28+
if(jsonValue.ValueExists("worker"))
29+
{
30+
m_worker = jsonValue.GetObject("worker");
31+
m_workerHasBeenSet = true;
32+
}
33+
return *this;
34+
}
35+
36+
JsonValue ProtectedJobComputeConfiguration::Jsonize() const
37+
{
38+
JsonValue payload;
39+
40+
if(m_workerHasBeenSet)
41+
{
42+
payload.WithObject("worker", m_worker.Jsonize());
43+
44+
}
45+
46+
return payload;
47+
}
48+
49+
} // namespace Model
50+
} // namespace CleanRooms
51+
} // namespace Aws

‎generated/src/aws-cpp-sdk-cleanrooms/source/model/ProtectedJobWorkerComputeConfiguration.cpp‎

Lines changed: 61 additions & 0 deletions
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+
#include <aws/cleanrooms/model/ProtectedJobWorkerComputeConfiguration.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+
{
16+
namespace CleanRooms
17+
{
18+
namespace Model
19+
{
20+
21+
ProtectedJobWorkerComputeConfiguration::ProtectedJobWorkerComputeConfiguration(JsonView jsonValue)
22+
{
23+
*this = jsonValue;
24+
}
25+
26+
ProtectedJobWorkerComputeConfiguration& ProtectedJobWorkerComputeConfiguration::operator =(JsonView jsonValue)
27+
{
28+
if(jsonValue.ValueExists("type"))
29+
{
30+
m_type = ProtectedJobWorkerComputeTypeMapper::GetProtectedJobWorkerComputeTypeForName(jsonValue.GetString("type"));
31+
m_typeHasBeenSet = true;
32+
}
33+
if(jsonValue.ValueExists("number"))
34+
{
35+
m_number = jsonValue.GetInteger("number");
36+
m_numberHasBeenSet = true;
37+
}
38+
return *this;
39+
}
40+
41+
JsonValue ProtectedJobWorkerComputeConfiguration::Jsonize() const
42+
{
43+
JsonValue payload;
44+
45+
if(m_typeHasBeenSet)
46+
{
47+
payload.WithString("type", ProtectedJobWorkerComputeTypeMapper::GetNameForProtectedJobWorkerComputeType(m_type));
48+
}
49+
50+
if(m_numberHasBeenSet)
51+
{
52+
payload.WithInteger("number", m_number);
53+
54+
}
55+
56+
return payload;
57+
}
58+
59+
} // namespace Model
60+
} // namespace CleanRooms
61+
} // namespace Aws

0 commit comments

Comments
 (0)