Skip to content

Commit 9d1aea1

Browse files
authored
Merge pull request #636 from CodeForPhilly/move_phone_stdize_pem
Move phone_stdize, add pem file 2.63
2 parents 57a85fb + ed64380 commit 9d1aea1

File tree

4 files changed

+15
-23
lines changed

4 files changed

+15
-23
lines changed

src/helm-chart/templates/cronjob.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/helm-chart/templates/deployment.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ spec:
3535
- name: {{ .Release.Name }}-server-data
3636
persistentVolumeClaim:
3737
claimName: {{ .Release.Name }}-server-data
38+
- name: {{ .Release.Name }}-pem
39+
secret:
40+
secretName: paws-salesforce
41+
items:
42+
- key: PEM_FILE
43+
path: connected-app-secrets.pem
3844
serviceAccountName: {{ include "helm-chart.serviceAccountName" . }}
3945
securityContext:
4046
{{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -74,6 +80,8 @@ spec:
7480
- name: {{ $.Release.Name }}-server-data
7581
mountPath: /var/lib/server/data
7682
subPath: server-data
83+
- name: {{ $.Release.Name }}-pem
84+
mountPath: /app/pem/
7785
livenessProbe:
7886
httpGet:
7987
path: /api/user/test

src/helm-chart/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ server:
99
repository: ghcr.io/codeforphilly/paws-data-pipeline/server
1010
pullPolicy: Always
1111
# Overrides the image tag whose default is the chart appVersion.
12-
tag: "2.62"
12+
tag: "2.63"
1313

1414
client:
1515
image:
1616
repository: ghcr.io/codeforphilly/paws-data-pipeline/client
1717
pullPolicy: Always
1818
# Overrides the image tag whose default is the chart appVersion.
19-
tag: "2.62"
19+
tag: "2.63"
2020

2121
db:
2222
image:

src/server/volgistics_importer.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,14 @@ def volgistics_people_import(workbook):
178178
col_email = col['Email']
179179
time_stamp = datetime.utcnow()
180180

181-
home_phone = standardize_phone_number(r[col_home])
182-
work_phone = standardize_phone_number(r[col_work])
183-
cell_phone = standardize_phone_number(r[col_cell])
184181

185182
try:
186183
for r in ws.iter_rows(min_row=2, max_col=42,values_only=True):
184+
185+
home_phone = standardize_phone_number(r[col_home])
186+
work_phone = standardize_phone_number(r[col_work])
187+
cell_phone = standardize_phone_number(r[col_cell])
188+
187189
insert_list.append(
188190
{
189191
"number": r[col_number],

0 commit comments

Comments
 (0)