Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade api calls to work with OpenShift 4.x #55

Open
wants to merge 34 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
45b074f
Update dependencies and fix tests.
pingers Mar 16, 2022
250df26
Drupal core compatible version of the phpunit bridge.
pingers Mar 21, 2022
161c8af
Get Imagestream creation working.
singularo Apr 12, 2022
8ba5484
Merge branch 'update-deps' into openshift-4.x
singularo Apr 13, 2022
2aeb83c
Update more endpoints for Openshift 4.x
singularo Apr 13, 2022
b9bc140
Remove unused variables and dead todo's.
singularo Apr 13, 2022
5a1f63b
Remove old unused api variable and code.
singularo Apr 27, 2022
32b2965
Update the api version on the route.
singularo Apr 27, 2022
aa436eb
Update api response, don't suggest committing cache.
singularo May 4, 2022
f2f02b5
Merge branch 'openshift-4.x' of github.com:universityofadelaide/opens…
singularo May 4, 2022
35d8df4
Skip long time non functional client tests for now.
singularo May 4, 2022
44a6d96
Move that test out of the way instead, simpler.
singularo May 4, 2022
548dcce
Missed committing these couple more api version changes.
singularo May 9, 2022
fd1b940
Switch to dynamically adding the auth token.
singularo May 24, 2022
aae647b
Add in project api calls, some error handling.
singularo May 30, 2022
e340acc
Add in the project request method.
singularo May 30, 2022
37f6f3b
Adding in roleinding support.
singularo Jun 1, 2022
c86370c
Make missing things respond like the api used to.
singularo Jun 1, 2022
f80c715
Add support for project deletion.
singularo Jun 3, 2022
11c099f
Fix api layout issue.
singularo Jun 3, 2022
7023cab
Merge pull request #56 from universityofadelaide/SAPP-2505-multiple-s…
singularo Jun 8, 2022
13dba21
SAPP 2796 set pvc size (#58)
singularo Jun 14, 2022
19b3a0f
Add labels functionality to route object. (#57)
singularo Jun 14, 2022
9ad47fb
Fix spacing issues.
singularo Jul 5, 2022
8db244d
Allow choosing the namespace to pull the imagestream from.
singularo Aug 9, 2022
2d22c5a
Altering some build options needed for OpenShift 4.x.
singularo Aug 11, 2022
8aeb92a
Provide more information on failures.
singularo Aug 18, 2022
a524a31
Make defaults saner, handle passed in values correctly.
singularo Aug 19, 2022
7db4678
Networkpolicies changed the api endpoint.
singularo Aug 28, 2022
738fd13
Support more matching on labels.
singularo Sep 5, 2022
9548762
Add ability to add labels to a namespace.
singularo Sep 5, 2022
7f2ca94
Switch to nwe status fields.
singularo Sep 12, 2022
658e9b5
Phase needs to be lowercase.
singularo Sep 12, 2022
997b047
Move to stable cronjob batch api.
pingers Jan 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/openshift-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ jobs:
run: |
composer install --no-progress --prefer-dist
- name: Run Tests
run: vendor/phpunit/phpunit/phpunit --coverage-text tests/src/Unit/
run: |
vendor/phpunit/phpunit/phpunit --coverage-text tests/src/Unit/
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
/.idea/
/client_test.json
/client_test.yml
.phpunit.result.cache
2 changes: 1 addition & 1 deletion client_test.json.example
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"from": {
"kind": "DockerImage",
"name": "uofa/s2i-shepherd-drupal:develop"
},
}
},
"envVars": [
{
Expand Down
11 changes: 6 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@
}
],
"require": {
"guzzlehttp/guzzle" : "^6.2.1",
"symfony/serializer": "~3.4.0"
"guzzlehttp/guzzle" : "^6.5.5",
"symfony/serializer": "~4.4",
"symfony/phpunit-bridge": "^5.3"
},
"require-dev": {
"phpunit/phpunit" : "~4.0",
"mockery/mockery" : "~0.9",
"satooshi/php-coveralls": "~1.0"
"phpunit/phpunit" : "~9.5",
"mockery/mockery" : "~1.5",
"php-coveralls/php-coveralls": "~2.5"
},
"autoload": {
"psr-4": {
Expand Down
60 changes: 27 additions & 33 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,35 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit bootstrap="tests/bootstrap.php" colors="true"
beStrictAboutTestsThatDoNotTestAnything="true"
beStrictAboutOutputDuringTests="true"
beStrictAboutChangesToGlobalState="true"
checkForUnintentionallyCoveredCode="false">
<php>
<!-- Set error reporting to E_ALL. -->
<ini name="error_reporting" value="32767"/>
<!-- Do not limit the amount of memory tests take to run. -->
<ini name="memory_limit" value="-1"/>
<const name="BOOTSTRAP_IS_PHPUNIT" value="true"/>
</php>
<testsuites>
<testsuite name="unit">
<directory>./tests/Unit</directory>
</testsuite>
</testsuites>
<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
</listener>
</listeners>
<!-- Filter for coverage reports. -->
<filter>
<whitelist>
<directory>./src</directory>
<!-- By definition test classes have no tests. -->
<exclude>
<directory suffix="Test.php">./</directory>
<directory suffix="TestBase.php">./</directory>
</exclude>
</whitelist>
</filter>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" colors="true" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutOutputDuringTests="true" beStrictAboutChangesToGlobalState="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage>
<include>
<directory>./src</directory>
</include>
<exclude>
<directory suffix="Test.php">./</directory>
<directory suffix="TestBase.php">./</directory>
</exclude>
</coverage>
<php>
<!-- Set error reporting to E_ALL. -->
<ini name="error_reporting" value="32767"/>
<!-- Do not limit the amount of memory tests take to run. -->
<ini name="memory_limit" value="-1"/>
<const name="BOOTSTRAP_IS_PHPUNIT" value="true"/>
</php>
<testsuites>
<testsuite name="unit">
<directory>./tests/src/Unit</directory>
</testsuite>
</testsuites>
<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
</listener>
</listeners>
<!-- Filter for coverage reports. -->
</phpunit>
Loading