Skip to content

Commit b420386

Browse files
Add GOOGLE_API_KEY environment variable for integration testing
Used by Translation API. Needed for #2151.
1 parent 466a8d4 commit b420386

4 files changed

Lines changed: 14 additions & 4 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ docs/
3434
gcloud-java-wheels/
3535
src/test/resources/gcd-head.zip
3636
src/test/resources/gcd-v1beta2-rev1-2.1.1.zip
37+
38+
# API key file containing value of GOOGLE_API_KEY for integration tests
39+
api_key

appveyor.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,23 @@ environment:
1818
- JAVA_HOME: C:\Program Files\Java\jdk1.7.0
1919
GOOGLE_CLOUD_PROJECT:
2020
secure: hbX+cAXrU588+iTMKyzGOQ==
21-
SECRET:
22-
secure: P4H6q90j3t0GC527rKUrpMzYs1z4aqzMh7pfNVqr2ZIJB8H07oeaD0zlosK8An15VQw7q5WTWImiU+yzX1aErct+k2uIah0iArGuEcrKOtQV/4JD10P7QHPsSMXdDXFzbDXsDi6Wf4UDQH7tFGPNU+VrCcXPMfkIlMkYg5tD10TktjdCEJ6YNw0J6SldFeDHDyBkVbmP6SAiQTpqjqO3NDI8i15mH84CWNT90khz4t8Wnhyvnv+J3u89w9Lp/AFoJfkrK2fjDUhR3K1flyG689Skyng2NCSF5wZcq5IPGMRqR+18js4MykeybPVNmEtBBZh+rzPey42oxtQPIX9I6KwPfkXlu2tXuPcbPCpHH5Y=
21+
CREDENTIALS_SECRET:
22+
secure: P4H6q90j3t0GC527rKUrpMzYs1z4aqzMh7pfNVqr2ZIJB8H07oeaD0zlosK8An15VQw7q5WTWImiU+yzX1aErct+k2uIah0iArGuEcrKOtQV/4JD10P7QHPsSMXdDXFzbDXsDi6Wf4UDQH7tFGPNU+VrCcXPMfkIlMkYg5tD10TktjdCEJ6YNw0J6SldFeDHDyBkVbmP6SAiQTpqjqO3NDI8i15mH84CWNT90khz4t8Wnhyvnv+J3u89w9Lp/AFoJfkrK2fjDUhR3K1flyG689Skyng2NCSF5wZcq5IPGMRqR+18js4MykeybPVNmEtBBZh+rzPey42oxtQPIX9I6KwPfkXlu2tXuPcbPCpHH5Y=
23+
API_KEY_SECRET:
24+
secure: tlK82v6dlvXT76+w9PNmdf/oABZbzCdiA7JNLE+iUfQ=
2325

2426
# install required tools (maven, secure-file, encrypted files)
2527
install:
2628
- cmd: echo %JAVA_HOME%
2729
- cmd: echo %M2_HOME%
2830
- ps: $origin = git config --get remote.origin.url; git clone --quiet -b appveyor $origin appveyor
2931
- cmd: nuget install secure-file -ExcludeVersion
30-
- cmd: IF DEFINED SECRET (secure-file\tools\secure-file -decrypt appveyor\key.json.enc -secret %SECRET% -out appveyor\key.json)
31-
- cmd: IF DEFINED SECRET (SET GOOGLE_APPLICATION_CREDENTIALS=%APPVEYOR_BUILD_FOLDER%\appveyor\key.json)
32+
- cmd: IF DEFINED CREDENTIALS_SECRET (secure-file\tools\secure-file -decrypt appveyor\key.json.enc -secret %CREDENTIALS_SECRET% -out appveyor\key.json)
33+
- cmd: IF DEFINED CREDENTIALS_SECRET (SET GOOGLE_APPLICATION_CREDENTIALS=%APPVEYOR_BUILD_FOLDER%\appveyor\key.json)
3234
- cmd: ECHO %GOOGLE_APPLICATION_CREDENTIALS%
35+
- cmd: IF DEFINED API_KEY_SECRET (secure-file\tools\secure-file -decrypt appveyor\api_key.enc -secret %API_KEY_SECRET% -out appveyor\api_key)
36+
- cmd: IF DEFINED API_KEY_SECRET (SET /P GOOGLE_API_KEY=<%APPVEYOR_BUILD_FOLDER%\appveyor\api_key)
37+
- cmd: ECHO %GOOGLE_API_KEY%
3338

3439
# build and install artifacts
3540
build_script:

utilities/integration_test_env.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# Export test env variables
22
export GCLOUD_PROJECT="gcloud-devel"
33
export GOOGLE_APPLICATION_CREDENTIALS=$TRAVIS_BUILD_DIR/signing-tools/gcloud-devel-travis.json
4+
export GOOGLE_API_KEY=$(< $TRAVIS_BUILD_DIR/signing-tools/api_key)

utilities/verify.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
1111
mkdir $TRAVIS_BUILD_DIR/signing-tools
1212
chmod 700 $TRAVIS_BUILD_DIR/signing-tools
1313
tar xvf $TRAVIS_BUILD_DIR/signing-tools.tar -C $TRAVIS_BUILD_DIR/signing-tools
14+
echo $api_key_password | gpg --passphrase-fd 0 target/travis/api_key.gpg --output $TRAVIS_BUILD_DIR/signing-tools/api_key
1415
else
1516
# Skip integration tests when testing pull requests.
1617
mvn_opts+=" -DskipITs"

0 commit comments

Comments
 (0)