Merge pull request #1 from sohosai/feature/rename-components

Feature/rename components

README.md

@@ -1,6 +1,6 @@
 # 雙峰祭オンラインシステム バックエンド インフラ
 
-[![CI](https://github.com/sohosai/sos21-backend-infrastructure/actions/workflows/ci.yml/badge.svg)](https://github.com/sohosai/sos21-backend-infrastructure/actions/workflows/ci.yml)
+[![CI](https://github.com/sohosai/sos22-backend-infrastructure/actions/workflows/ci.yml/badge.svg)](https://github.com/sohosai/sos22-backend-infrastructure/actions/workflows/ci.yml)
 
 ## Requirements
 

main.tf

@@ -1,6 +1,6 @@
 module "staging" {
   source = "./modules/staging"
-  tags   = ["sos21_staging"]
+  tags   = ["sos22_staging"]
   zone   = var.zone
 
   root_ssh_public_keys = var.root_ssh_public_keys
@@ -15,7 +15,7 @@ module "staging" {
 
 module "production" {
   source = "./modules/production"
-  tags   = ["sos21_production"]
+  tags   = ["sos22_production"]
   zone   = var.zone
 
   root_ssh_public_keys = var.root_ssh_public_keys

modules/database/archive.tf

@@ -4,15 +4,15 @@ locals {
 
 module "nixos_database" {
   source = "../sakuracloud_archive_nixos_custom"
-  name   = "sos21_database_nixos"
-  tags   = concat(var.tags, ["sos21_archive_nixos_database"])
+  name   = "sos22_database_nixos"
+  tags   = concat(var.tags, ["sos22_archive_nixos_database"])
   zone   = var.zone
 
-  imports      = ["${path.module}/sos21-database.nix"]
+  imports      = ["${path.module}/sos22-database.nix"]
   nixos_config = <<-EOT
   { pkgs, ... }:
   {
-    sos21-database = {
+    sos22-database = {
       network = "${var.switch_network}";
       ipAddress = "${var.ip_address}";
       prefixLength = ${var.switch_netmask};

modules/database/main.tf

@@ -1,13 +1,13 @@
 resource "sakuracloud_disk" "data_disk" {
-  name = "sos21_database_data_disk"
-  tags = concat(var.tags, ["sos21_database_data_disk"])
+  name = "sos22_database_data_disk"
+  tags = concat(var.tags, ["sos22_database_data_disk"])
   zone = var.zone
   size = var.data_disk_size
 }
 
 resource "sakuracloud_disk" "disk" {
-  name              = "sos21_database_disk"
-  tags              = concat(var.tags, ["sos21_database_disk"])
+  name              = "sos22_database_disk"
+  tags              = concat(var.tags, ["sos22_database_disk"])
   zone              = var.zone
   source_archive_id = module.nixos_database.archive_id
 }
@@ -23,8 +23,8 @@ resource "random_password" "password" {
 }
 
 resource "sakuracloud_server" "database" {
-  name   = "sos21_database"
-  tags   = concat(var.tags, ["sos21_database_server"])
+  name   = "sos22_database"
+  tags   = concat(var.tags, ["sos22_database_server"])
   disks  = [sakuracloud_disk.disk.id, sakuracloud_disk.data_disk.id]
   zone   = var.zone
   core   = var.core

modules/database/packet_filter.tf

@@ -1,5 +1,5 @@
 resource "sakuracloud_packet_filter" "switch" {
-  name = "sos21_database_filter_switch"
+  name = "sos22_database_filter_switch"
   zone = var.zone
 
   expression {

modules/database/sos21-database.nix → modules/database/sos22-database.nix

@@ -2,11 +2,11 @@
 
 with lib;
 let
-  cfg = config.sos21-database;
+  cfg = config.sos22-database;
 in
 {
   options = {
-    sos21-database = {
+    sos22-database = {
       network = mkOption {
         type = types.str;
       };

modules/minio/archive.tf

@@ -5,15 +5,15 @@ locals {
 
 module "nixos_minio" {
   source = "../sakuracloud_archive_nixos_custom"
-  name   = "sos21_minio_nixos"
-  tags   = concat(var.tags, ["sos21_archive_nixos_minio"])
+  name   = "sos22_minio_nixos"
+  tags   = concat(var.tags, ["sos22_archive_nixos_minio"])
   zone   = var.zone
 
-  imports      = ["${path.module}/sos21-minio.nix"]
+  imports      = ["${path.module}/sos22-minio.nix"]
   nixos_config = <<-EOT
   { pkgs, ... }:
   {
-    sos21-minio = {
+    sos22-minio = {
       network = "${var.switch_network}";
       ipAddress = "${var.ip_address}";
       prefixLength = ${var.switch_netmask};

modules/minio/main.tf

@@ -1,13 +1,13 @@
 resource "sakuracloud_disk" "data_disk" {
-  name = "sos21_minio_data_disk"
-  tags = concat(var.tags, ["sos21_minio_data_disk"])
+  name = "sos22_minio_data_disk"
+  tags = concat(var.tags, ["sos22_minio_data_disk"])
   zone = var.zone
   size = var.data_disk_size
 }
 
 resource "sakuracloud_disk" "disk" {
-  name              = "sos21_minio_disk"
-  tags              = concat(var.tags, ["sos21_minio_disk"])
+  name              = "sos22_minio_disk"
+  tags              = concat(var.tags, ["sos22_minio_disk"])
   zone              = var.zone
   source_archive_id = module.nixos_minio.archive_id
 }
@@ -23,8 +23,8 @@ resource "random_password" "secret_key" {
 }
 
 resource "sakuracloud_server" "minio" {
-  name   = "sos21_minio"
-  tags   = concat(var.tags, ["sos21_minio_server"])
+  name   = "sos22_minio"
+  tags   = concat(var.tags, ["sos22_minio_server"])
   disks  = [sakuracloud_disk.disk.id, sakuracloud_disk.data_disk.id]
   zone   = var.zone
   core   = var.core

modules/minio/packet_filter.tf

@@ -1,5 +1,5 @@
 resource "sakuracloud_packet_filter" "switch" {
-  name = "sos21_minio_filter"
+  name = "sos22_minio_filter"
   zone = var.zone
 
   expression {

modules/minio/sos21-minio.nix → modules/minio/sos22-minio.nix

@@ -2,11 +2,11 @@
 
 with lib;
 let
-  cfg = config.sos21-minio;
+  cfg = config.sos22-minio;
 in
 {
   options = {
-    sos21-minio = {
+    sos22-minio = {
       network = mkOption {
         type = types.str;
       };

modules/production/database.tf

@@ -1,6 +1,6 @@
 module "database" {
   source         = "../database"
-  tags           = concat(var.tags, ["sos21_database"])
+  tags           = concat(var.tags, ["sos22_database"])
   zone           = var.zone
   switch_id      = sakuracloud_switch.internal.id
   switch_network = local.internal_network
@@ -14,8 +14,8 @@ module "database" {
 }
 
 resource "sakuracloud_auto_backup" "database_auto_backup" {
-  name = "sos21_production_database_backup"
-  tags = concat(var.tags, ["sos21_auto_backup"])
+  name = "2_production_database_backup"
+  tags = concat(var.tags, ["sos22_auto_backup"])
   zone = var.zone
 
   disk_id        = module.database.data_disk_id

modules/production/main.tf

@@ -10,15 +10,15 @@ locals {
 }
 
 resource "sakuracloud_switch" "internal" {
-  name = "sos21_production_switch"
-  tags = concat(var.tags, ["sos21_switch"])
+  name = "sos22_production_switch"
+  tags = concat(var.tags, ["sos22_switch"])
   zone = var.zone
 }
 
 module "main_server" {
   source = "./modules/server"
 
-  tags   = concat(var.tags, ["sos21_main"])
+  tags   = concat(var.tags, ["sos22_main"])
   zone   = var.zone
   core   = 12
   memory = 8

modules/production/minio.tf

@@ -1,6 +1,6 @@
 module "minio" {
   source         = "../minio"
-  tags           = concat(var.tags, ["sos21_minio"])
+  tags           = concat(var.tags, ["sos22_minio"])
   zone           = var.zone
   switch_id      = sakuracloud_switch.internal.id
   switch_network = local.internal_network
@@ -14,8 +14,8 @@ module "minio" {
 }
 
 resource "sakuracloud_auto_backup" "minio_auto_backup" {
-  name = "sos21_production_minio_backup"
-  tags = concat(var.tags, ["sos21_auto_backup"])
+  name = "sos22_production_minio_backup"
+  tags = concat(var.tags, ["sos22_auto_backup"])
   zone = var.zone
 
   disk_id        = module.minio.data_disk_id

modules/production/modules/server/archive.tf

@@ -10,7 +10,7 @@ locals {
       ${join(" ", formatlist("\"%s\"", data.sakuracloud_zone.zone.dns_servers))}
     ];
 
-    sos21-production-server = {
+    sos22-production-server = {
       switch = {
         network = "${var.switch_network}";
         ipAddress = "${var.ip_address}";
@@ -39,11 +39,11 @@ locals {
 
 module "nixos_archive" {
   source = "../../../sakuracloud_archive_nixos_custom"
-  name   = "sos21_production_nixos"
-  tags   = concat(var.tags, ["sos21_archive_nixos"])
+  name   = "sos22_production_nixos"
+  tags   = concat(var.tags, ["sos22_archive_nixos"])
   zone   = var.zone
 
-  imports      = ["${path.module}/sos21-production-server.nix"]
+  imports      = ["${path.module}/sos22-production-server.nix"]
   nixos_config = local.nixos_config
 
   secret_contents = var.secret_contents
@@ -53,8 +53,8 @@ module "nixos_archive" {
       content = local.nixos_config
     },
     {
-      target  = "/etc/nixos/sos21-production-server.nix"
-      content = file("${path.module}/sos21-production-server.nix")
+      target  = "/etc/nixos/sos22-production-server.nix"
+      content = file("${path.module}/sos22-production-server.nix")
     }
   ])
 }

modules/production/modules/server/main.tf

@@ -1,13 +1,13 @@
 resource "sakuracloud_disk" "server_disk" {
-  name              = "sos21_production_server_disk"
-  tags              = concat(var.tags, ["sos21_server_disk"])
+  name              = "sos22_production_server_disk"
+  tags              = concat(var.tags, ["sos22_server_disk"])
   zone              = var.zone
   source_archive_id = module.nixos_archive.archive_id
 }
 
 resource "sakuracloud_server" "server" {
-  name   = "sos21_production_server"
-  tags   = concat(var.tags, ["sos21_server"])
+  name   = "sos22_production_server"
+  tags   = concat(var.tags, ["sos22_server"])
   disks  = [sakuracloud_disk.server_disk.id]
   zone   = var.zone
   core   = var.core

modules/production/modules/server/packet_filter.tf

@@ -1,5 +1,5 @@
 resource "sakuracloud_packet_filter" "external" {
-  name = "sos21_production_server_external"
+  name = "sos22_production_server_external"
   zone = var.zone
 
   expression {

modules/production/modules/server/sos21-production-server.nix → modules/production/modules/server/sos22-production-server.nix

@@ -2,11 +2,11 @@
 
 with lib;
 let
-  cfg = config.sos21-production-server;
+  cfg = config.sos22-production-server;
 in
 {
   options = {
-    sos21-production-server = {
+    sos22-production-server = {
       switch = mkOption {
         type = types.submodule {
           options = {

modules/staging/beta.tf

@@ -1,7 +1,7 @@
 module "beta" {
   source = "./modules/server"
 
-  tags   = concat(var.tags, ["sos21_beta"])
+  tags   = concat(var.tags, ["sos22_beta"])
   zone   = var.zone
   core   = 2
   memory = 2

modules/staging/database.tf

@@ -1,6 +1,6 @@
 module "database" {
   source         = "../database"
-  tags           = concat(var.tags, ["sos21_database"])
+  tags           = concat(var.tags, ["sos22_database"])
   zone           = var.zone
   switch_id      = sakuracloud_switch.internal.id
   switch_network = local.internal_network

modules/staging/main.tf

@@ -11,7 +11,7 @@ locals {
 }
 
 resource "sakuracloud_switch" "internal" {
-  name = "sos21_staging_switch"
-  tags = concat(var.tags, ["sos21_switch"])
+  name = "sos22_staging_switch"
+  tags = concat(var.tags, ["sos22_switch"])
   zone = var.zone
 }

modules/staging/minio.tf

@@ -1,6 +1,6 @@
 module "minio" {
   source         = "../minio"
-  tags           = concat(var.tags, ["sos21_minio"])
+  tags           = concat(var.tags, ["sos22_minio"])
   zone           = var.zone
   switch_id      = sakuracloud_switch.internal.id
   switch_network = local.internal_network

modules/staging/modules/server/archive.tf

@@ -10,7 +10,7 @@ locals {
       ${join(" ", formatlist("\"%s\"", data.sakuracloud_zone.zone.dns_servers))}
     ];
 
-    sos21-staging-server = {
+    sos22-staging-server = {
       switch = {
         network = "${var.switch_network}";
         ipAddress = "${var.ip_address}";
@@ -39,11 +39,11 @@ locals {
 
 module "nixos_archive" {
   source = "../../../sakuracloud_archive_nixos_custom"
-  name   = "sos21_staging_nixos"
-  tags   = concat(var.tags, ["sos21_archive_nixos"])
+  name   = "sos22_staging_nixos"
+  tags   = concat(var.tags, ["sos22_archive_nixos"])
   zone   = var.zone
 
-  imports      = ["${path.module}/sos21-staging-server.nix"]
+  imports      = ["${path.module}/sos22-staging-server.nix"]
   nixos_config = local.nixos_config
 
   secret_contents = var.secret_contents
@@ -53,8 +53,8 @@ module "nixos_archive" {
       content = local.nixos_config
     },
     {
-      target  = "/etc/nixos/sos21-staging-server.nix"
-      content = file("${path.module}/sos21-staging-server.nix")
+      target  = "/etc/nixos/sos22-staging-server.nix"
+      content = file("${path.module}/sos22-staging-server.nix")
     }
   ])
 }

modules/staging/modules/server/main.tf

@@ -1,13 +1,13 @@
 resource "sakuracloud_disk" "server_disk" {
-  name              = "sos21_staging_server_disk"
-  tags              = concat(var.tags, ["sos21_server_disk"])
+  name              = "sos22_staging_server_disk"
+  tags              = concat(var.tags, ["sos22_server_disk"])
   zone              = var.zone
   source_archive_id = module.nixos_archive.archive_id
 }
 
 resource "sakuracloud_server" "server" {
-  name   = "sos21_staging_server"
-  tags   = concat(var.tags, ["sos21_server"])
+  name   = "sos22_staging_server"
+  tags   = concat(var.tags, ["sos22_server"])
   disks  = [sakuracloud_disk.server_disk.id]
   zone   = var.zone
   core   = var.core

modules/staging/modules/server/packet_filter.tf

@@ -1,5 +1,5 @@
 resource "sakuracloud_packet_filter" "external" {
-  name = "sos21_staging_server_external"
+  name = "sos22_staging_server_external"
   zone = var.zone
 
   expression {