From f54aac0fafbb65e0c0e94d2063c20e68de4aaca8 Mon Sep 17 00:00:00 2001
From: ymktmk <73768462+ymktmk@users.noreply.github.com>
Date: Mon, 24 Oct 2022 13:39:31 +0900
Subject: [PATCH 1/9] fix vpc

---
 cloudformation/vpc.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/cloudformation/vpc.yaml b/cloudformation/vpc.yaml
index 9f18fef..56d0026 100644
--- a/cloudformation/vpc.yaml
+++ b/cloudformation/vpc.yaml
@@ -1,5 +1,16 @@
 AWSTemplateFormatVersion: 2010-09-09
 
+Parameters:
+  VpcCIDR:
+    Type: String
+    Default: 10.1.0.0/16
+  PublicSubnetCIDR:
+    Type: String
+    Default: 10.1.1.0/24
+  PrivateSubnetCIDR:
+    Type: String
+    Default: 10.1.2.0/24
+
 Resources:
   CfVPC:
     Type: AWS::EC2::VPC

From 75cd966e6ad0e10ada19f2e52a5339913099d51f Mon Sep 17 00:00:00 2001
From: ymktmk <73768462+ymktmk@users.noreply.github.com>
Date: Mon, 24 Oct 2022 13:45:15 +0900
Subject: [PATCH 2/9] fix parameters

---
 cloudformation/vpc.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cloudformation/vpc.yaml b/cloudformation/vpc.yaml
index 56d0026..5c32b63 100644
--- a/cloudformation/vpc.yaml
+++ b/cloudformation/vpc.yaml
@@ -3,19 +3,19 @@ AWSTemplateFormatVersion: 2010-09-09
 Parameters:
   VpcCIDR:
     Type: String
-    Default: 10.1.0.0/16
+    # Default: 10.1.0.0/16
   PublicSubnetCIDR:
     Type: String
-    Default: 10.1.1.0/24
+    # Default: 10.1.1.0/24
   PrivateSubnetCIDR:
     Type: String
-    Default: 10.1.2.0/24
+    # Default: 10.1.2.0/24
 
 Resources:
   CfVPC:
     Type: AWS::EC2::VPC
     Properties:
-      CidrBlock: 10.1.0.0/16
+      CidrBlock: !Ref VpcCIDR
       Tags:
         -
           Key: Name
@@ -24,7 +24,7 @@ Resources:
   CfPublicSubnet:
     Type: AWS::EC2::Subnet
     Properties:
-      CidrBlock: 10.1.1.0/24
+      CidrBlock: !Ref PublicSubnetCIDR
       MapPublicIpOnLaunch: true
       VpcId: !Ref CfVPC
       AvailabilityZone: ap-northeast-1a
@@ -34,7 +34,7 @@ Resources:
   CfPrivateSubnet:
     Type: AWS::EC2::Subnet
     Properties:
-      CidrBlock: 10.1.2.0/24
+      CidrBlock: !Ref PrivateSubnetCIDR
       MapPublicIpOnLaunch: false
       VpcId: !Ref CfVPC
       AvailabilityZone: ap-northeast-1c

From 682536a2918fa84ded6b1f9d1872e1995512af1b Mon Sep 17 00:00:00 2001
From: ymktmk <73768462+ymktmk@users.noreply.github.com>
Date: Mon, 24 Oct 2022 13:47:15 +0900
Subject: [PATCH 3/9] fix

---
 cloudformation/output_changeset_as_markdown.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloudformation/output_changeset_as_markdown.sh b/cloudformation/output_changeset_as_markdown.sh
index 9fba5df..9861604 100644
--- a/cloudformation/output_changeset_as_markdown.sh
+++ b/cloudformation/output_changeset_as_markdown.sh
@@ -8,7 +8,7 @@ create_changeset=`aws cloudformation create-change-set \
                   --change-set-name $changeset_name \
                   --template-body file://$PWD/cloudformation/vpc.yaml`
 
-sleep 10
+sleep 15
 
 changeset_id=$(echo ${create_changeset} | jq -r .Id)
 changeset_json=$(aws cloudformation describe-change-set --change-set-name $changeset_id)

From 8c2b788ff0bbda4d55ff83b21ba4a4f584b2aa2b Mon Sep 17 00:00:00 2001
From: ymktmk <73768462+ymktmk@users.noreply.github.com>
Date: Mon, 24 Oct 2022 13:51:56 +0900
Subject: [PATCH 4/9] fix

---
 cloudformation/vpc.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cloudformation/vpc.yaml b/cloudformation/vpc.yaml
index 5c32b63..4606044 100644
--- a/cloudformation/vpc.yaml
+++ b/cloudformation/vpc.yaml
@@ -3,12 +3,15 @@ AWSTemplateFormatVersion: 2010-09-09
 Parameters:
   VpcCIDR:
     Type: String
+    Default: ''
     # Default: 10.1.0.0/16
   PublicSubnetCIDR:
     Type: String
+    Default: ''
     # Default: 10.1.1.0/24
   PrivateSubnetCIDR:
     Type: String
+    Default: ''
     # Default: 10.1.2.0/24
 
 Resources:

From 32d5de074549bc14463ef26993323b283bfbbc2d Mon Sep 17 00:00:00 2001
From: ymktmk <73768462+ymktmk@users.noreply.github.com>
Date: Mon, 24 Oct 2022 13:59:13 +0900
Subject: [PATCH 5/9] fix

---
 cloudformation/output_changeset_as_markdown.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloudformation/output_changeset_as_markdown.sh b/cloudformation/output_changeset_as_markdown.sh
index 9861604..23a2e96 100644
--- a/cloudformation/output_changeset_as_markdown.sh
+++ b/cloudformation/output_changeset_as_markdown.sh
@@ -15,7 +15,7 @@ changeset_json=$(aws cloudformation describe-change-set --change-set-name $chang
 changes=$(echo "$changeset_json" | jq -r .Changes)
 changes_length=$(echo "$changes" | jq length)
 
-echo "<details><summary><code>$stack_name ($changes_length changes)</code></summary>" # クリックで展開できるやつ
+echo "<summary><code>$stack_name ($changes_length changes)</code></summary>" # クリックで展開できるやつ
 echo
 if [ $changes_length -gt 0 ]; then
 echo '|Action|論理ID|物理ID|リソースタイプ|置換|' # 少しでも横幅を減らすためにActionだけ英語
@@ -35,4 +35,4 @@ echo
 echo '```json'
 echo "$changeset_json"
 echo '```'
-echo '</details></li></ul></details>'
+echo '</details></li></ul>'

From 6a91ee90154cccb226384bd4372c4d31c85740fa Mon Sep 17 00:00:00 2001
From: ymktmk <73768462+ymktmk@users.noreply.github.com>
Date: Mon, 24 Oct 2022 14:02:42 +0900
Subject: [PATCH 6/9] fix

---
 cloudformation/output_changeset_as_markdown.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloudformation/output_changeset_as_markdown.sh b/cloudformation/output_changeset_as_markdown.sh
index 23a2e96..5dbb506 100644
--- a/cloudformation/output_changeset_as_markdown.sh
+++ b/cloudformation/output_changeset_as_markdown.sh
@@ -15,7 +15,7 @@ changeset_json=$(aws cloudformation describe-change-set --change-set-name $chang
 changes=$(echo "$changeset_json" | jq -r .Changes)
 changes_length=$(echo "$changes" | jq length)
 
-echo "<summary><code>$stack_name ($changes_length changes)</code></summary>" # クリックで展開できるやつ
+echo "<code>$stack_name ($changes_length changes)</code>" # クリックで展開できるやつ
 echo
 if [ $changes_length -gt 0 ]; then
 echo '|Action|論理ID|物理ID|リソースタイプ|置換|' # 少しでも横幅を減らすためにActionだけ英語
@@ -30,7 +30,7 @@ for i in $( seq 0 $(($changes_length - 1)) ); do
   echo "|$col_1|$col_2|$col_3|$col_4|$col_5|"
 done
 fi
-echo '<ul><li><details><summary>view json</summary>' # インデントを付ける目的でリストにしている
+echo '<ul><li><details>view json' # インデントを付ける目的でリストにしている
 echo
 echo '```json'
 echo "$changeset_json"

From b663faf52ddba068644ea7c377f7bfe52f28526d Mon Sep 17 00:00:00 2001
From: ymktmk <73768462+ymktmk@users.noreply.github.com>
Date: Mon, 24 Oct 2022 14:05:39 +0900
Subject: [PATCH 7/9] fix

---
 cloudformation/output_changeset_as_markdown.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloudformation/output_changeset_as_markdown.sh b/cloudformation/output_changeset_as_markdown.sh
index 5dbb506..00bacc6 100644
--- a/cloudformation/output_changeset_as_markdown.sh
+++ b/cloudformation/output_changeset_as_markdown.sh
@@ -30,9 +30,9 @@ for i in $( seq 0 $(($changes_length - 1)) ); do
   echo "|$col_1|$col_2|$col_3|$col_4|$col_5|"
 done
 fi
-echo '<ul><li><details>view json' # インデントを付ける目的でリストにしている
+echo '<details>view json' # インデントを付ける目的でリストにしている
 echo
 echo '```json'
 echo "$changeset_json"
 echo '```'
-echo '</details></li></ul>'
+echo '</details>'

From 7f5e913ca180fd4bb481ea94d02acdb365918bbd Mon Sep 17 00:00:00 2001
From: ymktmk <73768462+ymktmk@users.noreply.github.com>
Date: Mon, 24 Oct 2022 14:07:44 +0900
Subject: [PATCH 8/9] fix

---
 cloudformation/output_changeset_as_markdown.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloudformation/output_changeset_as_markdown.sh b/cloudformation/output_changeset_as_markdown.sh
index 00bacc6..f293e70 100644
--- a/cloudformation/output_changeset_as_markdown.sh
+++ b/cloudformation/output_changeset_as_markdown.sh
@@ -15,7 +15,7 @@ changeset_json=$(aws cloudformation describe-change-set --change-set-name $chang
 changes=$(echo "$changeset_json" | jq -r .Changes)
 changes_length=$(echo "$changes" | jq length)
 
-echo "<code>$stack_name ($changes_length changes)</code>" # クリックで展開できるやつ
+echo "<code>$stack_name ($changes_length changes)</code>"
 echo
 if [ $changes_length -gt 0 ]; then
 echo '|Action|論理ID|物理ID|リソースタイプ|置換|' # 少しでも横幅を減らすためにActionだけ英語
@@ -30,7 +30,7 @@ for i in $( seq 0 $(($changes_length - 1)) ); do
   echo "|$col_1|$col_2|$col_3|$col_4|$col_5|"
 done
 fi
-echo '<details>view json' # インデントを付ける目的でリストにしている
+echo '<details>'
 echo
 echo '```json'
 echo "$changeset_json"

From 9f768456f09065b09d633aa07cbec1d2783f706f Mon Sep 17 00:00:00 2001
From: ymktmk <73768462+ymktmk@users.noreply.github.com>
Date: Mon, 24 Oct 2022 16:34:50 +0900
Subject: [PATCH 9/9] fix

---
 cloudformation/vpc.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloudformation/vpc.yaml b/cloudformation/vpc.yaml
index 4606044..2b7670b 100644
--- a/cloudformation/vpc.yaml
+++ b/cloudformation/vpc.yaml
@@ -8,11 +8,11 @@ Parameters:
   PublicSubnetCIDR:
     Type: String
     Default: ''
-    # Default: 10.1.1.0/24
+    # Default: 10.1.3.0/24
   PrivateSubnetCIDR:
     Type: String
     Default: ''
-    # Default: 10.1.2.0/24
+    # Default: 10.1.4.0/24
 
 Resources:
   CfVPC: