Skip to content

Commit b48e881

Browse files
authored
Merge branch 'main' into jme/LFXV2-1371
2 parents ac0d369 + e9839c1 commit b48e881

5 files changed

Lines changed: 22 additions & 4 deletions

File tree

charts/lfx-v1-sync-helper/templates/app-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ spec:
6161
ports:
6262
- containerPort: 8080
6363
name: web
64+
{{- with .Values.app.resources }}
65+
resources:
66+
{{- toYaml . | nindent 12 }}
67+
{{- end }}
6468
livenessProbe:
6569
httpGet:
6670
path: /livez

charts/lfx-v1-sync-helper/values.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,15 @@ app:
205205
# key in the secret which contains the signing certificate
206206
privateKeyKey: signer.pem
207207

208+
# resources is the resource configuration for the app container
209+
resources:
210+
requests:
211+
memory: "32Mi"
212+
cpu: "10m"
213+
limits:
214+
memory: "256Mi"
215+
cpu: "500m"
216+
208217
# auth0 is the configuration for Auth0 authentication for v1 API calls
209218
auth0:
210219
# secret contains the configuration for Auth0 authentication
@@ -252,7 +261,7 @@ dynamodbStreamConsumer:
252261
# DYNAMODB_TABLES is a comma-separated list of DynamoDB table names to consume.
253262
# Defaults to the full set of tables used by the tap-dynamodb Meltano extractor.
254263
DYNAMODB_TABLES:
255-
value: "itx-poll,itx-poll-vote,itx-surveys,itx-survey-responses,surveymonkey-surveys,itx-zoom-meetings-mappings-v2,itx-zoom-meetings-v2,itx-zoom-past-meetings-mappings,itx-zoom-past-meetings,itx-zoom-past-meetings-attendees,itx-zoom-past-meetings-invitees,itx-zoom-past-meetings-recordings,itx-zoom-past-meetings-summaries,itx-zoom-meetings-registrants-v2,itx-zoom-meetings-invite-responses-v2,itx-zoom-meetings-attachments-v2,itx-zoom-past-meetings-attachments,itx-groupsio-v2-service,itx-groupsio-v2-subgroup,itx-groupsio-v2-member"
264+
value: "itx-poll,itx-poll-vote,itx-surveys,itx-survey-responses,surveymonkey-surveys,itx-zoom-meetings-mappings-v2,itx-zoom-meetings-v2,itx-zoom-past-meetings-mappings,itx-zoom-past-meetings,itx-zoom-past-meetings-attendees,itx-zoom-past-meetings-invitees,itx-zoom-past-meetings-recordings,itx-zoom-past-meetings-summaries,itx-zoom-meetings-registrants-v2,itx-zoom-meetings-invite-responses-v2,itx-zoom-meetings-attachments-v2,itx-zoom-past-meetings-attachments,itx-groupsio-v2-service,itx-groupsio-v2-subgroup,itx-groupsio-v2-member,itx-groupsio-v2-artifact"
256265
# START_FROM_LATEST controls the iterator start position for new shards with no checkpoint.
257266
# Set to "true" to only receive new records; "false" (default) replays all available records.
258267
START_FROM_LATEST:

cmd/lfx-v1-sync-helper/handlers.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ func handleKVPut(ctx context.Context, entry jetstream.KeyValueEntry) bool {
157157
return false
158158
case "itx-groupsio-v2-service",
159159
"itx-groupsio-v2-subgroup",
160-
"itx-groupsio-v2-member":
160+
"itx-groupsio-v2-member",
161+
"itx-groupsio-v2-artifact":
161162
// Groups.io records are processed by lfx-v2-mailing-list-service eventing processor.
162163
logger.With("key", key).DebugContext(ctx, "groupsio record updated, processed by lfx-v2-mailing-list-service")
163164
return false
@@ -271,7 +272,8 @@ func handleResourceDelete(ctx context.Context, key string, v1Principal string, v
271272
return false
272273
case "itx-groupsio-v2-service",
273274
"itx-groupsio-v2-subgroup",
274-
"itx-groupsio-v2-member":
275+
"itx-groupsio-v2-member",
276+
"itx-groupsio-v2-artifact":
275277
// Groups.io records are processed by lfx-v2-mailing-list-service eventing processor.
276278
logger.With("key", key).DebugContext(ctx, "groupsio record deleted, processed by lfx-v2-mailing-list-service")
277279
return false

manifests/dynamodb-list-tables-job.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spec:
6868
# Check specific ITX tables we need access to
6969
echo ""
7070
echo "=== Checking specific ITX tables ==="
71-
for table in "itx-poll" "itx-poll-vote" "itx-surveys" "itx-survey-responses" "surveymonkey-surveys" "itx-zoom-meetings-mappings-v2" "itx-zoom-meetings-v2" "itx-zoom-past-meetings-mappings" "itx-zoom-past-meetings" "itx-zoom-past-meetings-attendees" "itx-zoom-past-meetings-invitees" "itx-zoom-past-meetings-recordings" "itx-zoom-past-meetings-summaries" "itx-zoom-meetings-registrants-v2" "itx-zoom-meetings-invite-responses-v2" "itx-zoom-meetings-attachments-v2" "itx-zoom-past-meetings-attachments" "itx-groupsio-v2-service" "itx-groupsio-v2-subgroup" "itx-groupsio-v2-member"; do
71+
for table in "itx-poll" "itx-poll-vote" "itx-surveys" "itx-survey-responses" "surveymonkey-surveys" "itx-zoom-meetings-mappings-v2" "itx-zoom-meetings-v2" "itx-zoom-past-meetings-mappings" "itx-zoom-past-meetings" "itx-zoom-past-meetings-attendees" "itx-zoom-past-meetings-invitees" "itx-zoom-past-meetings-recordings" "itx-zoom-past-meetings-summaries" "itx-zoom-meetings-registrants-v2" "itx-zoom-meetings-invite-responses-v2" "itx-zoom-meetings-attachments-v2" "itx-zoom-past-meetings-attachments" "itx-groupsio-v2-service" "itx-groupsio-v2-subgroup" "itx-groupsio-v2-member" "itx-groupsio-v2-artifact"; do
7272
echo "Checking table: $table"
7373
aws dynamodb describe-table --table-name "$table" --region ${AWS_DEFAULT_REGION} --query 'Table.{TableName:TableName,Status:TableStatus,ItemCount:ItemCount}' --output table || echo "Failed to access table: $table"
7474
done

meltano/meltano.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ plugins:
8080
- itx-groupsio-v2-service
8181
- itx-groupsio-v2-subgroup
8282
- itx-groupsio-v2-member
83+
- itx-groupsio-v2-artifact
8384
metadata:
8485
"*":
8586
# Setting the replication key allows conditional loads for
@@ -115,6 +116,8 @@ plugins:
115116
replication-key: last_modified_at
116117
itx-groupsio-v2-member:
117118
replication-key: last_modified_at
119+
itx-groupsio-v2-artifact:
120+
replication-key: last_modified_at
118121
use_aws_env_vars: true
119122
schema:
120123
# Override auto-detected schema for alternate columns and datatypes that

0 commit comments

Comments
 (0)