Skip to content

Commit a268f6a

Browse files
beqqrry-awsbeqqrry-aws
committed
PHP Updates for Dockerfile and formatted output according to the new schema
1 parent 27ec431 commit a268f6a

File tree

11 files changed

+274
-125
lines changed

11 files changed

+274
-125
lines changed

‎php/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ RUN addgroup -S automation && \
2121

2222
USER automation:automation
2323

24-
CMD ["/php/testing", "--integ"]
24+
#CMD ["/php/testing", "--integ"]
25+
CMD ["/php/testing", "--test"]

‎php/example_code/composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
},
77
"require-dev": {
88
"phpunit/phpunit": "^9.6.13",
9-
"squizlabs/php_codesniffer": "3.*"
9+
"squizlabs/php_codesniffer": "3.*",
10+
"sempro/phpunit-pretty-print": ">=1.4.0"
1011
},
1112
"autoload": {
1213
"psr-0": {

‎php/example_code/composer.lock‎

Lines changed: 137 additions & 87 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎php/example_code/kms/HelloKMS.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
echo "This file shows how to connect to the KmsClient, uses a paginator to get the keys for the account, and lists the KeyIds for up to 10 keys.\n";
1111

12-
$client = new KmsClient([]);
12+
$client = new KmsClient(["region" => "us-east-1"]);
1313

1414
$pageLength = 10; // Change this value to change the number of records shown, or to break up the result into pages.
1515

‎php/example_code/kms/KmsBasics.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function runExample()
4040
echo "--------------------------------------\n";
4141
$this->pressEnter();
4242

43-
$this->kmsClient = new KmsClient([]);
43+
$this->kmsClient = new KmsClient(["region" => "us-east-1"]);
4444
// Initialize the KmsService class with the client. This allows you to override any defaults in the client before giving it to the service class.
4545
$this->kmsService = new KmsService($this->kmsClient);
4646

@@ -184,7 +184,7 @@ public function runExample()
184184
echo "Every KMS key must have exactly one key policy. The statements in the key policy determine who has permission to use the KMS key and how they can use it.\n";
185185
echo " You can also use IAM policies and grants to control access to the KMS key, but every KMS key must have a key policy.\n";
186186
echo "We will replace the key's policy with a new one:\n";
187-
$stsClient = new StsClient([]);
187+
$stsClient = new StsClient(["region" => "us-east-1"]);
188188
$result = $stsClient->getCallerIdentity();
189189
$accountId = $result['Account'];
190190
$keyPolicy = <<< KEYPOLICY

‎php/example_code/output.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./testing: line 14: vendor/phpunit/phpunit/phpunit: No such file or directory

‎php/example_code/phpunit.xml‎

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,42 @@
77
convertDeprecationsToExceptions="true"
88
failOnRisky="true"
99
failOnWarning="true"
10-
verbose="true">
11-
<!-- <testsuites>-->
12-
<!-- <testsuite name="kms-basics">-->
13-
<!-- <file>kms/tests/KmsBasicsTests.php</file>-->
14-
<!-- </testsuite>-->
15-
<!-- <testsuite name="s3-express-basics">-->
16-
<!-- <file>s3/tests/S3ExpressBasicsTest.php</file>-->
17-
<!-- </testsuite>-->
18-
<!-- <testsuite name="dynamodb-basics">-->
19-
<!-- <file>dynamodb/dynamodb_basics/tests/DynamoDBBasicsTest.php</file>-->
20-
<!-- </testsuite>-->
21-
<!-- <testsuite name="partiql-basics">-->
22-
<!-- <file>dynamodb/partiql_basics/tests/PartiQLBasicsTest.php</file>-->
23-
<!-- </testsuite>-->
24-
<!-- <testsuite name="iam">-->
25-
<!-- <directory>iam/tests/</directory>-->
26-
<!-- </testsuite>-->
27-
<!-- <testsuite name="glue-basics">-->
28-
<!-- <file>glue/tests/GlueBasicsTest.php</file>-->
29-
<!-- </testsuite>-->
30-
<!-- <testsuite name="lambda-basics">-->
31-
<!-- <file>lambda/tests/LambdaTest.php</file>-->
32-
<!-- </testsuite>-->
33-
<!-- <testsuite name="auto-scaling-basics">-->
34-
<!-- <file>auto-scaling/tests/AutoScalingBasicsTest.php</file>-->
35-
<!-- </testsuite>-->
36-
<!-- </testsuites>-->
10+
verbose="true"
11+
printerClass="Sempro\PHPUnitPrettyPrinter\PrettyPrinterForPhpUnit9">
12+
<testsuites>
13+
<testsuite name="hackathon-pass">
14+
<file>kms/tests/KmsBasicsTests.php</file>
15+
</testsuite>
16+
<testsuite name="hackathon-fail">
17+
<file>kms/tests/KmsBasicsTests.php</file>
18+
19+
<file>lambda/tests/LambdaTest.php</file>
20+
</testsuite>
21+
<testsuite name="kms-basics">
22+
<file>kms/tests/KmsBasicsTests.php</file>
23+
</testsuite>
24+
<testsuite name="s3-express-basics">
25+
<file>s3/express/tests/S3ExpressBasicsTest.php</file>
26+
</testsuite>
27+
<testsuite name="dynamodb-basics">
28+
<file>dynamodb/dynamodb_basics/tests/DynamoDBBasicsTest.php</file>
29+
</testsuite>
30+
<testsuite name="partiql-basics">
31+
<file>dynamodb/partiql_basics/tests/PartiQLBasicsTest.php</file>
32+
</testsuite>
33+
<testsuite name="iam">
34+
<directory>iam/tests/</directory>
35+
</testsuite>
36+
<testsuite name="glue-basics">
37+
<file>glue/tests/GlueBasicsTest.php</file>
38+
</testsuite>
39+
<testsuite name="lambda-basics">
40+
<file>lambda/tests/LambdaTest.php</file>
41+
</testsuite>
42+
<testsuite name="auto-scaling-basics">
43+
<file>auto-scaling/tests/AutoScalingBasicsTest.php</file>
44+
</testsuite>
45+
</testsuites>
3746

3847
<coverage cacheDirectory=".phpunit.cache/code-coverage"
3948
processUncoveredFiles="false">

‎php/example_code/s3/express/S3ExpressBasics.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function runExample()
109109
echo "Now, we'll set up some policies, roles, and a user. This user will only have permissions to do S3 Express One Zone actions.\n";
110110
pressEnter();
111111

112-
$this->cloudFormationClient = new CloudFormationClient([]);
112+
$this->cloudFormationClient = new CloudFormationClient(["region" => "us-east-1"]);
113113
$stackName = "cfn-stack-s3-express-basics-" . uniqid();
114114
$file = file_get_contents(__DIR__ . "/../../../../resources/cfn/s3_express_basics/s3_express_template.yml");
115115
$result = $this->cloudFormationClient->createStack([
@@ -150,13 +150,13 @@ public function runExample()
150150
echo "This client is created with the credentials associated with the user account with the S3 Express policy attached, so it can perform S3 Express operations.\n";
151151
pressEnter();
152152
$s3RegularClient = new S3Client([
153-
'Region' => $region,
154-
'Credentials' => $regularCredentials,
153+
'region' => $region,
154+
'credentials' => $regularCredentials,
155155
]);
156156
$s3RegularService = new S3Service($s3RegularClient);
157157
$s3ExpressClient = new S3Client([
158-
'Region' => $region,
159-
'Credentials' => $expressCredentials,
158+
'region' => $region,
159+
'credentials' => $expressCredentials,
160160
]);
161161
$s3ExpressService = new S3Service($s3ExpressClient);
162162
echo "All the roles and policies were created an attached to the user. Then, a new S3 Client and Service were created using that user's credentials.\n";

‎php/example_code/s3/express/tests/S3ExpressBasicsTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,13 @@ public static function setUpBeforeClass(): void
4141

4242
public function testItRunsWithoutThrowingAnException()
4343
{
44+
$start = new S3ExpressBasics();
4445
try {
45-
$start = new S3ExpressBasics();
4646
$start->runExample();
4747
self::assertTrue(true); // This asserts that we made it to this line with no exceptions thrown.
4848
}catch(S3Exception $caught){
4949
echo "There was a problem running the tests: {$caught->getAwsErrorMessage()}\n";
50+
self::fail();
5051
}finally{
5152
$start->cleanUp();
5253
}

‎php/parseOutput.php‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?php
2+
3+
$file = file_get_contents("output.txt");
4+
if(!$file){
5+
echo "{\"json\": false}";
6+
die();
7+
}
8+
9+
$output = [
10+
"schema-version" => "0.0.1",
11+
"results" => [
12+
"tool" => "",
13+
"summary" => [
14+
"tests" => "",
15+
"passed" => "",
16+
"failed" => "",
17+
"start_time" => 0,
18+
"stop_time" => "",
19+
],
20+
"tests" => [
21+
[
22+
"name" => "test1",
23+
"status" => "passed",
24+
"duration" => 1,
25+
"message" => "passed",
26+
"log" => "none",
27+
],
28+
],
29+
],
30+
];
31+
32+
$runtime_loc = strpos($file,"Runtime:");
33+
$configuration_loc = strpos($file, "Configuration:", $runtime_loc);
34+
$tool = trim(substr($file, $runtime_loc + 8, $configuration_loc - $runtime_loc - 8));
35+
36+
$output['results']['tool'] = $tool;
37+
38+
$time_loc = strpos($file, "Time:");
39+
$memory_loc = strpos($file, "Memory:", $time_loc);
40+
$time = trim(substr($file, $time_loc + 5, $memory_loc - $time_loc - 7));
41+
$timeInSeconds = strtotime("1970-01-01T00:".$time, 0); // #TODO add support for hour+ long runs
42+
43+
$output['results']['summary']['stop_time'] = $timeInSeconds;
44+
45+
// Check for OK, which is all passed
46+
$ok_loc = strpos($file, "OK (");
47+
if($ok_loc !== false) {
48+
$tests_loc = strpos($file, "tests,", $ok_loc);
49+
$total_tests = trim(substr($file, $ok_loc + 4, $tests_loc - $ok_loc - 4));
50+
51+
$output['results']['summary']['tests'] = (int)$total_tests;
52+
$output['results']['summary']['passed'] = (int)$total_tests;
53+
$output['results']['summary']['failed'] = 0;
54+
}else{
55+
//look for failure state
56+
$tests_loc = strpos($file, "Tests: ");
57+
$end_tests_loc = strpos($file, ",", $tests_loc);
58+
$total_tests = substr($file, $tests_loc + 6, $end_tests_loc - $tests_loc - 6);
59+
60+
$assertions_loc = strpos($file, "Assertions: ", $tests_loc);
61+
$end_assertions_loc = strpos($file, ",", $assertions_loc);
62+
$assertions = substr($file, $assertions_loc + 12, $end_assertions_loc - $assertions_loc - 12);
63+
64+
$failures_loc = strpos($file, "Errors: ", $assertions_loc);
65+
$end_failures_loc = strpos($file, ".", $failures_loc);
66+
$failures = trim(substr($file, $failures_loc + 7, $end_failures_loc - $failures_loc - 7));
67+
68+
$output['results']['summary']['tests'] = (int)$assertions;
69+
$output['results']['summary']['passed'] = $assertions - $failures;
70+
$output['results']['summary']['failed'] = (int)$failures;
71+
}
72+
echo json_encode($output);

0 commit comments

Comments
 (0)