Skip to content

Commit fd6240f

Browse files
committed
feat: read restore details and notify
1 parent 310bb0e commit fd6240f

1 file changed

Lines changed: 17 additions & 27 deletions

File tree

workflows/storage/check-restore-copy.yaml

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -125,55 +125,45 @@ spec:
125125
value: 's3://linz-bucket-config/config-write.topographic.json,s3://linz-bucket-config/config-write.hydrographic.json'
126126
withParam: '{{steps.read-copy-manifest.outputs.parameters.content}}'
127127
when: '{{steps.read-copy-manifest.status}} == Succeeded'
128-
- - name: read-restore-location
128+
- - name: read-restore-details
129129
templateRef:
130130
name: tpl-read-file
131131
template: main
132132
arguments:
133133
parameters:
134134
- name: location
135-
value: "{{= sprig.replace('manifest.json', 'restore-location', inputs.parameters.restore_manifest)}}"
136-
when: '{{steps.copy-restored-files.status}} == Succeeded'
137-
hooks:
138-
exit:
139-
template: notification
140-
arguments:
141-
parameters:
142-
- name: restore_location
143-
value: '{{steps.read-restore-location.outputs.parameters.content}}'
144-
135+
value: "{{= sprig.replace('manifest.json', 'restore-details', inputs.parameters.restore_manifest)}}"
136+
when: '{{steps.verify-restore.status}} == Succeeded'
137+
- - name: notification
138+
template: notification
139+
arguments:
140+
parameters:
141+
- name: custom_parameters
142+
value: '{{steps.read-restore-details.outputs.parameters.content}}'
143+
- name: msg
144+
value: 'UnarchiveCopy:Done'
145+
- name: version_argo_tasks
146+
value: 'v4'
147+
when: '{{steps.copy-restored-files.status}} == Succeeded && {{steps.read-restore-details.status}} == Succeeded'
145148
- name: notification
146149
inputs:
147150
parameters:
148-
- name: workflow_parameters
149-
value: '{{workflow.parameters}}'
151+
- name: custom_parameters
150152
- name: msg
151-
value: 'UnarchiveCopy:Done'
152153
- name: version_argo_tasks
153-
value: 'v4'
154-
- name: restore_location
155-
default: ''
156154
script:
157155
image: '019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(inputs.parameters.version_argo_tasks)}}'
158156
imagePullPolicy: Always
159157
command: [node]
160158
source: |
161-
let inputParameters = {{= toJson(inputs.parameters) }};
162-
const workflowParamsObj = Object.fromEntries(
163-
JSON.parse(inputParameters.workflow_parameters).map((pair) => [pair.name, pair.value]),
164-
);
165-
const mergedParameters = {
166-
...inputParameters,
167-
...workflowParamsObj,
168-
};
169-
delete mergedParameters.workflow_parameters;
159+
const customParams = JSON.parse('{{inputs.parameters.custom_parameters}}');
170160
console.log(
171161
JSON.stringify({
172162
time: Date.now(),
173163
level: 20,
174164
pid: 1,
175165
msg: '{{inputs.parameters.msg}}',
176-
parameters: mergedParameters,
166+
parameters: customParams,
177167
}),
178168
);
179169

0 commit comments

Comments
 (0)