Skip to content
This repository was archived by the owner on Oct 19, 2023. It is now read-only.

Stackdriver integration defer check #431

Merged
chingor13 merged 8 commits into from
Apr 23, 2018
Merged

Stackdriver integration defer check #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c118ecf
Defer checking stackdriver integration required versions until compos…
chingor13 Apr 18, 2018
99becb5
Fix code style
chingor13 Apr 18, 2018
ae42e31
Remove gen dockerfile tests
chingor13 Apr 18, 2018
2d918cb
Add base tests for stackdriver integration
chingor13 Apr 18, 2018
8148f47
Run the php-base tests. Add tests for version checking google/cloud l…
chingor13 Apr 18, 2018
169c034
Fix phpcs
chingor13 Apr 18, 2018
15c60b1
Move no_composer test to php-base
chingor13 Apr 19, 2018
15610e4
Throw and log error if we cannot open or write the php.ini config
chingor13 Apr 19, 2018
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
22 changes: 0 additions & 22 deletions builder/gen-dockerfile/src/Builder/Exception/GoogleCloudVersionException.php
View file
Open in desktop

This file was deleted.

11 changes: 2 additions & 9 deletions builder/gen-dockerfile/src/Builder/GenFilesCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
use Google\Cloud\Runtimes\Builder\Exception\MissingDocumentRootException;
use Google\Cloud\Runtimes\Builder\Exception\RemovedEnvVarException;
use Google\Cloud\Runtimes\DetectPhpVersion;
use Google\Cloud\Runtimes\ValidateGoogleCloud;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
Expand Down Expand Up @@ -281,14 +280,8 @@ public function createDockerfile($baseImage)
}
if (self::isStackdriverIntegrationEnabled($envs)) {
$envs['IS_BATCH_DAEMON_RUNNING'] = 'true';
$result = ValidateGoogleCloud::doCheck($this->workspace);
if ($result == ValidateGoogleCloud::FOUND_GOOGLE_CLOUD) {
$enableStackdriverCmd = 'RUN /bin/bash /stackdriver-files/'
. 'enable_stackdriver_integration.sh';
} else {
$enableStackdriverCmd = 'RUN /bin/bash /stackdriver-files/'
. 'enable_stackdriver_integration.sh --individual';
}
$enableStackdriverCmd = 'RUN /bin/bash /stackdriver-files/'
. 'enable_stackdriver_integration.sh';
} else {
$enableStackdriverCmd = '';
}
Expand Down
143 changes: 0 additions & 143 deletions builder/gen-dockerfile/src/ValidateGoogleCloud.php
View file
Open in desktop

This file was deleted.

100 changes: 0 additions & 100 deletions builder/gen-dockerfile/tests/GenFilesCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,106 +187,6 @@ public function dataProvider()
[],
'\\Google\\Cloud\\Runtimes\\Builder\\Exception\\InvalidComposerFlagsException'
],
[
// stackdriver simple case
__DIR__ . '/test_data/stackdriver_simple',
null,
'',
'/app/web',
'added by the php runtime builder',
'gcr.io/google-appengine/php72:latest',
["COMPOSER_FLAGS='--no-dev --prefer-dist' \\\n",
"FRONT_CONTROLLER_FILE='index.php' \\\n",
"DETECTED_PHP_VERSION='7.2' \\\n",
"IS_BATCH_DAEMON_RUNNING='true' \n",
"enable_stackdriver_integration.sh"
]
],
[
// stackdriver wildcard dep
__DIR__ . '/test_data/stackdriver_wildcard',
null,
'',
'/app/web',
'added by the php runtime builder',
'gcr.io/google-appengine/php72:latest',
["COMPOSER_FLAGS='--no-dev --prefer-dist' \\\n",
"FRONT_CONTROLLER_FILE='index.php' \\\n",
"DETECTED_PHP_VERSION='7.2' \\\n",
"IS_BATCH_DAEMON_RUNNING='true' \n",
"enable_stackdriver_integration.sh"
]
],
[
// stackdriver individual packages
__DIR__ . '/test_data/stackdriver_individual',
null,
'',
'/app/web',
'added by the php runtime builder',
'gcr.io/google-appengine/php72:latest',
["COMPOSER_FLAGS='--no-dev --prefer-dist' \\\n",
"FRONT_CONTROLLER_FILE='index.php' \\\n",
"DETECTED_PHP_VERSION='7.2' \\\n",
"IS_BATCH_DAEMON_RUNNING='true' \n",
"enable_stackdriver_integration.sh --individual"
]
],
[
// stackdriver old logging
__DIR__ . '/test_data/stackdriver_old_logging',
null,
'',
'/app/web',
'added by the php runtime builder',
'gcr.io/google-appengine/php72:latest',
[],
'\\Google\\Cloud\\Runtimes\\Builder\\Exception\\GoogleCloudVersionException'
],
[
// stackdriver old error_reporting
__DIR__ . '/test_data/stackdriver_old_er',
null,
'',
'/app/web',
'added by the php runtime builder',
'gcr.io/google-appengine/php72:latest',
[],
'\\Google\\Cloud\\Runtimes\\Builder\\Exception\\GoogleCloudVersionException'
],
[
// stackdriver no composer.json
__DIR__ . '/test_data/stackdriver_no_composer',
null,
'',
'/app/web',
'added by the php runtime builder',
'gcr.io/google-appengine/php72:latest',
[],
'\\Google\\Cloud\\Runtimes\\Builder\\Exception\\GoogleCloudVersionException'
],
[
// stackdriver no google/cloud
__DIR__ . '/test_data/stackdriver_no_google_cloud',
null,
'',
'/app/web',
'added by the php runtime builder',
'gcr.io/google-appengine/php72:latest',
[],
'\\Google\\Cloud\\Runtimes\\Builder\\Exception\\GoogleCloudVersionException'
],
[
// stackdriver old google/cloud
__DIR__ . '/test_data/stackdriver_old_google_cloud',
null,
'',
'/app/web',
'added by the php runtime builder',
'gcr.io/google-appengine/php72:latest',
[],
'\\Google\\Cloud\\Runtimes\\Builder\\Exception\\GoogleCloudVersionException'
],
[
// PHP 5.6
__DIR__ . '/test_data/php56',
Expand Down
6 changes: 0 additions & 6 deletions builder/gen-dockerfile/tests/test_data/stackdriver_individual/app.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions builder/gen-dockerfile/tests/test_data/stackdriver_no_composer/app.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions builder/gen-dockerfile/tests/test_data/stackdriver_no_google_cloud/app.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions builder/gen-dockerfile/tests/test_data/stackdriver_old_er/app.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions builder/gen-dockerfile/tests/test_data/stackdriver_old_google_cloud/app.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions builder/gen-dockerfile/tests/test_data/stackdriver_old_logging/app.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions builder/gen-dockerfile/tests/test_data/stackdriver_simple/app.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions builder/gen-dockerfile/tests/test_data/stackdriver_wildcard/app.yaml
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ steps:
waitFor: ['php56']
id: test-runner

# base tests
- name: gcr.io/cloud-builders/docker
args: ['run', '-v', '/workspace/php-base:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG']
waitFor: ['-']
id: php-base-tests
waitFor: ['test-runner', 'php-base']

# php-onbuild
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/php:$_TAG', '.']
Expand Down
Loading