Skip to content

Commit

Permalink
lint: fix yamlfmt and restore lost empty lines
Browse files Browse the repository at this point in the history
  • Loading branch information
bengerman13 committed Jul 18, 2024
1 parent 8c58537 commit 9af95f5
Show file tree
Hide file tree
Showing 15 changed files with 124 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/google/yamlfmt
rev: v0.10.0
rev: v0.13.0
hooks:
- id: yamlfmt
- repo: https://github.com/koalaman/shellcheck-precommit
Expand Down
1 change: 1 addition & 0 deletions .yamlfmt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
formatter:
type: basic
include_document_start: true
retain_line_breaks_single: true
drop_merge_tag: true
3 changes: 3 additions & 0 deletions bosh/opsfiles/basic-auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
- type: replace
path: /instance_groups/name=concourse/jobs/name=atc/properties/no_really_i_dont_want_any_auth?
value: false

- type: replace
path: /instance_groups/name=concourse/jobs/name=atc/properties/basic_auth_username?
value: bootstrap

- type: replace
path: /instance_groups/name=concourse/jobs/name=atc/properties/basic_auth_password?
value: ((basic-auth-password))

- type: replace
path: /variables/-
value:
Expand Down
1 change: 1 addition & 0 deletions bosh/opsfiles/bootstrap-instance-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
- type: replace
path: /resource_pools/name=vms/cloud_properties/instance_type?
value: c3.4xlarge

# add disk space
- type: replace
path: /resource_pools/name=vms/cloud_properties/ephemeral_disk/size?
Expand Down
4 changes: 4 additions & 0 deletions bosh/opsfiles/self-signed-tls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
- type: replace
path: /instance_groups/name=concourse/jobs/name=atc/properties/tls_cert?
value: ((bootstrap-concourse-cert.certificate))

- type: replace
path: /instance_groups/name=concourse/jobs/name=atc/properties/tls_key?
value: ((bootstrap-concourse-cert.private_key))

- type: replace
path: /variables/-
value:
Expand All @@ -13,6 +15,7 @@
options:
is_ca: true
common_name: bootstrap-ca

- type: replace
path: /variables/-
value:
Expand All @@ -22,6 +25,7 @@
ca: bootstrap-ca
common_name: bootstrap-concourse-cert
alternative_names: [((public_ip))]

- type: replace
path: /instance_groups/name=concourse/jobs/name=atc/properties/external_url
value: https://((public_ip)):4443
1 change: 1 addition & 0 deletions bosh/opsfiles/vip-network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
value:
name: public
type: vip

- type: replace
path: /instance_groups/name=concourse/networks/-
value:
Expand Down
1 change: 1 addition & 0 deletions bosh/varsfiles/collect-aws-variables.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
# Map values from AWS key pair output
private_key: ((KeyMaterial))

# Map values from terraform output
default_security_groups:
- ((security_group_id.value))
Expand Down
2 changes: 2 additions & 0 deletions bosh/varsfiles/deploy-bosh.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
---
bosh-config-git-url: https://github.com/18F/cg-deploy-bosh.git
bosh-config-git-branch: master

pipeline-tasks-git-url: https://github.com/18F/cg-pipeline-tasks.git
pipeline-tasks-git-branch: master

tf-state-file-tooling: tooling/state.yml
tf-state-file-development: development/state.yml
tf-state-file-staging: staging/state.yml
Expand Down
4 changes: 4 additions & 0 deletions ci/check-certificates.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
---
platform: linux

inputs:
- name: cg-provision-repo
- name: terraform-yaml-tooling

outputs:
- name: certificates

run:
path: cg-provision-repo/ci/check-certificates.sh

params:
AWS_DEFAULT_REGION:
CERT_PATH:
Expand Down
8 changes: 8 additions & 0 deletions ci/concourse-defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,29 @@
cg_provision_git_url: https://github.com/18F/cg-provision.git
cg_provision_git_repo: 18F/cg-provision
cg_provision_git_branch: master

cg_provision_development_git_url: https://github.com/18F/cg-provision
cg_provision_development_git_branch: master

pipeline_tasks_git_url: https://github.com/18F/cg-pipeline-tasks.git
pipeline_tasks_git_branch: master

aws_default_region: us-gov-west-1

aws_s3_tfstate_bucket: terraform-state
aws_s3_cloudtrail_bucket: cg-s3-cloudtrail

tf_state_file_tooling: tooling/state.yml
tf_state_file_development: development/state.yml
tf_state_file_staging: staging/state.yml
tf_state_file_production: production/state.yml

aws_external_region: us-east-1
aws_external_s3_tfstate_bucket: cg-terraform-state

tf_state_file_external_staging: external-staging/state.yml
tf_state_file_external_production: external-production/state.yml

slack-channel: "#cg-platform"
slack-username: concourse
slack-icon-url: http://cl.ly/image/3e1h0H3H2s0P/concourse-logo.png
3 changes: 3 additions & 0 deletions ci/delete-old-certificates.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
---
# upload a certificate to the tooling account
platform: linux

inputs:
- name: cg-provision-repo
- name: terraform-yaml-tooling
- name: certificates
- name: acme

run:
path: cg-provision-repo/ci/delete-old-certificates.sh

params:
AWS_DEFAULT_REGION:
CERT_PATH:
Expand Down
Loading

0 comments on commit 9af95f5

Please sign in to comment.