Skip to content

Commit 2762ee9

Browse files
committed
address comments
1 parent 48e9424 commit 2762ee9

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

cmd/aws/main.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ func newAWSStorage(ctx context.Context, signer note.Signer) (*storage.CTStorage,
151151

152152
var antispam tessera.Antispam
153153
if *antispamDBName != "" {
154-
antispam, err = aws_as.NewAntispam(ctx, antispamMysqlConfig().FormatDSN(), aws_as.AntispamOpts{})
154+
antispam, err = aws_as.NewAntispam(ctx, antispamMySQLConfig().FormatDSN(), aws_as.AntispamOpts{})
155155
if err != nil {
156-
klog.Exitf("Failed to create new GCP antispam storage: %v", err)
156+
klog.Exitf("Failed to create new AWS antispam storage: %v", err)
157157
}
158158
}
159159

@@ -214,7 +214,7 @@ func storageConfigFromFlags() taws.Config {
214214
if *dbUser == "" {
215215
klog.Exit("--db_user must be set")
216216
}
217-
// Empty passord isn't an option with AuroraDB MySQL.
217+
// Empty password isn't an option with AuroraDB MySQL.
218218
if *dbPassword == "" {
219219
klog.Exit("--db_password must be set")
220220
}
@@ -237,7 +237,7 @@ func storageConfigFromFlags() taws.Config {
237237
}
238238
}
239239

240-
func antispamMysqlConfig() *mysql.Config {
240+
func antispamMySQLConfig() *mysql.Config {
241241
if *antispamDBName == "" {
242242
klog.Exit("--antispam_db_name must be set")
243243
}

deployment/live/aws/test/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export AWS_PROFILE=AdministratorAccess-<REDACTED>
6767
Terraforming the account can be done by:
6868
1. `cd` to [/deployment/live/aws/test/](/deployment/live/aws/test/) to deploy/change.
6969
2. Run `terragrunt apply`. If this fails to create the antispam database,
70-
connect the RDS instance to your VM using the instrunctions bellow, and run
70+
connect the RDS instance to your VM using the instructions below, and run
7171
`terragrunt apply` again.
7272

7373
Store the Aurora RDS database and S3 bucket information into the environment variables:
@@ -99,7 +99,7 @@ go run ./cmd/aws \
9999
--db_port=3306 \
100100
--db_user=tesseract \
101101
--db_password=${TESSERACT_DB_PASSWORD} \
102-
--antispam_db_name=antispam_db
102+
--antispam_db_name=antispam_db \
103103
--signer_public_key_secret_name=${SCTFE_SIGNER_ECDSA_P256_PUBLIC_KEY_ID} \
104104
--signer_private_key_secret_name=${SCTFE_SIGNER_ECDSA_P256_PRIVATE_KEY_ID}
105105
```
@@ -193,7 +193,7 @@ go run ./cmd/aws \
193193
--db_port=3306 \
194194
--db_user=tesseract \
195195
--db_password=${TESSERACT_DB_PASSWORD} \
196-
--antispam_db_name=antispam_db
196+
--antispam_db_name=antispam_db \
197197
--signer_public_key_secret_name=${SCTFE_SIGNER_ECDSA_P256_PUBLIC_KEY_ID} \
198198
--signer_private_key_secret_name=${SCTFE_SIGNER_ECDSA_P256_PRIVATE_KEY_ID}
199199
-v=3

deployment/modules/aws/storage/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ data "aws_secretsmanager_secret_version" "db_credentials" {
5959
# creating the aws_db_instance.
6060
# This requires that the machine running terraform has access
6161
# to the DB instance created above. This is _NOT_ the case when
62-
# github actions are applying the terraform.
62+
# GitHub actions are applying the terraform.
6363
provider "mysql" {
6464
endpoint = aws_rds_cluster_instance.cluster_instances[0].endpoint
6565
username = aws_rds_cluster.log_rds_cluster.master_username

deployment/modules/gcp/storage/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ resource "google_spanner_database" "antispam_db" {
7878
instance = google_spanner_instance.log_spanner.name
7979
name = "${var.base_name}-antispam-db"
8080
ddl = [
81-
"CREATE TABLE IF NOT EXISTS FollowCoord (id INT64 NOT NULL, nextIdx INT64 NOT NULL) PRIMARY KEY (id)",
82-
"CREATE TABLE IF NOT EXISTS IDSeq (h BYTES(32) NOT NULL, idx INT64 NOT NULL) PRIMARY KEY (h)",
81+
"CREATE TABLE IF NOT EXISTS FollowCoord (id INT64 NOT NULL, nextIdx INT64 NOT NULL) PRIMARY KEY (id)",
82+
"CREATE TABLE IF NOT EXISTS IDSeq (h BYTES(32) NOT NULL, idx INT64 NOT NULL) PRIMARY KEY (h)",
8383
]
8484

8585
deletion_protection = !var.ephemeral

0 commit comments

Comments
 (0)