Skip to content

Commit f04f8d1

Browse files
Merge pull request #97 from PDOK/jd/download-list-var
Fix for missing download-list var
2 parents b6ead76 + e7e325a commit f04f8d1

File tree

13 files changed

+22
-20
lines changed

13 files changed

+22
-20
lines changed

internal/controller/blobdownload/gpkg_download.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,16 @@ function download_all() {
117117

118118
# Download all geopackages from GEOPACKAGE_DOWNLOAD_LIST
119119
# Example: GEOPACKAGE_DOWNLOAD_LIST=path/1/file.gpkg;path/3/other_file.gpkg
120-
gpkgs=(${GEOPACKAGE_DOWNLOAD_LIST//;/ })
121-
for gpkg_path in "${gpkgs[@]}"
122-
do
123-
filename=$(basename $gpkg_path)
124-
download $gpkg_path $filename
125-
done
126-
127-
echo msg=\"All GeoPackages downloaded\" total_time_seconds=$(expr $(date '+%s') - $start_time)
120+
if [ -n "$GEOPACKAGE_DOWNLOAD_LIST" ]; then
121+
gpkgs=(${GEOPACKAGE_DOWNLOAD_LIST//;/ })
122+
for gpkg_path in "${gpkgs[@]}"
123+
do
124+
filename=$(basename $gpkg_path)
125+
download $gpkg_path $filename
126+
done
127+
128+
echo msg=\"All GeoPackages downloaded\" total_time_seconds=$(expr $(date '+%s') - $start_time)
129+
fi
128130
}
129131

130132
function rm_file_and_exit() {

internal/controller/test_data/wfs/complete/expected/configmap-init-scripts.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ metadata:
179179
service-type: wfs
180180
service-version: v1_0
181181
theme: theme
182-
name: complete-wfs-init-scripts-fft29bbtdd
182+
name: complete-wfs-init-scripts-dcmbkf564h
183183
namespace: default
184184
ownerReferences:
185185
- apiVersion: pdok.nl/v3

internal/controller/test_data/wfs/complete/expected/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ spec:
258258
name: mapserver
259259
- configMap:
260260
defaultMode: 511
261-
name: complete-wfs-init-scripts-fft29bbtdd
261+
name: complete-wfs-init-scripts-dcmbkf564h
262262
name: init-scripts
263263
- configMap:
264264
name: complete-wfs-capabilities-generator-g7fh2dbt4m

internal/controller/test_data/wfs/minimal/expected/configmap-init-scripts.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
pdok.nl/inspire: 'false'
1212
service-type: wfs
1313
service-version: v1_0
14-
name: minimal-wfs-init-scripts-fft29bbtdd
14+
name: minimal-wfs-init-scripts-dcmbkf564h
1515
namespace: default
1616
ownerReferences:
1717
- apiVersion: pdok.nl/v3

internal/controller/test_data/wfs/minimal/expected/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ spec:
241241
name: mapserver
242242
- configMap:
243243
defaultMode: 511
244-
name: minimal-wfs-init-scripts-fft29bbtdd
244+
name: minimal-wfs-init-scripts-dcmbkf564h
245245
name: init-scripts
246246
- configMap:
247247
name: minimal-wfs-capabilities-generator-m46924mtk7

internal/controller/test_data/wms/complete/expected/configmap-init-scripts.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ metadata:
179179
service-type: wms
180180
service-version: v1_0
181181
theme: "2016"
182-
name: complete-wms-init-scripts-fft29bbtdd
182+
name: complete-wms-init-scripts-dcmbkf564h
183183
namespace: default
184184
ownerReferences:
185185
- apiVersion: pdok.nl/v3

internal/controller/test_data/wms/complete/expected/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ spec:
375375
name: ogc-webservice-proxy-config
376376
- configMap:
377377
defaultMode: 511
378-
name: complete-wms-init-scripts-fft29bbtdd
378+
name: complete-wms-init-scripts-dcmbkf564h
379379
name: init-scripts
380380
- configMap:
381381
name: complete-wms-capabilities-generator-ccc59c7dhm

internal/controller/test_data/wms/custom-mapfile/expected/configmap-init-scripts.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ metadata:
178178
pdok.nl/inspire: "false"
179179
service-type: wms
180180
service-version: v1_0
181-
name: custom-mapfile-wms-init-scripts-fft29bbtdd
181+
name: custom-mapfile-wms-init-scripts-dcmbkf564h
182182
namespace: default
183183
ownerReferences:
184184
- apiVersion: pdok.nl/v3

internal/controller/test_data/wms/custom-mapfile/expected/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ spec:
325325
name: ogc-webservice-proxy-config
326326
- configMap:
327327
defaultMode: 511
328-
name: custom-mapfile-wms-init-scripts-fft29bbtdd
328+
name: custom-mapfile-wms-init-scripts-dcmbkf564h
329329
name: init-scripts
330330
- configMap:
331331
name: custom-mapfile-wms-capabilities-generator-fbhc96kd2b

internal/controller/test_data/wms/minimal/expected/configmap-init-scripts.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ metadata:
178178
pdok.nl/inspire: "false"
179179
service-type: wms
180180
service-version: v1_0
181-
name: minimal-wms-init-scripts-fft29bbtdd
181+
name: minimal-wms-init-scripts-dcmbkf564h
182182
namespace: default
183183
ownerReferences:
184184
- apiVersion: pdok.nl/v3

0 commit comments

Comments
 (0)