fix: using a more simplified template pattern

jfavellar90 · jfavellar90 · commit f566b4981623 · 2024-07-05T16:39:42.000-05:00
diff --git a/drydock/patches/caddyfile b/drydock/patches/caddyfile
@@ -32,8 +32,8 @@
     }
     route @scorm_matcher {
         uri /scorm-proxy/* strip_prefix /scorm-proxy
-        reverse_proxy https://{{ S3_STORAGE_BUCKET }}.{{ S3_HOST|default('s3.amazonaws.com', true) }} {
-            header_up Host {{ S3_STORAGE_BUCKET }}.{{ S3_HOST|default('s3.amazonaws.com', true) }}
+        reverse_proxy https://{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }} {
+            header_up Host {{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }}
         }
     }
     {% endif %}
diff --git a/drydock/patches/caddyfile-cms b/drydock/patches/caddyfile-cms
@@ -14,8 +14,8 @@ route @scorm_matcher {
 }
 route @scorm_matcher {
     uri /scorm-proxy/* strip_prefix /scorm-proxy
-    reverse_proxy https://{{ S3_STORAGE_BUCKET }}.{{ S3_HOST|default('s3.amazonaws.com', true) }} {
-        header_up Host {{ S3_STORAGE_BUCKET }}.{{ S3_HOST|default('s3.amazonaws.com', true) }}
+    reverse_proxy https://{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }} {
+        header_up Host {{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }}
     }
 }
 {% endif %}
diff --git a/drydock/patches/caddyfile-lms b/drydock/patches/caddyfile-lms
@@ -14,8 +14,8 @@ route @scorm_matcher {
 }
 route @scorm_matcher {
     uri /scorm-proxy/* strip_prefix /scorm-proxy
-    reverse_proxy https://{{ S3_STORAGE_BUCKET }}.{{ S3_HOST|default('s3.amazonaws.com', true) }} {
-        header_up Host {{ S3_STORAGE_BUCKET }}.{{ S3_HOST|default('s3.amazonaws.com', true) }}
+    reverse_proxy https://{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }} {
+        header_up Host {{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }}
     }
 }
 {% endif %}
diff --git a/drydock/templates/drydock/k8s/ingress/cms.yml b/drydock/templates/drydock/k8s/ingress/cms.yml
@@ -14,7 +14,7 @@ metadata:
         proxy_http_version     1.1;
         proxy_set_header       Connection "";
         proxy_set_header       Authorization '';
-        proxy_set_header       Host {% if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.{{ S3_HOST|default('s3.amazonaws.com', true) }}{%- endif %};
+        proxy_set_header       Host {% if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }}{%- endif %};
         proxy_hide_header      x-amz-id-2;
         proxy_hide_header      x-amz-request-id;
         proxy_hide_header      x-amz-meta-server-side-encryption;
@@ -24,7 +24,7 @@ metadata:
         proxy_intercept_errors on;
         add_header             Cache-Control max-age=31536000;
         rewrite /scorm-proxy(.*) $1 break;
-        proxy_pass https://{%- if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.{{ S3_HOST|default('s3.amazonaws.com', true) }}{%- endif %};
+        proxy_pass https://{%- if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }}{%- endif %};
       }
   {%- endif %}
 spec:
diff --git a/drydock/templates/drydock/k8s/ingress/lms.yml b/drydock/templates/drydock/k8s/ingress/lms.yml
@@ -14,7 +14,7 @@ metadata:
         proxy_http_version     1.1;
         proxy_set_header       Connection "";
         proxy_set_header       Authorization '';
-        proxy_set_header       Host {% if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.{{ S3_HOST|default('s3.amazonaws.com', true) }}{%- endif %};
+        proxy_set_header       Host {% if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }}{%- endif %};
         proxy_hide_header      x-amz-id-2;
         proxy_hide_header      x-amz-request-id;
         proxy_hide_header      x-amz-meta-server-side-encryption;
@@ -24,7 +24,7 @@ metadata:
         proxy_intercept_errors on;
         add_header             Cache-Control max-age=31536000;
         rewrite /scorm-proxy(.*) $1 break;
-        proxy_pass https://{%- if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.{{ S3_HOST|default('s3.amazonaws.com', true) }}{%- endif %};
+        proxy_pass https://{%- if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }}{%- endif %};
       }
   {%- endif %}
 spec:

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@`
`32`	`32`	`}`
`33`	`33`	`route @scorm_matcher {`
`34`	`34`	`uri /scorm-proxy/* strip_prefix /scorm-proxy`
`35`		`- reverse_proxy https://{{ S3_STORAGE_BUCKET }}.{{ S3_HOST\|default('s3.amazonaws.com', true) }} {`
`36`		`- header_up Host {{ S3_STORAGE_BUCKET }}.{{ S3_HOST\|default('s3.amazonaws.com', true) }}`
	`35`	`+ reverse_proxy https://{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }} {`
	`36`	`+ header_up Host {{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }}`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`{% endif %}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ route @scorm_matcher {`
`14`	`14`	`}`
`15`	`15`	`route @scorm_matcher {`
`16`	`16`	`uri /scorm-proxy/* strip_prefix /scorm-proxy`
`17`		`- reverse_proxy https://{{ S3_STORAGE_BUCKET }}.{{ S3_HOST\|default('s3.amazonaws.com', true) }} {`
`18`		`- header_up Host {{ S3_STORAGE_BUCKET }}.{{ S3_HOST\|default('s3.amazonaws.com', true) }}`
	`17`	`+ reverse_proxy https://{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }} {`
	`18`	`+ header_up Host {{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }}`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`{% endif %}`