Skip to content

Commit 28954d1

Browse files
authored
Fixes for weathertop (#6624)
1 parent a1048b7 commit 28954d1

File tree

2 files changed

+34
-25
lines changed

2 files changed

+34
-25
lines changed

cpp/example_code/codebuild/list_builds.cpp

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47,35 +47,45 @@ bool AwsDoc::CodeBuild::listBuilds(Aws::CodeBuild::Model::SortOrderType sortType
4747
listBuildsRequest);
4848

4949
if (listBuildsOutcome.IsSuccess()) {
50-
std::cout << "Information about each build:" << std::endl;
51-
Aws::CodeBuild::Model::BatchGetBuildsRequest getBuildsRequest;
52-
getBuildsRequest.SetIds(listBuildsOutcome.GetResult().GetIds());
53-
Aws::CodeBuild::Model::BatchGetBuildsOutcome getBuildsOutcome = codeBuildClient.BatchGetBuilds(
54-
getBuildsRequest);
55-
56-
if (getBuildsOutcome.IsSuccess()) {
57-
const Aws::Vector<Aws::CodeBuild::Model::Build> &builds = getBuildsOutcome.GetResult().GetBuilds();
58-
std::cout << builds.size() << " build(s) found." << std::endl;
59-
for (auto val: builds) {
60-
std::cout << val.GetId() << std::endl;
50+
const Aws::Vector<Aws::String> &ids = listBuildsOutcome.GetResult().GetIds();
51+
if (!ids.empty()) {
52+
53+
std::cout << "Information about each build:" << std::endl;
54+
Aws::CodeBuild::Model::BatchGetBuildsRequest getBuildsRequest;
55+
getBuildsRequest.SetIds(listBuildsOutcome.GetResult().GetIds());
56+
Aws::CodeBuild::Model::BatchGetBuildsOutcome getBuildsOutcome = codeBuildClient.BatchGetBuilds(
57+
getBuildsRequest);
58+
59+
if (getBuildsOutcome.IsSuccess()) {
60+
const Aws::Vector<Aws::CodeBuild::Model::Build> &builds = getBuildsOutcome.GetResult().GetBuilds();
61+
std::cout << builds.size() << " build(s) found." << std::endl;
62+
for (auto val: builds) {
63+
std::cout << val.GetId() << std::endl;
64+
}
65+
} else {
66+
std::cerr << "Error getting builds"
67+
<< getBuildsOutcome.GetError().GetMessage() << std::endl;
68+
return false;
6169
}
70+
} else {
71+
std::cout << "No builds found." << std::endl;
6272
}
63-
else {
64-
std::cout << "Error getting builds"
65-
<< getBuildsOutcome.GetError().GetMessage() << std::endl;
66-
return false;
67-
}
68-
nextToken = listBuildsOutcome.GetResult().GetNextToken();
69-
}
7073

71-
else {
74+
// Get the next token for pagination.
75+
76+
nextToken = listBuildsOutcome.GetResult().GetNextToken();
77+
} else {
7278
std::cerr << "Error listing builds"
7379
<< listBuildsOutcome.GetError().GetMessage()
7480
<< std::endl;
7581
return false;
7682
}
7783

78-
} while (!nextToken.empty());
84+
} while (!nextToken.
85+
86+
empty()
87+
88+
);
7989

8090
return true;
8191
}
@@ -105,11 +115,9 @@ int main(int argc, char **argv) {
105115
Aws::CodeBuild::Model::SortOrderType sortType = Aws::CodeBuild::Model::SortOrderType::NOT_SET;
106116
if (Aws::Utils::StringUtils::CaselessCompare(argv[1], "ASCENDING")) {
107117
sortType = Aws::CodeBuild::Model::SortOrderType::ASCENDING;
108-
}
109-
else if (Aws::Utils::StringUtils::CaselessCompare(argv[1], "DESCENDING")) {
118+
} else if (Aws::Utils::StringUtils::CaselessCompare(argv[1], "DESCENDING")) {
110119
sortType = Aws::CodeBuild::Model::SortOrderType::DESCENDING;
111-
}
112-
else {
120+
} else {
113121
std::cout << "Invalid sort order type." << std::endl;
114122
}
115123
Aws::Client::ClientConfiguration clientConfig;

cpp/example_code/rekognition/tests/gtest_detect_labels.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
#include "rekognition_gtests.h"
1515

1616
namespace AwsDocTest {
17+
// Designated _2R_ because it requires resources.
1718
// NOLINTNEXTLINE(readability-named-parameter)
18-
TEST_F(Rekognition_GTests, detect_labels_2_) {
19+
TEST_F(Rekognition_GTests, detect_labels_2R_) {
1920
Aws::String bucketName = getImageBucket();
2021
ASSERT_FALSE(bucketName.empty()) << preconditionError() << std::endl;
2122
Aws::String fileName = getImageFileName();

0 commit comments

Comments
 (0)