Skip to content

Commit eb648e9

Browse files
authored
chore: add linting to ci (#208)
1 parent 713bea0 commit eb648e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1828
-3192
lines changed

.aspect/workflows/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# See https://docs.aspect.build/workflows/configuration
22
tasks:
3-
# - format:
4-
# queue: aspect-medium
3+
- format:
4+
queue: aspect-medium
55
- buildifier:
66
queue: aspect-medium
77
- configure:

.pre-commit-config.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Commitizen runs in commit-msg stage
22
# but we don't want to run the other hooks on commit messages
33
default_stages: [commit]
4-
54
repos:
65
# Enforce that commit messages allow for later changelog generation
76
- repo: https://github.com/commitizen-tools/commitizen
@@ -10,13 +9,13 @@ repos:
109
# Requires that commitizen is already installed
1110
- id: commitizen
1211
stages: [commit-msg]
13-
- repo: https://github.com/pre-commit/mirrors-prettier
14-
rev: 'v2.7.1'
12+
- repo: local
1513
hooks:
16-
- id: prettier
17-
additional_dependencies:
18-
19-
14+
- id: format
15+
name: Format
16+
language: system
17+
entry: bazel run //:format
18+
files: .*
2019
- repo: https://github.com/keith/pre-commit-buildifier
2120
rev: 8.0.0
2221
hooks:

.prettierrc.cjs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/* eslint-env node */
22

33
module.exports = {
4-
trailingComma: 'es5',
5-
tabWidth: 4,
6-
semi: true,
7-
singleQuote: true,
8-
overrides: [
9-
{
10-
files: ['**/*.yaml', '**/*.yml', '**/*.json'],
11-
options: {
12-
tabWidth: 2,
13-
},
14-
},
15-
],
4+
trailingComma: 'es5',
5+
tabWidth: 2,
6+
semi: true,
7+
singleQuote: true,
8+
overrides: [
9+
{
10+
files: ['**/*.tf', '**/*.yaml', '**/*.yml', '**/*.json'],
11+
options: {
12+
tabWidth: 2,
13+
},
14+
},
15+
],
1616
};
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
terraform {
2-
backend "gcs" {
3-
bucket = "bucket-tfstate-1c526cd61f0c2662"
4-
prefix = "terraform/state"
5-
}
2+
backend "gcs" {
3+
bucket = "bucket-tfstate-1c526cd61f0c2662"
4+
prefix = "terraform/state"
5+
}
66
}

deployment/environments/dev/main.tf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ provider "google" {
44
}
55

66
module "webhook" {
7-
source = "../../modules/webhook"
7+
source = "../../modules/webhook"
88

9-
github_app_id = "221842"
10-
github_bot_app_id = "228146"
11-
bazel_central_registry = "publish-to-bcr-dev-registry/bazel-central-registry"
12-
notifications_email = "[email protected]"
13-
debug_email = "[email protected]"
14-
smtp_host = "in-v3.mailjet.com"
15-
smtp_port = 465
9+
github_app_id = "221842"
10+
github_bot_app_id = "228146"
11+
bazel_central_registry = "publish-to-bcr-dev-registry/bazel-central-registry"
12+
notifications_email = "[email protected]"
13+
debug_email = "[email protected]"
14+
smtp_host = "in-v3.mailjet.com"
15+
smtp_port = 465
1616
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
terraform {
2-
backend "gcs" {
3-
bucket = "bucket-tfstate-02793625b05b4e9a"
4-
prefix = "terraform/state"
5-
}
2+
backend "gcs" {
3+
bucket = "bucket-tfstate-02793625b05b4e9a"
4+
prefix = "terraform/state"
5+
}
66
}

deployment/environments/prod/main.tf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ provider "google" {
55
}
66

77
module "webhook" {
8-
source = "../../modules/webhook"
8+
source = "../../modules/webhook"
99

10-
github_app_id = "196878"
11-
github_bot_app_id = "234555"
12-
bazel_central_registry = "bazelbuild/bazel-central-registry"
13-
notifications_email = "[email protected]"
14-
debug_email = "[email protected]"
15-
smtp_host = "in-v3.mailjet.com"
16-
smtp_port = 465
10+
github_app_id = "196878"
11+
github_bot_app_id = "234555"
12+
bazel_central_registry = "bazelbuild/bazel-central-registry"
13+
notifications_email = "[email protected]"
14+
debug_email = "[email protected]"
15+
smtp_host = "in-v3.mailjet.com"
16+
smtp_port = 465
1717
}

deployment/modules/remote-state/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
terraform {
22
required_providers {
33
google = {
4-
source = "hashicorp/google"
4+
source = "hashicorp/google"
55
version = "4.84.0"
66
}
77
}
@@ -17,7 +17,7 @@ resource "random_id" "instance_id" {
1717
}
1818

1919
resource "google_storage_bucket" "remote_state_bucket" {
20-
name = "bucket-tfstate-${random_id.instance_id.hex}"
20+
name = "bucket-tfstate-${random_id.instance_id.hex}"
2121
force_destroy = false
2222
location = var.region
2323
storage_class = "STANDARD"
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
variable "project_id" {
2-
type = string
3-
description = "ID of the Google Cloud project in which to create the terraform state bucket"
2+
type = string
3+
description = "ID of the Google Cloud project in which to create the terraform state bucket"
44
}
55

66
variable "region" {
7-
type = string
8-
description = "Google Cloud region to deploy resources to"
9-
default = "us-west1"
7+
type = string
8+
description = "Google Cloud region to deploy resources to"
9+
default = "us-west1"
1010
}

deployment/modules/webhook/main.tf

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
terraform {
33
required_providers {
44
google = {
5-
source = "hashicorp/google"
5+
source = "hashicorp/google"
66
version = "4.84.0"
77
}
88
}
@@ -12,7 +12,7 @@ data "google_client_config" "this" {}
1212

1313
locals {
1414
project = var.project != null ? var.project : data.google_client_config.this.project
15-
region = var.region != null ? var.region : data.google_client_config.this.region
15+
region = var.region != null ? var.region : data.google_client_config.this.region
1616
}
1717

1818
resource "google_storage_bucket" "source_archive_bucket" {
@@ -31,23 +31,23 @@ resource "google_cloudfunctions_function" "publish_to_bcr_function" {
3131
description = "Handle incoming github events"
3232
runtime = "nodejs20"
3333

34-
available_memory_mb = 1024
35-
source_archive_bucket = google_storage_bucket.source_archive_bucket.name
36-
source_archive_object = google_storage_bucket_object.publish_to_bcr_function_bucket_object.name
37-
trigger_http = true
34+
available_memory_mb = 1024
35+
source_archive_bucket = google_storage_bucket.source_archive_bucket.name
36+
source_archive_object = google_storage_bucket_object.publish_to_bcr_function_bucket_object.name
37+
trigger_http = true
3838
https_trigger_security_level = "SECURE_ALWAYS"
39-
ingress_settings = "ALLOW_ALL"
40-
entry_point = "handleGithubWebhookEvent"
41-
timeout = 240
39+
ingress_settings = "ALLOW_ALL"
40+
entry_point = "handleGithubWebhookEvent"
41+
timeout = 240
4242

4343
environment_variables = {
44-
GITHUB_APP_ID = var.github_app_id,
45-
GITHUB_BOT_APP_ID = var.github_bot_app_id,
44+
GITHUB_APP_ID = var.github_app_id,
45+
GITHUB_BOT_APP_ID = var.github_bot_app_id,
4646
BAZEL_CENTRAL_REGISTRY = var.bazel_central_registry,
47-
NOTIFICATIONS_EMAIL = var.notifications_email,
48-
DEBUG_EMAIL = var.debug_email,
49-
SMTP_HOST = var.smtp_host,
50-
SMTP_PORT = var.smtp_port,
47+
NOTIFICATIONS_EMAIL = var.notifications_email,
48+
DEBUG_EMAIL = var.debug_email,
49+
SMTP_HOST = var.smtp_host,
50+
SMTP_PORT = var.smtp_port,
5151
}
5252
}
5353

@@ -75,9 +75,9 @@ resource "google_secret_manager_secret" "github_app_webhook_secret" {
7575
}
7676

7777
resource "google_secret_manager_secret_iam_binding" "github_app_webhook_secret_binding" {
78-
project = local.project
78+
project = local.project
7979
secret_id = google_secret_manager_secret.github_app_webhook_secret.secret_id
80-
role = "roles/secretmanager.secretAccessor"
80+
role = "roles/secretmanager.secretAccessor"
8181
members = [
8282
"serviceAccount:${local.project}@appspot.gserviceaccount.com"
8383
]
@@ -96,9 +96,9 @@ resource "google_secret_manager_secret" "github_app_private_key" {
9696
}
9797

9898
resource "google_secret_manager_secret_iam_binding" "github_app_private_key_binding" {
99-
project = local.project
99+
project = local.project
100100
secret_id = google_secret_manager_secret.github_app_private_key.secret_id
101-
role = "roles/secretmanager.secretAccessor"
101+
role = "roles/secretmanager.secretAccessor"
102102
members = [
103103
"serviceAccount:${local.project}@appspot.gserviceaccount.com"
104104
]
@@ -117,9 +117,9 @@ resource "google_secret_manager_secret" "github_app_client_id" {
117117
}
118118

119119
resource "google_secret_manager_secret_iam_binding" "github_app_client_id_binding" {
120-
project = local.project
120+
project = local.project
121121
secret_id = google_secret_manager_secret.github_app_client_id.secret_id
122-
role = "roles/secretmanager.secretAccessor"
122+
role = "roles/secretmanager.secretAccessor"
123123
members = [
124124
"serviceAccount:${local.project}@appspot.gserviceaccount.com"
125125
]
@@ -138,9 +138,9 @@ resource "google_secret_manager_secret" "github_app_client_secret" {
138138
}
139139

140140
resource "google_secret_manager_secret_iam_binding" "github_app_client_secret_binding" {
141-
project = local.project
141+
project = local.project
142142
secret_id = google_secret_manager_secret.github_app_client_secret.secret_id
143-
role = "roles/secretmanager.secretAccessor"
143+
role = "roles/secretmanager.secretAccessor"
144144
members = [
145145
"serviceAccount:${local.project}@appspot.gserviceaccount.com"
146146
]
@@ -159,9 +159,9 @@ resource "google_secret_manager_secret" "github_bot_app_private_key" {
159159
}
160160

161161
resource "google_secret_manager_secret_iam_binding" "github_bot_app_private_key_binding" {
162-
project = local.project
162+
project = local.project
163163
secret_id = google_secret_manager_secret.github_bot_app_private_key.secret_id
164-
role = "roles/secretmanager.secretAccessor"
164+
role = "roles/secretmanager.secretAccessor"
165165
members = [
166166
"serviceAccount:${local.project}@appspot.gserviceaccount.com"
167167
]
@@ -180,9 +180,9 @@ resource "google_secret_manager_secret" "github_bot_app_client_id" {
180180
}
181181

182182
resource "google_secret_manager_secret_iam_binding" "github_bot_app_client_id_binding" {
183-
project = local.project
183+
project = local.project
184184
secret_id = google_secret_manager_secret.github_bot_app_client_id.secret_id
185-
role = "roles/secretmanager.secretAccessor"
185+
role = "roles/secretmanager.secretAccessor"
186186
members = [
187187
"serviceAccount:${local.project}@appspot.gserviceaccount.com"
188188
]
@@ -201,9 +201,9 @@ resource "google_secret_manager_secret" "github_bot_app_client_secret" {
201201
}
202202

203203
resource "google_secret_manager_secret_iam_binding" "github_bot_app_client_secret_binding" {
204-
project = local.project
204+
project = local.project
205205
secret_id = google_secret_manager_secret.github_bot_app_client_secret.secret_id
206-
role = "roles/secretmanager.secretAccessor"
206+
role = "roles/secretmanager.secretAccessor"
207207
members = [
208208
"serviceAccount:${local.project}@appspot.gserviceaccount.com"
209209
]
@@ -223,9 +223,9 @@ resource "google_secret_manager_secret" "notifications_email_user" {
223223
}
224224

225225
resource "google_secret_manager_secret_iam_binding" "notifications_email_user_binding" {
226-
project = local.project
226+
project = local.project
227227
secret_id = google_secret_manager_secret.notifications_email_user.secret_id
228-
role = "roles/secretmanager.secretAccessor"
228+
role = "roles/secretmanager.secretAccessor"
229229
members = [
230230
"serviceAccount:${local.project}@appspot.gserviceaccount.com"
231231
]
@@ -244,9 +244,9 @@ resource "google_secret_manager_secret" "notifications_email_password" {
244244
}
245245

246246
resource "google_secret_manager_secret_iam_binding" "notifications_email_password_binding" {
247-
project = local.project
247+
project = local.project
248248
secret_id = google_secret_manager_secret.notifications_email_password.secret_id
249-
role = "roles/secretmanager.secretAccessor"
249+
role = "roles/secretmanager.secretAccessor"
250250
members = [
251251
"serviceAccount:${local.project}@appspot.gserviceaccount.com"
252252
]

0 commit comments

Comments
 (0)