Skip to content

Commit d6d8fd1

Browse files
authored
Get secrets based on criteo service (#148)
1 parent bf3a406 commit d6d8fd1

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

.github/workflows/generate_python_sources.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@ jobs:
4242
run: python ./scripts/test_sdk.py --language python
4343
shell: bash
4444
env:
45-
TEST_CLIENT_ID: ${{ secrets.SDK_TEST_CLIENT_ID }}
46-
TEST_CLIENT_SECRET: ${{ secrets.SDK_TEST_CLIENT_SECRET }}
47-
TEST_APPLICATION_ID: ${{ secrets.SDK_TEST_APPLICATION_ID }}
45+
RETAILMEDIA_TEST_CLIENT_ID: ${{ secrets.RETAILMEDIA_SDK_TEST_CLIENT_ID }}
46+
RETAILMEDIA_TEST_CLIENT_SECRET: ${{ secrets.RETAILMEDIA_SDK_TEST_CLIENT_SECRET }}
47+
RETAILMEDIA_TEST_APPLICATION_ID: ${{ secrets.RETAILMEDIA_SDK_TEST_APPLICATION_ID }}
48+
MARKETINGSOLUTIONS_TEST_CLIENT_ID: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_CLIENT_ID }}
49+
MARKETINGSOLUTIONS_TEST_CLIENT_SECRET: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_CLIENT_SECRET }}
50+
MARKETINGSOLUTIONS_TEST_APPLICATION_ID: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_APPLICATION_ID }}
4851

4952
- name: Upload Sdk
5053
uses: actions/upload-artifact@v4

.github/workflows/test_python.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ jobs:
3939
run: python ./scripts/test_sdk.py --language python
4040
shell: bash
4141
env:
42-
TEST_CLIENT_ID: ${{ secrets.SDK_TEST_CLIENT_ID }}
43-
TEST_CLIENT_SECRET: ${{ secrets.SDK_TEST_CLIENT_SECRET }}
44-
TEST_APPLICATION_ID: ${{ secrets.SDK_TEST_APPLICATION_ID }}
42+
RETAILMEDIA_TEST_CLIENT_ID: ${{ secrets.RETAILMEDIA_SDK_TEST_CLIENT_ID }}
43+
RETAILMEDIA_TEST_CLIENT_SECRET: ${{ secrets.RETAILMEDIA_SDK_TEST_CLIENT_SECRET }}
44+
RETAILMEDIA_TEST_APPLICATION_ID: ${{ secrets.RETAILMEDIA_SDK_TEST_APPLICATION_ID }}
45+
MARKETINGSOLUTIONS_TEST_CLIENT_ID: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_CLIENT_ID }}
46+
MARKETINGSOLUTIONS_TEST_CLIENT_SECRET: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_CLIENT_SECRET }}
47+
MARKETINGSOLUTIONS_TEST_APPLICATION_ID: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_APPLICATION_ID }}

generator/python/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ task generateClient(type: GradleBuild) {
9090
packageVersion : "${artifactVersion}".toString(), // v2021_10.1.211109
9191
projectName : "criteo-api-${criteoService}-sdk".toString(),
9292
]
93+
additionalProperties = [
94+
criteoServiceAsPrefix : "${criteoService}".toString().toUpperCase(),
95+
]
9396
mustRunAfter createConfig
9497
}
9598

generator/python/resources/templates/custom/test_gateway_api.py.mustache

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ from example_application_with_client_credentials import ExampleApplication
99
class TestGatewayApi:
1010
@pytest.fixture(autouse=True)
1111
def before_each(self):
12-
self.client_id = os.environ.get("TEST_CLIENT_ID")
13-
self.client_secret = os.environ.get("TEST_CLIENT_SECRET")
14-
self.application_id = int(os.environ.get("TEST_APPLICATION_ID"))
12+
self.client_id = os.environ.get("{{criteoServiceAsPrefix}}_TEST_CLIENT_ID")
13+
self.client_secret = os.environ.get("{{criteoServiceAsPrefix}}_TEST_CLIENT_SECRET")
14+
self.application_id = int(os.environ.get("{{criteoServiceAsPrefix}}_TEST_APPLICATION_ID"))
1515

1616
self.client = ApiClientBuilder.WithClientCredentials(clientId=self.client_id, clientSecret=self.client_secret)
1717

1818
def test_environment_variables(self):
19-
assert len(self.client_id) > 0, "Environment variable \"TEST_CLIENT_ID\" not found."
20-
assert len(self.client_secret) > 0, "Environment variable \"TEST_CLIENT_SECRET\" not found."
21-
assert self.application_id > 0, "Environment variable \"TEST_APPLICATION_ID\" not found."
19+
assert len(self.client_id) > 0, "Environment variable \"{{criteoServiceAsPrefix}}_TEST_CLIENT_ID\" not found."
20+
assert len(self.client_secret) > 0, "Environment variable \"{{criteoServiceAsPrefix}}_TEST_CLIENT_SECRET\" not found."
21+
assert self.application_id > 0, "Environment variable \"{{criteoServiceAsPrefix}}_TEST_APPLICATION_ID\" not found."
2222

2323
def test_example_works(self):
2424
# Arrange

0 commit comments

Comments
 (0)