hokulea-garage に hokulea をマージする

[gosaaan1]

hokulea-garage(GitHub)とhokulea(CodeCommit)のリポジトリを統合する。

[gosaaan1]

❯ diff -q hokulea-garage/ hokulea/
Only in hokulea-garage/: aws_rds_stress_test
Only in hokulea-garage/: .aws-sam
Only in hokulea-garage/: aws_sam_project
Only in hokulea/: buildspec_terraform_mfa.yml
Common subdirectories: hokulea-garage/containers and hokulea/containers
Files hokulea-garage/.devcontainer.json and hokulea/.devcontainer.json differ
Only in hokulea-garage/: doc
Common subdirectories: hokulea-garage/.git and hokulea/.git
Only in hokulea-garage/: .github
Files hokulea-garage/.gitignore and hokulea/.gitignore differ
Only in hokulea-garage/: LICENSE
Only in hokulea/: rds_stress_test
Only in hokulea-garage/: serverless_web_app
Only in hokulea-garage/: terraform_on_aws
Only in hokulea/: your-iac

[gosaaan1]

Common subdirectories: hokulea-garage/containers and hokulea/containers Files hokulea-garage/.devcontainer.json and hokulea/.devcontainer.json differ

hokulea-garageは#3の対策が入っている。

❯ diff hokulea/.devcontainer.json hokulea-garage/.devcontainer.json
2,3c2,3
<     "image": "public.ecr.aws/l2m0t2f1/terraform-mfa:1.2",
<     "mounts": ["source=terraform_credentials,target=/root"],
---
>     "image": "terraform-mfa:22.04.202304",
>     "postCreateCommand": "rm ~/.gnupg/S.gpg-agent* && gpg-connect-agent reloadagent /bye",

[gosaaan1]

hokulea-garage/.gitignoreの方は自動生成したテンプレートっぽい（英語のコメントが入っているので）

❯ diff hokulea-garage/.gitignore hokulea/.gitignore
1,33c1,8
< # Local .terraform directories
< **/.terraform/*
< 
< # .tfstate files
< *.tfstate
< *.tfstate.*
< 
< # Crash log files
< crash.log
< 
< # Ignore any .tfvars files that are generated automatically for each Terraform run. Most
< # .tfvars files are managed as part of configuration and so should be included in
< # version control.
< #
< # example.tfvars
< 
< # Ignore override files as they are usually used to override resources locally and so
< # are not checked in
< override.tf
< override.tf.json
< *_override.tf
< *_override.tf.json
< 
< # Include override files you do wish to add to version control using negated pattern
< #
< # !example_override.tf
< 
< # Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
< # example: *tfplan*
< 
< *.secure
< .terraform.lock.hcl
< *.log
---
> .DS_Store
> your-iac/.terraform/providers/registry.terraform.io/hashicorp/aws/3.75.1/linux_amd64/terraform-provider-aws_v3.75.1_x5
> your-iac/.terraform.lock.hcl
> docs/node_modules/*
> docs/workspace/*
> docs/build/*
> .terraform
> terraform.tfstate*
\ No newline at end of file

[gosaaan1]

それ以外はonly inなので、hokulea-garage側に一旦そのまま入れる方針で。

[gosaaan1]

aws_rds_stress_test と rds_stress_test のように、類似したものの精査については別Issueで行います。