Skip to content

Commit 24a166f

Browse files
gaspergromgaspergrom
committed
Merge branch 'main' into improvement/quickstart
2 parents efe5579 + 85dea3e commit 24a166f

File tree

115 files changed

+61072
-22068
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+61072
-22068
lines changed

‎.github/workflows/lf-production-deploy-new.yaml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
description: Deploy search-sync-worker service?
88
required: true
99
type: boolean
10+
deploy_search_sync_api:
11+
description: Deploy search-sync-api service?
12+
required: true
13+
type: boolean
1014
deploy_integration_sync_worker:
1115
description: Deploy integration-sync-worker service?
1216
required: true
@@ -56,6 +60,27 @@ jobs:
5660
- name: Set docker image output
5761
id: image
5862
run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
63+
64+
build-and-push-search-sync-api:
65+
runs-on: ubuntu-latest
66+
if: ${{ inputs.deploy_search_sync_api }}
67+
outputs:
68+
image: ${{ steps.image.outputs.IMAGE }}
69+
defaults:
70+
run:
71+
shell: bash
72+
steps:
73+
- name: Check out repository code
74+
uses: actions/checkout@v2
75+
76+
- uses: ./.github/actions/build-docker-image
77+
id: image-builder
78+
with:
79+
image: search-sync-api
80+
81+
- name: Set docker image output
82+
id: image
83+
run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
5984

6085
build-and-push-integration-sync-worker:
6186
runs-on: ubuntu-latest
@@ -159,6 +184,24 @@ jobs:
159184
image: ${{ needs.build-and-push-search-sync-worker.outputs.image }}
160185
cluster: ${{ env.CROWD_CLUSTER }}
161186

187+
deploy-search-sync-api:
188+
needs: build-and-push-search-sync-api
189+
runs-on: ubuntu-latest
190+
if: ${{ inputs.deploy_search_sync_api }}
191+
defaults:
192+
run:
193+
shell: bash
194+
195+
steps:
196+
- name: Check out repository code
197+
uses: actions/checkout@v2
198+
199+
- uses: ./.github/actions/deploy-service
200+
with:
201+
service: search-sync-api
202+
image: ${{ needs.build-and-push-search-sync-api.outputs.image }}
203+
cluster: ${{ env.CROWD_CLUSTER }}
204+
162205
deploy-integration-sync-worker:
163206
needs: build-and-push-integration-sync-worker
164207
runs-on: ubuntu-latest

‎.github/workflows/lf-staging-deploy-search-sync-api.yaml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: LF Staging Deploy Search Sync API
2+
3+
on:
4+
push:
5+
branches:
6+
- 'lf-staging/**'
7+
- 'lf-staging-**'
8+
paths:
9+
- 'services/libs/**'
10+
- 'services/apps/search_sync_api/**'
11+
12+
env:
13+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
14+
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
15+
CROWD_CLUSTER: ${{ secrets.LF_STAGING_CLUSTER_NAME }}
16+
CROWD_ROLE_ARN: ${{ secrets.LF_STAGING_CLUSTER_ROLE_ARN }}
17+
AWS_ACCESS_KEY_ID: ${{ secrets.LF_AWS_ACCESS_KEY_ID }}
18+
AWS_SECRET_ACCESS_KEY: ${{ secrets.LF_AWS_SECRET_ACCESS_KEY }}
19+
AWS_REGION: ${{ secrets.LF_AWS_REGION }}
20+
SLACK_CHANNEL: deploys-lf-staging
21+
SLACK_WEBHOOK: ${{ secrets.LF_STAGING_SLACK_CHANNEL_HOOK }}
22+
23+
jobs:
24+
build-and-push:
25+
runs-on: ubuntu-latest
26+
outputs:
27+
image: ${{ steps.image.outputs.IMAGE }}
28+
defaults:
29+
run:
30+
shell: bash
31+
32+
steps:
33+
- name: Check out repository code
34+
uses: actions/checkout@v2
35+
36+
- uses: ./.github/actions/build-docker-image
37+
id: image-builder
38+
with:
39+
image: search-sync-api
40+
41+
- name: Set docker image output
42+
id: image
43+
run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
44+
45+
deploy-search-sync-api:
46+
needs: build-and-push
47+
runs-on: ubuntu-latest
48+
defaults:
49+
run:
50+
shell: bash
51+
52+
steps:
53+
- name: Check out repository code
54+
uses: actions/checkout@v2
55+
56+
- uses: ./.github/actions/deploy-service
57+
with:
58+
service: search-sync-api
59+
image: ${{ needs.build-and-push.outputs.image }}
60+
cluster: ${{ env.CROWD_CLUSTER }}

‎.github/workflows/production-deploy-new.yaml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
description: Deploy search-sync-worker service?
88
required: true
99
type: boolean
10+
deploy_search_sync_api:
11+
description: Deploy search-sync-api service?
12+
required: true
13+
type: boolean
1014
deploy_integration_sync_worker:
1115
description: Deploy integration-sync-worker service?
1216
required: true
@@ -56,6 +60,27 @@ jobs:
5660
- name: Set docker image output
5761
id: image
5862
run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
63+
64+
build-and-push-search-sync-api:
65+
runs-on: ubuntu-latest
66+
if: ${{ inputs.deploy_search_sync_api }}
67+
outputs:
68+
image: ${{ steps.image.outputs.IMAGE }}
69+
defaults:
70+
run:
71+
shell: bash
72+
steps:
73+
- name: Check out repository code
74+
uses: actions/checkout@v2
75+
76+
- uses: ./.github/actions/build-docker-image
77+
id: image-builder
78+
with:
79+
image: search-sync-api
80+
81+
- name: Set docker image output
82+
id: image
83+
run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
5984

6085
build-and-push-integration-sync-worker:
6186
runs-on: ubuntu-latest
@@ -159,6 +184,24 @@ jobs:
159184
image: ${{ needs.build-and-push-search-sync-worker.outputs.image }}
160185
cluster: ${{ env.CROWD_CLUSTER }}
161186

187+
deploy-search-sync-api:
188+
needs: build-and-push-search-sync-api
189+
runs-on: ubuntu-latest
190+
if: ${{ inputs.deploy_search_sync_api }}
191+
defaults:
192+
run:
193+
shell: bash
194+
195+
steps:
196+
- name: Check out repository code
197+
uses: actions/checkout@v2
198+
199+
- uses: ./.github/actions/deploy-service
200+
with:
201+
service: search-sync-api
202+
image: ${{ needs.build-and-push-search-sync-api.outputs.image }}
203+
cluster: ${{ env.CROWD_CLUSTER }}
204+
162205
deploy-integration-sync-worker:
163206
needs: build-and-push-integration-sync-worker
164207
runs-on: ubuntu-latest

‎.github/workflows/staging-deploy-search-sync-api.yaml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Staging Deploy Search Sync API
2+
3+
on:
4+
push:
5+
branches:
6+
- 'staging/**'
7+
- 'staging-**'
8+
paths:
9+
- 'services/libs/**'
10+
- 'services/apps/search_sync_api/**'
11+
12+
env:
13+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
14+
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
15+
CROWD_CLUSTER: ${{ secrets.STAGING_CLUSTER_NAME }}
16+
CROWD_ROLE_ARN: ${{ secrets.STAGING_CLUSTER_ROLE_ARN }}
17+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
18+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
19+
AWS_REGION: ${{ secrets.AWS_REGION }}
20+
SLACK_CHANNEL: deploys-staging
21+
SLACK_WEBHOOK: ${{ secrets.STAGING_SLACK_CHANNEL_HOOK }}
22+
23+
jobs:
24+
build-and-push:
25+
runs-on: ubuntu-latest
26+
outputs:
27+
image: ${{ steps.image.outputs.IMAGE }}
28+
defaults:
29+
run:
30+
shell: bash
31+
32+
steps:
33+
- name: Check out repository code
34+
uses: actions/checkout@v2
35+
36+
- uses: ./.github/actions/build-docker-image
37+
id: image-builder
38+
with:
39+
image: search-sync-api
40+
41+
- name: Set docker image output
42+
id: image
43+
run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
44+
45+
deploy-search-sync-api:
46+
needs: build-and-push
47+
runs-on: ubuntu-latest
48+
defaults:
49+
run:
50+
shell: bash
51+
52+
steps:
53+
- name: Check out repository code
54+
uses: actions/checkout@v2
55+
56+
- uses: ./.github/actions/deploy-service
57+
with:
58+
service: search-sync-api
59+
image: ${{ needs.build-and-push.outputs.image }}
60+
cluster: ${{ env.CROWD_CLUSTER }}

‎backend/.env.dist.composed‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,7 @@ CROWD_NANGO_URL=http://nango:3003
2525
CROWD_OPENSEARCH_NODE=http://open-search:9200
2626

2727
# Temporal
28-
CROWD_TEMPORAL_SERVER_URL=temporal:7233
28+
CROWD_TEMPORAL_SERVER_URL=temporal:7233
29+
30+
# Seach sync api
31+
CROWD_SEARCH_SYNC_API_URL=http://search-sync-api:8083

‎backend/.env.dist.local‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,7 @@ CROWD_ANALYTICS_API_TOKEN=
169169

170170
# Temporal
171171
CROWD_TEMPORAL_SERVER_URL=localhost:7233
172-
CROWD_TEMPORAL_NAMESPACE=default
172+
CROWD_TEMPORAL_NAMESPACE=default
173+
174+
# Seach sync api
175+
CROWD_SEARCH_SYNC_API_URL=http://search-sync-api:8083

‎backend/.env.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ CROWD_REDIS_PORT=6380
88
CROWD_SQS_PORT=9325
99

1010
# Temporal settings
11-
CROWD_TEMPORAL_SERVER_URL=localhost:7234
11+
CROWD_TEMPORAL_SERVER_URL=localhost:7234

‎backend/config/custom-environment-variables.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,5 +201,8 @@
201201
"namespace": "CROWD_TEMPORAL_NAMESPACE",
202202
"certificate": "CROWD_TEMPORAL_CERTIFICATE",
203203
"privateKey": "CROWD_TEMPORAL_PRIVATE_KEY"
204+
},
205+
"searchSyncApi": {
206+
"baseUrl": "CROWD_SEARCH_SYNC_API_URL"
204207
}
205208
}

‎backend/config/default.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,6 @@
5959
},
6060
"temporal": {
6161
"automationsTaskQueue": "automations"
62-
}
62+
},
63+
"searchSyncApi": {}
6364
}

0 commit comments

Comments
 (0)