fix: CI/local tests uses HOSTNAME_SUFFIX

Author: ErikZigo

.env

@@ -1,4 +1,4 @@
-STORAGE_API_URL=
+HOSTNAME_SUFFIX=
 TEST_MANAGE_API_APPLICATION_TOKEN=
 TEST_NOTIFICATION_API_URL=
 TEST_STORAGE_API_PROJECT_ID=

README.md

@@ -68,7 +68,7 @@ $clientFactory->getEventsClient('xxx-xxxxx-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
     ```
 
 - Set the following environment variables in `set-env.sh` file (use `set-env.template.sh` as sample):
-    - `STORAGE_API_URL` - Keboola Connection URL to arbitrary stack where the notification service is registered.
+    - `HOSTNAME_SUFFIX` - Suffix for the hostname, e.g. `eu-west-1.aws.keboola.dev`.
     - `TEST_STORAGE_API_TOKEN` - Token to a test project. 
     - `TEST_STORAGE_API_PROJECT_ID` - Project ID of the test project.
     - `TEST_MANAGE_API_APPLICATION_TOKEN` - Application token with scope `notifications:push-event`.

azure-pipelines.yml

@@ -43,11 +43,11 @@ stages:
             name: prepare_cluster
             env:
               KUBERNETES_NAMESPACE: $(k8sNamespace)
-              STORAGE_API_URL: $(STORAGE_API_URL)
               AWS_LOGS_S3_BUCKET: $(AWS_LOGS_S3_BUCKET)
               AWS_REGION: $(AWS_REGION)
               TEST_AWS_ACCESS_KEY_ID: $(TEST_AWS_ACCESS_KEY_ID)
               TEST_AWS_SECRET_ACCESS_KEY: $(TEST_AWS_SECRET_ACCESS_KEY)
+              HOSTNAME_SUFFIX: $(HOSTNAME_SUFFIX)
 
   - stage: tests
     dependsOn: prepare
@@ -63,15 +63,15 @@ stages:
 
               echo "Notification API URL: $NOTIFICATION_API_IP"
 
-              docker compose build --pull
-              docker compose run --rm tests
+              docker-compose build --pull
+              docker-compose run --rm tests
             displayName: 'Build & Run Tests'
             env:
               TEST_STORAGE_API_TOKEN: $(TEST_STORAGE_API_TOKEN)
               TEST_MANAGE_API_APPLICATION_TOKEN: $(TEST_MANAGE_API_APPLICATION_TOKEN)
               TEST_NOTIFICATION_API_URL: http://$(NOTIFICATION_API_IP):8181
-              STORAGE_API_URL: $(STORAGE_API_URL)
               TEST_STORAGE_API_PROJECT_ID: $(TEST_STORAGE_API_PROJECT_ID)
+              HOSTNAME_SUFFIX: $(HOSTNAME_SUFFIX)
 
           - task: PublishTestResults@2
             displayName: 'Publish Test results'

docker-compose.yml

@@ -10,8 +10,8 @@ services:
       TEST_NOTIFICATION_API_URL:
       TEST_STORAGE_API_TOKEN:
       TEST_MANAGE_API_APPLICATION_TOKEN:
-      STORAGE_API_URL:
       TEST_STORAGE_API_PROJECT_ID:
+      HOSTNAME_SUFFIX:
     command: ['composer', 'ci']
 
   tests-local:

provisioning/environments.yaml.template

@@ -31,7 +31,7 @@ data:
   azureLogsAbsContainer: '$AZURE_LOGS_ABS_CONTAINER'
   azureClientId: '$TEST_AZURE_CLIENT_ID'
   azureTenantId: '$TEST_AZURE_TENANT_ID'
-  storageApiUrl: '$STORAGE_API_URL'
   databaseSslVerifyEnabled: '0'
   messengerTransportDsn: 'doctrine://default'
   mailerDsn: 'null://null'
+  hostnameSufix: '$HOSTNAME_SUFFIX'

provisioning/notification.yaml

@@ -138,11 +138,11 @@ spec:
                   key: azureTenantId
 
 
-            - name: STORAGE_API_URL
+            - name: HOSTNAME_SUFFIX
               valueFrom:
                 configMapKeyRef:
                   name: dev-notification-environments
-                  key: storageApiUrl
+                  key: hostnameSufix
             - name: DATABASE_URL
               valueFrom:
                 secretKeyRef:

set-env.template.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-export STORAGE_API_URL=https://connection.keboola.com/
 export DATABASE_URL=mysql://root:root@dev-mysql-service:3310/notifications?serverVersion=8.0
 export DATABASE_PASSWORD=root
 
@@ -20,3 +19,4 @@ export TEST_NOTIFICATION_API_URL=https://localhost:8181/
 export TEST_STORAGE_API_TOKEN=
 export TEST_MANAGE_API_APPLICATION_TOKEN=
 export TEST_STORAGE_API_PROJECT_ID=
+export HOSTNAME_SUFFIX=keboola.com

tests/StorageApiIndexClientTest.php

@@ -24,7 +24,7 @@ class StorageApiIndexClientTest extends TestCase
     public function testFunctional(): void
     {
         $client = new StorageApiIndexClient(
-            (string) getenv('STORAGE_API_URL'),
+            sprintf('https://connection.%s', (string) getenv('HOSTNAME_SUFFIX')),
             [
                 'backoffMaxTries' => 3,
                 'userAgent' => 'Test',

tests/bootstrap.php

@@ -11,7 +11,7 @@
 $dotEnv->bootEnv(dirname(__DIR__).'/.env', 'dev', []);
 
 $requiredEnvs = ['TEST_NOTIFICATION_API_URL', 'TEST_STORAGE_API_TOKEN', 'TEST_MANAGE_API_APPLICATION_TOKEN',
-    'STORAGE_API_URL', 'TEST_STORAGE_API_PROJECT_ID'];
+    'TEST_STORAGE_API_PROJECT_ID', 'HOSTNAME_SUFFIX'];
 foreach ($requiredEnvs as $env) {
     if (empty(getenv($env))) {
         throw new Exception(sprintf('Environment variable "%s" is empty', $env));