Skip to content

Commit 33f8cc7

Browse files
committed
pipeline(bosh|precompile): force usage of s3 path style
Included in s3-resource [v2.1.0](https://github.com/concourse/s3-resource/releases/tag/v2.1.0) with [Add use_path_style option for legacy S3 access in PR 183](concourse/s3-resource#183)
1 parent 8cc337a commit 33f8cc7

7 files changed

Lines changed: 14 additions & 0 deletions

File tree

concourse/pipelines/template/bosh-pipeline.yml.erb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ resources:
184184
endpoint: ((s3-stemcell-endpoint))
185185
skip_ssl_verification: ((s3-stemcell-skip-ssl-verification))
186186
skip_download: true
187+
use_path_style: true
187188
version: { path: ((stemcell-name-prefix))((stemcell-main-name))/bosh-stemcell-((stemcell.version))-((stemcell-main-name)).tgz }
188189
<% else %>
189190
type: bosh-io-stemcell
@@ -300,6 +301,7 @@ resources:
300301
endpoint: ((s3-<%= precompile_pipeline_enabled ? "compiled-release" : "br" %>-endpoint))
301302
skip_ssl_verification: ((s3-<%= precompile_pipeline_enabled ? "compiled-release" : "br" %>-skip-ssl-verification))
302303
skip_download: true
304+
use_path_style: true
303305
version: { path: <%= info['repository']&.split('/')&.first %>/<%= release %>-((releases.<%= release %>.version))<%= precompile_pipeline_enabled ? "-((s3-compiled-release-os))-((stemcell.version))" : "" %>.tgz }
304306

305307
<% else %>

concourse/pipelines/template/bosh-precompile-pipeline.yml.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ resources:
161161
secret_access_key: ((s3-stemcell-secret-key))
162162
endpoint: ((s3-stemcell-endpoint))
163163
skip_ssl_verification: ((s3-stemcell-skip-ssl-verification))
164+
use_path_style: true
164165
version: { path: ((stemcell-name-prefix))((stemcell-main-name))/bosh-stemcell-((stemcell.version))-((stemcell-main-name)).tgz }
165166
<% else %>
166167
type: bosh-io-stemcell
@@ -212,6 +213,7 @@ resources:
212213
secret_access_key: ((s3-br-secret-key))
213214
endpoint: ((s3-br-endpoint))
214215
skip_ssl_verification: ((s3-br-skip-ssl-verification))
216+
use_path_style: true
215217
version: { path: <%= info['repository']&.split('/')&.first %>/<%= release %>-((releases.<%= release %>.version)).tgz }
216218
<% else %>
217219
type: git
@@ -236,6 +238,7 @@ resources:
236238
secret_access_key: ((s3-compiled-release-secret-key))
237239
endpoint: ((s3-compiled-release-endpoint))
238240
skip_ssl_verification: ((s3-compiled-release-skip-ssl-verification))
241+
use_path_style: true
239242
version: { path: <%= info['repository']&.split('/')&.first %>/<%= release %>-((releases.<%= release %>.version))-((s3-compiled-release-os))-((stemcell.version)).tgz }
240243
<% end %>
241244

spec/lib/template_processor/template_processor_for_bosh_pipeline_spec.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@
481481
endpoint: ((s3-compiled-release-endpoint))
482482
skip_ssl_verification: ((s3-compiled-release-skip-ssl-verification))
483483
skip_download: true
484+
use_path_style: true
484485
version:
485486
path: "#{br_repo}/#{br_name}-((releases.#{br_name}.version))-((s3-compiled-release-os))-((stemcell.version)).tgz"
486487
YAML
@@ -576,6 +577,7 @@
576577
endpoint: ((s3-br-endpoint))
577578
skip_ssl_verification: ((s3-br-skip-ssl-verification))
578579
skip_download: true
580+
use_path_style: true
579581
version:
580582
path: "#{br_repo}/#{br_name}-((releases.#{br_name}.version)).tgz"
581583
YAML
@@ -612,6 +614,7 @@
612614
secret_access_key: ((s3-stemcell-secret-key))
613615
skip_download: true
614616
skip_ssl_verification: ((s3-stemcell-skip-ssl-verification))
617+
use_path_style: true
615618
version:
616619
path: ((stemcell-name-prefix))((stemcell-main-name))/bosh-stemcell-((stemcell.version))-((stemcell-main-name)).tgz
617620
YAML

spec/lib/template_processor/template_processor_for_bosh_precompile_pipeline_spec.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@
297297
secret_access_key: ((s3-compiled-release-secret-key))
298298
endpoint: ((s3-compiled-release-endpoint))
299299
skip_ssl_verification: ((s3-compiled-release-skip-ssl-verification))
300+
use_path_style: true
300301
version:
301302
path: "#{br_repo}/#{br_name}-((releases.#{br_name}.version))-((s3-compiled-release-os))-((stemcell.version)).tgz"
302303
YAML
@@ -317,6 +318,7 @@
317318
secret_access_key: ((s3-br-secret-key))
318319
endpoint: ((s3-br-endpoint))
319320
skip_ssl_verification: ((s3-br-skip-ssl-verification))
321+
use_path_style: true
320322
version:
321323
path: "#{br_repo}/#{br_name}-((releases.#{br_name}.version)).tgz"
322324
YAML
@@ -423,6 +425,7 @@
423425
region_name: ((s3-stemcell-region-name))
424426
secret_access_key: ((s3-stemcell-secret-key))
425427
skip_ssl_verification: ((s3-stemcell-skip-ssl-verification))
428+
use_path_style: true
426429
version:
427430
path: ((stemcell-name-prefix))((stemcell-main-name))/bosh-stemcell-((stemcell.version))-((stemcell-main-name)).tgz
428431
YAML

spec/scripts/generate-depls/fixtures/references/empty-bosh-precompile.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ resources:
7171
secret_access_key: ((s3-stemcell-secret-key))
7272
endpoint: ((s3-stemcell-endpoint))
7373
skip_ssl_verification: ((s3-stemcell-skip-ssl-verification))
74+
use_path_style: true
7475
version: { path: ((stemcell-name-prefix))((stemcell-main-name))/bosh-stemcell-((stemcell.version))-((stemcell-main-name)).tgz }
7576
- name: secrets-empty-depls-trigger
7677
icon: source-commit

spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-precompile-ref.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ resources:
7171
secret_access_key: ((s3-stemcell-secret-key))
7272
endpoint: ((s3-stemcell-endpoint))
7373
skip_ssl_verification: ((s3-stemcell-skip-ssl-verification))
74+
use_path_style: true
7475
version: { path: ((stemcell-name-prefix))((stemcell-main-name))/bosh-stemcell-((stemcell.version))-((stemcell-main-name)).tgz }
7576
- name: secrets-simple-depls-trigger
7677
icon: source-commit

spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-ref.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ resources:
124124
endpoint: ((s3-stemcell-endpoint))
125125
skip_ssl_verification: ((s3-stemcell-skip-ssl-verification))
126126
skip_download: true
127+
use_path_style: true
127128
version: { path: ((stemcell-name-prefix))((stemcell-main-name))/bosh-stemcell-((stemcell.version))-((stemcell-main-name)).tgz }
128129
- name: secrets-ntp-with-scan
129130
icon: source-merge

0 commit comments

Comments
 (0)