Skip to content

Commit 58486fb

Browse files
committed
fix: CI/local logs bucket and container is no longer needed
1 parent 7ece08d commit 58486fb

5 files changed

Lines changed: 0 additions & 28 deletions

File tree

README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ $clientFactory->getEventsClient('xxx-xxxxx-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
8282
- `TEST_AWS_ACCESS_KEY` - The created security credentials for the `JobQueueApiPhpClient` user.
8383
- `TEST_AWS_SECRET_ACCESS_KEY` - The created security credentials for the `JobQueueApiPhpClient` user.
8484
- `AWS_REGION` - `Region` output of the above stack.
85-
- `AWS_LOGS_S3_BUCKET` - `S3LogsBucket` output of the above stackk.
8685

8786
### Azure Setup
8887

@@ -123,18 +122,13 @@ $clientFactory->getEventsClient('xxx-xxxxx-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
123122
az storage account show-connection-string -g testing-notification-api-php-client -n mirontfcnacc2 --query "connectionString" --output tsv
124123
```
125124

126-
Set the connection string and container name you provided as parameter to the create command to following environment variables in the `set-env.sh` file:
127-
- AZURE_LOGS_ABS_CONTAINER
128-
- AZURE_LOGS_ABS_CONNECTION_STRING
129-
130125
## Generate environment configuration
131126

132127
```bash
133128
export DATABASE_URL_BASE64=$(printf "mysql://root:root@dev-mysql-service:3310/notifications?serverVersion=8.0" | base64 --wrap=0)
134129
export DATABASE_PASSWORD_BASE64=$(printf "root" | base64 --wrap=0)
135130
export TEST_AZURE_CLIENT_SECRET_BASE64=$(printf "%s" "$TEST_AZURE_CLIENT_SECRET"| base64 --wrap=0)
136131
export TEST_AWS_SECRET_ACCESS_KEY_BASE64=$(printf "%s" "$TEST_AWS_SECRET_ACCESS_KEY"| base64 --wrap=0)
137-
export AZURE_LOGS_ABS_CONNECTION_STRING_BASE64=$(printf "%s" "$AZURE_LOGS_ABS_CONNECTION_STRING"| base64 --wrap=0)
138132
139133
./set-env.sh
140134
envsubst < provisioning/environments.yaml.template > provisioning/environments.yaml

azure-pipelines.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ stages:
4343
name: prepare_cluster
4444
env:
4545
KUBERNETES_NAMESPACE: $(k8sNamespace)
46-
AWS_LOGS_S3_BUCKET: $(AWS_LOGS_S3_BUCKET)
4746
AWS_REGION: $(AWS_REGION)
4847
TEST_AWS_ACCESS_KEY_ID: $(TEST_AWS_ACCESS_KEY_ID)
4948
TEST_AWS_SECRET_ACCESS_KEY: $(TEST_AWS_SECRET_ACCESS_KEY)

provisioning/environments.yaml.template

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ metadata:
1212
type: Opaque
1313
data:
1414
awsSecretAccessKey: '$TEST_AWS_SECRET_ACCESS_KEY_BASE64'
15-
azureLogsAbsConnectionString: '$AZURE_LOGS_ABS_CONNECTION_STRING_BASE64'
1615
azureClientSecret: '$TEST_AZURE_CLIENT_SECRET_BASE64'
1716
databaseUrl: '$DATABASE_URL_BASE64'
1817
databasePassword: '$DATABASE_PASSWORD_BASE64'
@@ -26,9 +25,7 @@ data:
2625
appEnv: 'dev'
2726
keboolaStack: 'local'
2827
awsAccessKeyId: '$TEST_AWS_ACCESS_KEY_ID'
29-
awsLogsS3Bucket: '$AWS_LOGS_S3_BUCKET'
3028
awsRegion: '$AWS_REGION'
31-
azureLogsAbsContainer: '$AZURE_LOGS_ABS_CONTAINER'
3229
azureClientId: '$TEST_AZURE_CLIENT_ID'
3330
azureTenantId: '$TEST_AZURE_TENANT_ID'
3431
databaseSslVerifyEnabled: '0'

provisioning/notification.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ spec:
9090
name: dev-notification-environments
9191
key: keboolaStack
9292

93-
- name: AWS_LOGS_S3_BUCKET
94-
valueFrom:
95-
configMapKeyRef:
96-
name: dev-notification-environments
97-
key: awsLogsS3Bucket
9893
- name: AWS_REGION
9994
valueFrom:
10095
configMapKeyRef:
@@ -111,16 +106,6 @@ spec:
111106
name: dev-notification-environments
112107
key: awsSecretAccessKey
113108

114-
- name: AZURE_LOGS_ABS_CONTAINER
115-
valueFrom:
116-
configMapKeyRef:
117-
name: dev-notification-environments
118-
key: azureLogsAbsContainer
119-
- name: AZURE_LOGS_ABS_CONNECTION_STRING
120-
valueFrom:
121-
secretKeyRef:
122-
name: dev-notification-environments
123-
key: azureLogsAbsConnectionString
124109
- name: AZURE_CLIENT_ID
125110
valueFrom:
126111
configMapKeyRef:

set-env.template.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
export DATABASE_URL=mysql://root:root@dev-mysql-service:3310/notifications?serverVersion=8.0
44
export DATABASE_PASSWORD=root
55

6-
export AWS_LOGS_S3_BUCKET=
76
export AWS_REGION=us-east-1
8-
export AZURE_LOGS_ABS_CONTAINER=
9-
export AZURE_LOGS_ABS_CONNECTION_STRING=
107

118
export TEST_AWS_ACCESS_KEY_ID=
129
export TEST_AWS_SECRET_ACCESS_KEY=

0 commit comments

Comments
 (0)