Skip to content

Commit 0635199

Browse files
adrianjhuntersliedig
adrianjhunter
authored and
sliedig
committed
chore(ci): Moved samconfig.toml into service folder to simply CLI commands and native Application Builder support
1 parent de994fb commit 0635199

4 files changed

Lines changed: 31 additions & 49 deletions

File tree

‎.gitea/workflows/pipeline.yaml‎

Lines changed: 25 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
unicorn_contracts_domain:
3434
- 'Unicorn.Contracts/Infrastructure/domain.yaml'
3535
unicorn_contracts_service:
36-
- 'Unicorn.Contracts/Infrastructure/contracts-service/**'
36+
- 'Unicorn.Contracts/Infrastructure/web-service/**'
3737
- 'Unicorn.Contracts/src/**'
3838
unicorn_contracts_schema_contractstatuschanged:
3939
- 'Unicorn.Contracts/Infrastructure/schema-registry/ContractStatusChanged-schema.yaml'
@@ -240,8 +240,8 @@ jobs:
240240
241241
- name: Run cfn-lint with Serverless Rules
242242
if: ${{ needs.changes.outputs.unicorn_contracts_service == 'true' }}
243-
run: cfn-lint contracts-service/template.yaml -a cfn_lint_serverless.rules
244-
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure
243+
run: cfn-lint template.yaml -a cfn_lint_serverless.rules
244+
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure/web-service
245245

246246
- name: Build
247247
if: ${{ needs.changes.outputs.unicorn_contracts_service == 'true' }}
@@ -258,34 +258,26 @@ jobs:
258258
- name: Build and Package Contracts Service
259259
if: ${{ needs.changes.outputs.unicorn_contracts_service == 'true' }}
260260
run: |
261-
sam build --template contracts-service/template.yaml
261+
sam build
262262
sam package \
263263
--config-env dev \
264264
--output-template-file ".aws-sam/packaged-dev-contracts-service.yaml"
265265
sam package \
266266
--config-env prod \
267267
--output-template-file ".aws-sam/packaged-prod-contracts-service.yaml"
268-
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure
268+
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure/web-service
269269

270270
- name: Deploy Dev Contracts Service environment
271271
if: ${{ needs.changes.outputs.unicorn_contracts_service == 'true' }}
272272
run: |
273-
sam deploy \
274-
--config-env dev \
275-
--parameter-overrides Stage=dev \
276-
--no-confirm-changeset \
277-
--no-fail-on-empty-changeset
278-
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure
273+
sam deploy --config-env dev
274+
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure/web-service
279275

280276
- name: Deploy Prod Contracts Service environment
281277
if: ${{ needs.changes.outputs.unicorn_contracts_service == 'true' }}
282278
run: |
283-
sam deploy \
284-
--config-env prod \
285-
--parameter-overrides Stage=prod \
286-
--no-confirm-changeset \
287-
--no-fail-on-empty-changeset
288-
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure
279+
sam deploy --config-env prod
280+
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure/web-service
289281

290282
- name: Deploy Dev ContractsStatusChanged schema
291283
if: ${{ needs.changes.outputs.unicorn_contracts_schema_contractstatuschanged == 'true' }}
@@ -365,8 +357,8 @@ jobs:
365357
366358
- name: Run cfn-lint with Serverless Rules
367359
if: ${{ needs.changes.outputs.unicorn_approvals_service == 'true' }}
368-
run: cfn-lint approvals-service/template.yaml -a cfn_lint_serverless.rules
369-
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure
360+
run: cfn-lint template.yaml -a cfn_lint_serverless.rules
361+
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure/approvals-service
370362

371363
- name: Build
372364
if: ${{ needs.changes.outputs.unicorn_approvals_service == 'true' }}
@@ -383,34 +375,26 @@ jobs:
383375
- name: Build and Package Approvals Service
384376
if: ${{ needs.changes.outputs.unicorn_approvals_service == 'true' }}
385377
run: |
386-
sam build --template approvals-service/template.yaml
378+
sam build
387379
sam package \
388380
--config-env dev \
389381
--output-template-file ".aws-sam/packaged-dev-approvals-service.yaml"
390382
sam package \
391383
--config-env prod \
392384
--output-template-file ".aws-sam/packaged-prod-approvals-service.yaml"
393-
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure
385+
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure/approvals-service
394386

395387
- name: Deploy Dev Approvals Service environment
396388
if: ${{ needs.changes.outputs.unicorn_approvals_service == 'true' }}
397389
run: |
398-
sam deploy \
399-
--config-env dev \
400-
--parameter-overrides Stage=dev \
401-
--no-confirm-changeset \
402-
--no-fail-on-empty-changeset
403-
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure
390+
sam deploy --config-env dev
391+
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure/approvals-service
404392

405393
- name: Deploy Prod Approvals Service environment
406394
if: ${{ needs.changes.outputs.unicorn_approvals_service == 'true' }}
407395
run: |
408-
sam deploy \
409-
--config-env prod \
410-
--parameter-overrides Stage=prod \
411-
--no-confirm-changeset \
412-
--no-fail-on-empty-changeset
413-
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure
396+
sam deploy --config-env prod
397+
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure/approvals-service
414398

415399
- name: Deploy Dev PublicationEvaluationCompleted schema
416400
if: ${{ needs.changes.outputs.unicorn_approvals_schema_publicationevaluationcompleted == 'true' }}
@@ -534,8 +518,8 @@ jobs:
534518
535519
- name: Run cfn-lint and cfn-lint-serverless
536520
if: ${{ needs.changes.outputs.unicorn_web_service == 'true' }}
537-
run: cfn-lint web-service/template.yaml -a cfn_lint_serverless.rules
538-
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure
521+
run: cfn-lint template.yaml -a cfn_lint_serverless.rules
522+
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure/web-service
539523

540524
- name: Build Publication Manager Service
541525
if: ${{ needs.changes.outputs.unicorn_web_service == 'true' }}
@@ -567,8 +551,8 @@ jobs:
567551
dotnet clean Common/Common.csproj
568552
dotnet clean SearchService/SearchService.csproj
569553
dotnet clean PublicationManagerService/PublicationManagerService.csproj
570-
cd Infrastructure
571-
sam build --template web-service/template.yaml
554+
cd Infrastructure/web-service
555+
sam build
572556
sam package \
573557
--config-env dev \
574558
--output-template-file ".aws-sam/packaged-dev-web-service.yaml"
@@ -580,22 +564,14 @@ jobs:
580564
- name: Deploy Dev Web Service environment
581565
if: ${{ needs.changes.outputs.unicorn_web_service == 'true' }}
582566
run: |
583-
sam deploy \
584-
--config-env dev \
585-
--parameter-overrides Stage=dev \
586-
--no-confirm-changeset \
587-
--no-fail-on-empty-changeset
588-
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure
567+
sam deploy --config-env dev
568+
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure/web-service
589569

590570
- name: Deploy Prod Web Service environment
591571
if: ${{ needs.changes.outputs.unicorn_web_service == 'true' }}
592572
run: |
593-
sam deploy \
594-
--config-env prod \
595-
--parameter-overrides Stage=prod \
596-
--no-confirm-changeset \
597-
--no-fail-on-empty-changeset
598-
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure
573+
sam deploy --config-env prod
574+
working-directory: ${{ gitea.workspace }}/${{ env.SERVICE_FOLDER }}/Infrastructure/web-service
599575

600576
- name: Deploy Dev PublicationApprovalRequested schema
601577
if: ${{ needs.changes.outputs.unicorn_web_schema_publicationapprovalrequested == 'true' }}

Unicorn.Approvals/Infrastructure/samconfig.toml renamed to Unicorn.Approvals/Infrastructure/approvals-service/samconfig.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ resolve_image_repositories = true
4242
[dev.deploy]
4343
[dev.deploy.parameters]
4444
template = ".aws-sam/packaged-dev-approvals-service.yaml"
45+
confirm_changeset = false
4546
fail_on_empty_changeset = false
4647
capabilities = "CAPABILITY_IAM CAPABILITY_AUTO_EXPAND"
4748
parameter_overrides = "Stage=dev"
@@ -59,6 +60,7 @@ resolve_image_repositories = true
5960
[prod.deploy]
6061
[prod.deploy.parameters]
6162
template = ".aws-sam/packaged-prod-approvals-service.yaml"
63+
confirm_changeset = false
6264
fail_on_empty_changeset = false
6365
capabilities = "CAPABILITY_IAM CAPABILITY_AUTO_EXPAND"
6466
parameter_overrides = "Stage=prod"

Unicorn.Contracts/Infrastructure/samconfig.toml renamed to Unicorn.Contracts/Infrastructure/contracts-service/samconfig.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ resolve_image_repositories = true
4242
[dev.deploy]
4343
[dev.deploy.parameters]
4444
template = ".aws-sam/packaged-dev-contracts-service.yaml"
45+
confirm_changeset = false
4546
fail_on_empty_changeset = false
4647
capabilities = "CAPABILITY_IAM CAPABILITY_AUTO_EXPAND"
4748
parameter_overrides = "Stage=dev"
@@ -59,6 +60,7 @@ resolve_image_repositories = true
5960
[prod.deploy]
6061
[prod.deploy.parameters]
6162
template = ".aws-sam/packaged-prod-contracts-service.yaml"
63+
confirm_changeset = false
6264
fail_on_empty_changeset = false
6365
capabilities = "CAPABILITY_IAM CAPABILITY_AUTO_EXPAND"
6466
parameter_overrides = "Stage=prod"

Unicorn.Web/Infrastructure/samconfig.toml renamed to Unicorn.Web/Infrastructure/web-service/samconfig.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ resolve_image_repositories = true
4242
[dev.deploy]
4343
[dev.deploy.parameters]
4444
template = ".aws-sam/packaged-dev-web-service.yaml"
45+
confirm_changeset = false
4546
fail_on_empty_changeset = false
4647
capabilities = "CAPABILITY_IAM CAPABILITY_AUTO_EXPAND"
4748
parameter_overrides = "Stage=dev"
@@ -59,6 +60,7 @@ resolve_image_repositories = true
5960
[prod.deploy]
6061
[prod.deploy.parameters]
6162
template = ".aws-sam/packaged-prod-web-service.yaml"
63+
confirm_changeset = false
6264
fail_on_empty_changeset = false
6365
capabilities = "CAPABILITY_IAM CAPABILITY_AUTO_EXPAND"
6466
parameter_overrides = "Stage=prod"

0 commit comments

Comments
 (0)