Skip to content

Commit 0bb2c59

Browse files
pataripatari
authored
Merge pull request #1869 from Tampere/dependabot/submodules/evaka-3efd9ce
Bump evaka from `6145c1c` to `3efd9ce`
2 parents b81e848 + 98c0eec commit 0bb2c59

File tree

7 files changed

+98
-33
lines changed

7 files changed

+98
-33
lines changed

‎docker-compose.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ services:
5050
volumes:
5151
- ./evaka/compose/sftp/ssh_host_ed25519_key:/etc/ssh/ssh_host_ed25519_key
5252
- ./evaka/compose/sftp/ssh_host_rsa_key:/etc/ssh/ssh_host_rsa_key
53+
- ./evaka/compose/sftp/id_ed25519.pub:/home/foo/.ssh/keys/id_ed25519.pub
5354
command: foo:pass:::upload
5455

5556
dummy-idp:

‎evaka‎

Submodule evaka updated 27 files

‎infra/deploy/evaka-service.tf‎

Lines changed: 47 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -134,34 +134,49 @@ module "app_service" {
134134
HAMEENKYRO_BUCKET_EXPORT = var.municipality == "hameenkyro" ? "${local.param_prefix}/service/bucket/export" : null
135135

136136
# NokiaProperties
137-
NOKIA_IPAAS_USERNAME = var.municipality == "nokia" ? "${local.param_prefix}/service/ipaas/username" : null
138-
NOKIA_IPAAS_PASSWORD = var.municipality == "nokia" ? "${local.param_prefix}/service/ipaas/password" : null
139-
NOKIA_INVOICE_SFTP_HOST = var.municipality == "nokia" && var.nokia_invoice_version == "V2026" ? "${local.param_prefix}/service/invoice/sftp/host" : null
140-
NOKIA_INVOICE_SFTP_PORT = var.municipality == "nokia" && var.nokia_invoice_version == "V2026" ? "${local.param_prefix}/service/invoice/sftp/port" : null
141-
NOKIA_INVOICE_SFTP_HOST_KEYS = var.municipality == "nokia" && var.nokia_invoice_version == "V2026" ? "${local.param_prefix}/service/invoice/sftp/host-keys" : null
142-
NOKIA_INVOICE_SFTP_USERNAME = var.municipality == "nokia" && var.nokia_invoice_version == "V2026" ? "${local.param_prefix}/service/invoice/sftp/username" : null
143-
NOKIA_INVOICE_SFTP_PASSWORD = var.municipality == "nokia" && var.nokia_invoice_version == "V2026" ? "${local.param_prefix}/service/invoice/sftp/password" : null
144-
NOKIA_BUCKET_EXPORT = var.municipality == "nokia" ? "${local.param_prefix}/service/bucket/export" : null
137+
NOKIA_IPAAS_USERNAME = var.municipality == "nokia" ? "${local.param_prefix}/service/ipaas/username" : null
138+
NOKIA_IPAAS_PASSWORD = var.municipality == "nokia" ? "${local.param_prefix}/service/ipaas/password" : null
139+
NOKIA_INVOICE_SFTP_HOST = var.municipality == "nokia" && var.nokia_invoice_version == "V2026" ? "${local.param_prefix}/service/frends/sftp/host" : null
140+
NOKIA_INVOICE_SFTP_PORT = var.municipality == "nokia" && var.nokia_invoice_version == "V2026" ? "${local.param_prefix}/service/frends/sftp/port" : null
141+
NOKIA_INVOICE_SFTP_HOST_KEYS = var.municipality == "nokia" && var.nokia_invoice_version == "V2026" ? "${local.param_prefix}/service/frends/sftp/host-keys" : null
142+
NOKIA_INVOICE_SFTP_USERNAME = var.municipality == "nokia" && var.nokia_invoice_version == "V2026" ? "${local.param_prefix}/service/frends/sftp/username" : null
143+
NOKIA_INVOICE_SFTP_PRIVATE_KEY = var.municipality == "nokia" && var.nokia_invoice_version == "V2026" ? "${local.param_prefix}/service/frends/sftp/private-key" : null
144+
NOKIA_BUCKET_EXPORT = var.municipality == "nokia" ? "${local.param_prefix}/service/bucket/export" : null
145+
NOKIA_ARCHIVAL_SFTP_HOST = var.municipality == "nokia" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/host" : null
146+
NOKIA_ARCHIVAL_SFTP_PORT = var.municipality == "nokia" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/port" : null
147+
NOKIA_ARCHIVAL_SFTP_HOST_KEYS = var.municipality == "nokia" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/host-keys" : null
148+
NOKIA_ARCHIVAL_SFTP_USERNAME = var.municipality == "nokia" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/username" : null
149+
NOKIA_ARCHIVAL_SFTP_PRIVATE_KEY = var.municipality == "nokia" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/private-key" : null
145150

146151
# YlojarviProperties
147-
YLOJARVI_IPAAS_USERNAME = var.municipality == "ylojarvi" ? "${local.param_prefix}/service/ipaas/username" : null
148-
YLOJARVI_IPAAS_PASSWORD = var.municipality == "ylojarvi" ? "${local.param_prefix}/service/ipaas/password" : null
149-
YLOJARVI_INVOICE_SFTP_HOST = var.municipality == "ylojarvi" && var.ylojarvi_invoice_version == "V2026" ? "${local.param_prefix}/service/invoice/sftp/host" : null
150-
YLOJARVI_INVOICE_SFTP_PORT = var.municipality == "ylojarvi" && var.ylojarvi_invoice_version == "V2026" ? "${local.param_prefix}/service/invoice/sftp/port" : null
151-
YLOJARVI_INVOICE_SFTP_HOST_KEYS = var.municipality == "ylojarvi" && var.ylojarvi_invoice_version == "V2026" ? "${local.param_prefix}/service/invoice/sftp/host-keys" : null
152-
YLOJARVI_INVOICE_SFTP_USERNAME = var.municipality == "ylojarvi" && var.ylojarvi_invoice_version == "V2026" ? "${local.param_prefix}/service/invoice/sftp/username" : null
153-
YLOJARVI_INVOICE_SFTP_PASSWORD = var.municipality == "ylojarvi" && var.ylojarvi_invoice_version == "V2026" ? "${local.param_prefix}/service/invoice/sftp/password" : null
154-
YLOJARVI_BUCKET_EXPORT = var.municipality == "ylojarvi" ? "${local.param_prefix}/service/bucket/export" : null
152+
YLOJARVI_IPAAS_USERNAME = var.municipality == "ylojarvi" ? "${local.param_prefix}/service/ipaas/username" : null
153+
YLOJARVI_IPAAS_PASSWORD = var.municipality == "ylojarvi" ? "${local.param_prefix}/service/ipaas/password" : null
154+
YLOJARVI_INVOICE_SFTP_HOST = var.municipality == "ylojarvi" && var.ylojarvi_invoice_version == "V2026" ? "${local.param_prefix}/service/frends/sftp/host" : null
155+
YLOJARVI_INVOICE_SFTP_PORT = var.municipality == "ylojarvi" && var.ylojarvi_invoice_version == "V2026" ? "${local.param_prefix}/service/frends/sftp/port" : null
156+
YLOJARVI_INVOICE_SFTP_HOST_KEYS = var.municipality == "ylojarvi" && var.ylojarvi_invoice_version == "V2026" ? "${local.param_prefix}/service/frends/sftp/host-keys" : null
157+
YLOJARVI_INVOICE_SFTP_USERNAME = var.municipality == "ylojarvi" && var.ylojarvi_invoice_version == "V2026" ? "${local.param_prefix}/service/frends/sftp/username" : null
158+
YLOJARVI_INVOICE_SFTP_PRIVATE_KEY = var.municipality == "ylojarvi" && var.ylojarvi_invoice_version == "V2026" ? "${local.param_prefix}/service/frends/sftp/private-key" : null
159+
YLOJARVI_BUCKET_EXPORT = var.municipality == "ylojarvi" ? "${local.param_prefix}/service/bucket/export" : null
155160

156161
# PirkkalaProperties
157-
PIRKKALA_IPAAS_USERNAME = var.municipality == "pirkkala" ? "${local.param_prefix}/service/ipaas/username" : null
158-
PIRKKALA_IPAAS_PASSWORD = var.municipality == "pirkkala" ? "${local.param_prefix}/service/ipaas/password" : null
159-
PIRKKALA_BUCKET_EXPORT = var.municipality == "pirkkala" ? "${local.param_prefix}/service/bucket/export" : null
162+
PIRKKALA_IPAAS_USERNAME = var.municipality == "pirkkala" ? "${local.param_prefix}/service/ipaas/username" : null
163+
PIRKKALA_IPAAS_PASSWORD = var.municipality == "pirkkala" ? "${local.param_prefix}/service/ipaas/password" : null
164+
PIRKKALA_BUCKET_EXPORT = var.municipality == "pirkkala" ? "${local.param_prefix}/service/bucket/export" : null
165+
PIRKKALA_ARCHIVAL_SFTP_HOST = var.municipality == "pirkkala" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/host" : null
166+
PIRKKALA_ARCHIVAL_SFTP_PORT = var.municipality == "pirkkala" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/port" : null
167+
PIRKKALA_ARCHIVAL_SFTP_HOST_KEYS = var.municipality == "pirkkala" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/host-keys" : null
168+
PIRKKALA_ARCHIVAL_SFTP_USERNAME = var.municipality == "pirkkala" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/username" : null
169+
PIRKKALA_ARCHIVAL_SFTP_PRIVATE_KEY = var.municipality == "pirkkala" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/private-key" : null
160170

161171
# KangasalaProperties
162-
KANGASALA_IPAAS_USERNAME = var.municipality == "kangasala" ? "${local.param_prefix}/service/ipaas/username" : null
163-
KANGASALA_IPAAS_PASSWORD = var.municipality == "kangasala" ? "${local.param_prefix}/service/ipaas/password" : null
164-
KANGASALA_BUCKET_EXPORT = var.municipality == "kangasala" ? "${local.param_prefix}/service/bucket/export" : null
172+
KANGASALA_IPAAS_USERNAME = var.municipality == "kangasala" ? "${local.param_prefix}/service/ipaas/username" : null
173+
KANGASALA_IPAAS_PASSWORD = var.municipality == "kangasala" ? "${local.param_prefix}/service/ipaas/password" : null
174+
KANGASALA_BUCKET_EXPORT = var.municipality == "kangasala" ? "${local.param_prefix}/service/bucket/export" : null
175+
KANGASALA_ARCHIVAL_SFTP_HOST = var.municipality == "kangasala" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/host" : null
176+
KANGASALA_ARCHIVAL_SFTP_PORT = var.municipality == "kangasala" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/port" : null
177+
KANGASALA_ARCHIVAL_SFTP_HOST_KEYS = var.municipality == "kangasala" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/host-keys" : null
178+
KANGASALA_ARCHIVAL_SFTP_USERNAME = var.municipality == "kangasala" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/username" : null
179+
KANGASALA_ARCHIVAL_SFTP_PRIVATE_KEY = var.municipality == "kangasala" && var.archival_enabled ? "${local.param_prefix}/service/frends/sftp/private-key" : null
165180

166181
# LempaalaProperties
167182
LEMPAALA_IPAAS_USERNAME = var.municipality == "lempaala" ? "${local.param_prefix}/service/ipaas/username" : null
@@ -308,12 +323,19 @@ module "app_service" {
308323
TAMPERE_ENABLED_FEATURES_FRENDS_PAYMENT = var.municipality == "tampere" ? var.tampere_frends_payment : null
309324

310325
# NokiaProperties
311-
NOKIA_INVOICE_VERSION = var.municipality == "nokia" ? var.nokia_invoice_version : null
312-
NOKIA_INVOICE_SFTP_PREFIX = var.municipality == "nokia" && var.nokia_invoice_version == "V2026" ? "invoices/" : null
326+
NOKIA_INVOICE_VERSION = var.municipality == "nokia" ? var.nokia_invoice_version : null
327+
NOKIA_INVOICE_SFTP_PREFIX = var.municipality == "nokia" && var.nokia_invoice_version == "V2026" ? var.environment == "prod" ? "in/eVaka/Raindance/" : "test/in/eVaka/Raindance/" : null
328+
NOKIA_ARCHIVAL_SFTP_PREFIX = var.municipality == "nokia" && var.archival_enabled ? var.environment == "prod" ? "in/eVaka/TWeb/" : "test/in/eVaka/TWeb/" : null
313329

314330
# YlojarviProperties
315331
YLOJARVI_INVOICE_VERSION = var.municipality == "ylojarvi" ? var.ylojarvi_invoice_version : null
316-
YLOJARVI_INVOICE_SFTP_PREFIX = var.municipality == "ylojarvi" && var.nokia_invoice_version == "V2026" ? "invoices/" : null
332+
YLOJARVI_INVOICE_SFTP_PREFIX = var.municipality == "ylojarvi" && var.ylojarvi_invoice_version == "V2026" ? var.environment == "prod" ? "in/eVaka/Raindance/" : "test/in/eVaka/Raindance/" : null
333+
334+
# PirkkalaProperties
335+
PIRKKALA_ARCHIVAL_SFTP_PREFIX = var.municipality == "pirkkala" && var.archival_enabled ? var.environment == "prod" ? "in/eVaka/TWeb/" : "test/in/eVaka/TWeb/" : null
336+
337+
# KangasalaProperties
338+
KANGASALA_ARCHIVAL_SFTP_PREFIX = var.municipality == "kangasala" && var.archival_enabled ? var.environment == "prod" ? "in/eVaka/TWeb/" : "test/in/eVaka/TWeb/" : null
317339
}
318340
}
319341

‎infra/parameter-store.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ environments=(
2525
parameters=(
2626
"/service/vtj/kysely/api-key"
2727
"/service/vtj/mutpa/api-key"
28+
"/service/frends/sftp/host"
29+
"/service/frends/sftp/port"
30+
"/service/frends/sftp/host-keys"
31+
"/service/frends/sftp/username"
32+
# "/service/frends/sftp/private-key"
2833
)
2934

3035
if [ "$#" -ne 3 ]; then

‎service/src/main/kotlin/trevaka/sftp/SftpProperties.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ data class SftpProperties(
1212
val port: Int,
1313
val hostKeys: List<String>,
1414
val username: String,
15-
val password: String,
15+
val password: String?,
16+
val privateKey: String?,
1617
val prefix: String,
1718
) {
1819
fun toSftpEnv(): SftpEnv = SftpEnv(
1920
host = host,
2021
port = port,
2122
username = username,
22-
password = Sensitive(password),
23+
password = password?.let { Sensitive(it) },
24+
privateKey = privateKey?.let { Sensitive(it) },
2325
hostKeys = hostKeys,
2426
)
2527
}

‎service/src/main/resources/application-trevaka-local.yaml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,14 @@ ylojarvi:
9191
port: 2222
9292
host_keys: AAAAC3NzaC1lZDI1NTE5AAAAICADdlntyAKbOUGQDkdzdhQBu12jZjb0KmxLyrklMXTq
9393
username: foo
94-
password: pass
94+
private-key: |
95+
-----BEGIN OPENSSH PRIVATE KEY-----
96+
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
97+
QyNTUxOQAAACBKQkRdkXMfuHv/1PWMJ6Thchv2PeE+uEkUbbpf+ce/mQAAAJjUgHxz1IB8
98+
cwAAAAtzc2gtZWQyNTUxOQAAACBKQkRdkXMfuHv/1PWMJ6Thchv2PeE+uEkUbbpf+ce/mQ
99+
AAAEBOKiwR898c7d20IF4F4O6++awDPFfhoeDlH+t09hwEw0pCRF2Rcx+4e//U9YwnpOFy
100+
G/Y94T64SRRtul/5x7+ZAAAADmV2YWthX2xvY2FsL2l0AQIDBAUGBw==
101+
-----END OPENSSH PRIVATE KEY-----
95102
prefix: upload/
96103
bucket:
97104
export: trevaka-export-dev
@@ -111,7 +118,14 @@ nokia:
111118
port: 2222
112119
host_keys: AAAAC3NzaC1lZDI1NTE5AAAAICADdlntyAKbOUGQDkdzdhQBu12jZjb0KmxLyrklMXTq
113120
username: foo
114-
password: pass
121+
private-key: |
122+
-----BEGIN OPENSSH PRIVATE KEY-----
123+
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
124+
QyNTUxOQAAACBKQkRdkXMfuHv/1PWMJ6Thchv2PeE+uEkUbbpf+ce/mQAAAJjUgHxz1IB8
125+
cwAAAAtzc2gtZWQyNTUxOQAAACBKQkRdkXMfuHv/1PWMJ6Thchv2PeE+uEkUbbpf+ce/mQ
126+
AAAEBOKiwR898c7d20IF4F4O6++awDPFfhoeDlH+t09hwEw0pCRF2Rcx+4e//U9YwnpOFy
127+
G/Y94T64SRRtul/5x7+ZAAAADmV2YWthX2xvY2FsL2l0AQIDBAUGBw==
128+
-----END OPENSSH PRIVATE KEY-----
115129
prefix: upload/
116130
bucket:
117131
export: trevaka-export-dev

‎service/src/test/resources/application-integration-test.yml‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,14 @@ ylojarvi:
103103
port: 2222
104104
host_keys: AAAAC3NzaC1lZDI1NTE5AAAAICADdlntyAKbOUGQDkdzdhQBu12jZjb0KmxLyrklMXTq
105105
username: foo
106-
password: pass
106+
private-key: |
107+
-----BEGIN OPENSSH PRIVATE KEY-----
108+
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
109+
QyNTUxOQAAACBKQkRdkXMfuHv/1PWMJ6Thchv2PeE+uEkUbbpf+ce/mQAAAJjUgHxz1IB8
110+
cwAAAAtzc2gtZWQyNTUxOQAAACBKQkRdkXMfuHv/1PWMJ6Thchv2PeE+uEkUbbpf+ce/mQ
111+
AAAEBOKiwR898c7d20IF4F4O6++awDPFfhoeDlH+t09hwEw0pCRF2Rcx+4e//U9YwnpOFy
112+
G/Y94T64SRRtul/5x7+ZAAAADmV2YWthX2xvY2FsL2l0AQIDBAUGBw==
113+
-----END OPENSSH PRIVATE KEY-----
107114
prefix: upload/
108115
bucket:
109116
export: trevaka-export-it
@@ -123,7 +130,14 @@ nokia:
123130
port: 2222
124131
host_keys: AAAAC3NzaC1lZDI1NTE5AAAAICADdlntyAKbOUGQDkdzdhQBu12jZjb0KmxLyrklMXTq
125132
username: foo
126-
password: pass
133+
private-key: |
134+
-----BEGIN OPENSSH PRIVATE KEY-----
135+
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
136+
QyNTUxOQAAACBKQkRdkXMfuHv/1PWMJ6Thchv2PeE+uEkUbbpf+ce/mQAAAJjUgHxz1IB8
137+
cwAAAAtzc2gtZWQyNTUxOQAAACBKQkRdkXMfuHv/1PWMJ6Thchv2PeE+uEkUbbpf+ce/mQ
138+
AAAEBOKiwR898c7d20IF4F4O6++awDPFfhoeDlH+t09hwEw0pCRF2Rcx+4e//U9YwnpOFy
139+
G/Y94T64SRRtul/5x7+ZAAAADmV2YWthX2xvY2FsL2l0AQIDBAUGBw==
140+
-----END OPENSSH PRIVATE KEY-----
127141
prefix: upload/
128142
bucket:
129143
export: trevaka-export-it
@@ -133,7 +147,14 @@ nokia:
133147
port: 2222
134148
host_keys: AAAAC3NzaC1lZDI1NTE5AAAAICADdlntyAKbOUGQDkdzdhQBu12jZjb0KmxLyrklMXTq
135149
username: foo
136-
password: pass
150+
private-key: |
151+
-----BEGIN OPENSSH PRIVATE KEY-----
152+
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
153+
QyNTUxOQAAACBKQkRdkXMfuHv/1PWMJ6Thchv2PeE+uEkUbbpf+ce/mQAAAJjUgHxz1IB8
154+
cwAAAAtzc2gtZWQyNTUxOQAAACBKQkRdkXMfuHv/1PWMJ6Thchv2PeE+uEkUbbpf+ce/mQ
155+
AAAEBOKiwR898c7d20IF4F4O6++awDPFfhoeDlH+t09hwEw0pCRF2Rcx+4e//U9YwnpOFy
156+
G/Y94T64SRRtul/5x7+ZAAAADmV2YWthX2xvY2FsL2l0AQIDBAUGBw==
157+
-----END OPENSSH PRIVATE KEY-----
137158
prefix: upload/
138159
kangasala:
139160
ipaas:

0 commit comments

Comments
 (0)