Skip to content

Commit a0f21b2

Browse files
authored
[PHP] Get secrets based on the service (#145)
* Get secrets based on the service * Update gradle script and environment variable names
1 parent b5256b0 commit a0f21b2

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

.github/workflows/generate_php_sources.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v4
17-
17+
1818
- name: Make gradlew executable
1919
run: chmod +x ./gradlew
2020

@@ -55,9 +55,12 @@ jobs:
5555
- name: Test SDKs
5656
run: python ./scripts/test_sdk.py --language php
5757
env:
58-
TEST_CLIENT_ID: ${{ secrets.SDK_TEST_CLIENT_ID }}
59-
TEST_CLIENT_SECRET: ${{ secrets.SDK_TEST_CLIENT_SECRET }}
60-
TEST_APPLICATION_ID: ${{ secrets.SDK_TEST_APPLICATION_ID }}
58+
RETAILMEDIA_TEST_CLIENT_ID: ${{ secrets.RETAILMEDIA_SDK_TEST_CLIENT_ID }}
59+
RETAILMEDIA_TEST_CLIENT_SECRET: ${{ secrets.RETAILMEDIA_SDK_TEST_CLIENT_SECRET }}
60+
RETAILMEDIA_TEST_APPLICATION_ID: ${{ secrets.RETAILMEDIA_SDK_TEST_APPLICATION_ID }}
61+
MARKETINGSOLUTIONS_TEST_CLIENT_ID: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_CLIENT_ID }}
62+
MARKETINGSOLUTIONS_TEST_CLIENT_SECRET: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_CLIENT_SECRET }}
63+
MARKETINGSOLUTIONS_TEST_APPLICATION_ID: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_APPLICATION_ID }}
6164
shell: bash
6265

6366
- name: Upload SDKs

.github/workflows/test_php.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v4
19-
19+
2020
- name: Make gradlew executable
2121
run: chmod +x ./gradlew
2222

@@ -51,7 +51,10 @@ jobs:
5151
- name: Test SDKs
5252
run: python ./scripts/test_sdk.py --language php
5353
env:
54-
TEST_CLIENT_ID: ${{ secrets.SDK_TEST_CLIENT_ID }}
55-
TEST_CLIENT_SECRET: ${{ secrets.SDK_TEST_CLIENT_SECRET }}
56-
TEST_APPLICATION_ID: ${{ secrets.SDK_TEST_APPLICATION_ID }}
54+
RETAILMEDIA_TEST_CLIENT_ID: ${{ secrets.RETAILMEDIA_SDK_TEST_CLIENT_ID }}
55+
RETAILMEDIA_TEST_CLIENT_SECRET: ${{ secrets.RETAILMEDIA_SDK_TEST_CLIENT_SECRET }}
56+
RETAILMEDIA_TEST_APPLICATION_ID: ${{ secrets.RETAILMEDIA_SDK_TEST_APPLICATION_ID }}
57+
MARKETINGSOLUTIONS_TEST_CLIENT_ID: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_CLIENT_ID }}
58+
MARKETINGSOLUTIONS_TEST_CLIENT_SECRET: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_CLIENT_SECRET }}
59+
MARKETINGSOLUTIONS_TEST_APPLICATION_ID: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_APPLICATION_ID }}
5760
shell: bash

generator/php/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ task generateClient(type: GradleBuild) {
7575
invokerPackage : "${namespaceBase}".toString(),
7676
packageName : "criteo-api-${criteoService}-sdk".toString(),
7777
]
78+
additionalProperties = [
79+
criteoServiceAsPrefix : "${criteoService}".toString().toUpperCase(),
80+
]
7881
}
7982

8083

generator/php/resources/templates/custom/GatewayApiTest.php.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ class GatewayApiTest extends TestCase
3333
{
3434
parent::__construct();
3535
36-
$this->clientId = $_SERVER["TEST_CLIENT_ID"];
37-
$this->clientSecret = $_SERVER["TEST_CLIENT_SECRET"];
38-
$this->applicationId = (int) $_SERVER["TEST_APPLICATION_ID"];
36+
$this->clientId = $_SERVER["{{criteoServiceAsPrefix}}_TEST_CLIENT_ID"];
37+
$this->clientSecret = $_SERVER["{{criteoServiceAsPrefix}}_TEST_CLIENT_SECRET"];
38+
$this->applicationId = (int) $_SERVER["{{criteoServiceAsPrefix}}_TEST_APPLICATION_ID"];
3939
}
4040

4141
public function secretEnvironmentVariables()

0 commit comments

Comments
 (0)