cfndk 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32c22522a1cc1e7dfc9ca0aba8493db5f8db8eb8
-  data.tar.gz: 769e02185ab86037a82889853ecfd93c3a3f912a
+  metadata.gz: b3c4548d36709c0c878369059819c9c458907a90
+  data.tar.gz: 2174f779691dfcf915aa1c6385c77b86556ca8eb
 SHA512:
-  metadata.gz: 0d53377bb67a1f2b93a161353172b9984ec462f3ea430867b69ccd88cac81e237d4832fc247f6c7e83f16481636e45e79f9f6c80c7d95ea7e8adc6b6ffd10627
-  data.tar.gz: 891db997bc6e5c174592f4fc6c98cd8b54572422417244ba7789b5d15228fba9dc0fd8cdc5e8429f3042725c27de88aa5f398de98469c40a9966fbb8d8721003
+  metadata.gz: 2922c25d64ec5264c56aad0488945bf24513e3d8cdae007c936494cf6fd96283a514b16a3c9bb91a3cc0cf82c8f0a614c4c6cf3adbed1c21f9701b5f95ae571f
+  data.tar.gz: e141aa53962fc3c3fd80f4f532583b90acef8f09429a841186973efb82c2947adbd06ac12c5f4d9fc7d4655a523d2d3d3f54cd0255cb095865cc654629cc3ae4

data/README.md

@@ -138,11 +138,11 @@ cfndk report-stack-resource [option]
 
 実行時に詳細な情報を表示します。
 
-#### ```-c, --config_path <cfndi.yml>```
+#### ```-c, --config_path cfndi.yml```
 
 カレントディレクトリのcfndi.ymlの代わりに、ファイルを指定します。
 
-#### ```-p, --properties <name>=<value>```
+#### ```-p, --properties name=value```
 
 プロパティを追加します。
 cfndi.ymlのparametersのerb内で値で参照することができます。
@@ -154,13 +154,24 @@ UUIDが指定されるとスタック名に付加されます。
 またcfndi.ymlのparametersの値で参照することができます。
 ```-a```と```-u```は最後に指定されたものが有効になります。
 
-####  ```-u, --uuid <uuid>```
+####  ```-u, --uuid uuid```
 
 指定されたUUIDを使用します。
 UUIDが指定されるとスタック名に付加されます。
 またcfndi.ymlのparametersの値で参照することができます。
 ```-a```と```-u```は最後に指定されたものが有効になります。
 
+#### ```-s, --stack-names name1,name2```
+
+create,update,destroy,create_or_changesetのコマンドで、指定されたスタック名のみを操作します。
+
+#### ```--no-color```
+
+メッセージ出力でカラーを抑制します。
+
+### ```-f, --force```
+
+動作の確認メッセージと入力をスキップします。
 
 ## 環境変数
 

data/bin/cfndk

@@ -15,6 +15,20 @@ require 'securerandom'
 
 require 'cfndk.rb'
 
+def do_destroy(option)
+  return true if option[:force]
+  loop do
+    print 'destroy? [yes|no]:'
+    res = STDIN.gets
+    case res
+    when /^yes/
+      return true
+    when /^no/, /^$/
+      return false
+    end
+  end
+end
+
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
 cur_dir = Dir.getwd
@@ -23,12 +37,14 @@ option = {
   config_path: "#{cur_dir}/cfndk.yml",
   uuid: ENV['CFNDK_UUID'] || nil,
   properties: {},
+  stack_names: nil,
+  force: false,
 }
 
 opt = OptionParser.new do |o|
   o.version = CFnDK::VERSION
   o.summary_indent = ' ' * 4
-  o.banner = 'Usage: cfndk [cmd] [options]'
+  o.banner = "Version: #{CFnDK::VERSION} \nUsage: cfndk [cmd] [options]"
   o.on_head('[cmd]',
             '    init                  create config YAML file',
             '    create                create stacks',
@@ -49,8 +65,8 @@ opt = OptionParser.new do |o|
             "    AWS_CONTAINER_CREDENTIALS_RELATIVE_URI: #{ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI']}",
             '[options]')
   o.on('-v', '--verbose', 'verbose mode') { |v| option[:v] = v }
-  o.on('-c', '--config_path <cfndi.yml>', "config path (default: #{option[:config_path]})") { |v| option[:config_path] = v }
-  o.on('-p', '--properties <name>=<value>', 'properties') do |v|
+  o.on('-c', '--config_path cfndi.yml', "config path (default: #{option[:config_path]})") { |v| option[:config_path] = v }
+  o.on('-p', '--properties name=value', 'properties') do |v|
     md = v.match(/^([a-zA-Z_]+[a-zA-Z0-9_]*)=(.*)$/)
     if md
       option[:properties][md[0]] = md[1]
@@ -59,7 +75,10 @@ opt = OptionParser.new do |o|
     end
   end
   o.on('-a', '--auto-uuid') { option[:uuid] = SecureRandom.uuid }
-  o.on('-u', '--uuid <uuid>') { |v| option[:uuid] = v }
+  o.on('-u', '--uuid uuid') { |v| option[:uuid] = v }
+  o.on('-n', '--stack-names name1,name2') { |v| option[:stack_names] = v.split(/\s*,\s*/) }
+  o.on('--no-color') { |b| Rainbow.enabled = false }
+  o.on('-f', '--force') { |b| option[:force] = true }
   o.permute!(ARGV)
 end
 
@@ -92,18 +111,23 @@ keypairs = CFnDK::KeyPairs.new(data, option, credentials)
 
 if ARGV[0] == 'create'
   puts 'create...'.color :green
+  stacks.validate
   keypairs.create
   stacks.create
 elsif ARGV[0] == 'update'
   puts 'update...'.color :green
+  stacks.validate
   stacks.update
 elsif ARGV[0] == 'create-or-changeset'
   puts 'create or changeset...'.color :green
+  stacks.validate
   stacks.create_or_changeset
 elsif ARGV[0] == 'destroy'
   puts 'destroy...'.color :green
-  stacks.destroy
-  keypairs.destroy
+  if do_destroy(option)
+    stacks.destroy
+    keypairs.destroy
+  end
 elsif ARGV[0] == 'validate'
   puts 'validate...'.color :green
   stacks.validate

data/lib/cfndk/key_pairs.rb

@@ -7,10 +7,12 @@ module CFnDK
     end
 
     def create
+      return if @option[:stack_names].instance_of?(Array)
       @keypairs.each_value(&:create)
     end
 
     def destroy
+      return if @option[:stack_names].instance_of?(Array)
       @keypairs.each_value(&:destroy)
     end
 

data/lib/cfndk/stacks.rb

@@ -8,9 +8,9 @@ module CFnDK
     end
 
     def create
-      validate
       @sequence.each do |stacks|
         stacks.each do |name|
+          next if @option[:stack_names].instance_of?(Array) && !@option[:stack_names].include?(name)
           puts(('creating ' + name).color(:green))
           puts('Name        :' + @stacks[name].name) if @option[:v]
           puts('Parametres  :' + @stacks[name].parameters.inspect) if @option[:v]
@@ -25,6 +25,7 @@ module CFnDK
           )
         end
         stacks.each do |name|
+          next if @option[:stack_names].instance_of?(Array) && !@option[:stack_names].include?(name)
           begin
             @cfn_client.wait_until(
               :stack_create_complete,
@@ -41,10 +42,10 @@ module CFnDK
     end
 
     def update
-      validate
       @sequence.each do |stacks|
         updating_stacks = []
         stacks.each do |name|
+          next if @option[:stack_names].instance_of?(Array) && !@option[:stack_names].include?(name)
           puts(('updating ' + name).color(:green))
           puts('Name        :' + @stacks[name].name) if @option[:v]
           puts('Parametres  :' + @stacks[name].parameters.inspect) if @option[:v]
@@ -63,6 +64,7 @@ module CFnDK
           end
         end
         updating_stacks.each do |name|
+          next if @option[:stack_names].instance_of?(Array) && !@option[:stack_names].include?(name)
           @cfn_client.wait_until(
             :stack_update_complete,
             stack_name: @stacks[name].name
@@ -73,11 +75,11 @@ module CFnDK
     end
 
     def create_or_changeset
-      validate
       @sequence.each do |stacks|
         create_stacks = []
         changeset_stacks = []
         stacks.each do |name|
+          next if @option[:stack_names].instance_of?(Array) && !@option[:stack_names].include?(name)
           begin
             @cfn_client.describe_stacks(
               stack_name: @stacks[name].name
@@ -111,6 +113,7 @@ module CFnDK
           end
         end
         create_stacks.each do |name|
+          next if @option[:stack_names].instance_of?(Array) && !@option[:stack_names].include?(name)
           @cfn_client.wait_until(
             :stack_create_complete,
             stack_name: @stacks[name].name
@@ -118,6 +121,7 @@ module CFnDK
           puts(('created ' + name).color(:green))
         end
         changeset_stacks.each do |name|
+          next if @option[:stack_names].instance_of?(Array) && !@option[:stack_names].include?(name)
           begin
             @cfn_client.wait_until(
               :change_set_create_complete,
@@ -266,6 +270,7 @@ module CFnDK
     def destroy
       @sequence.reverse_each do |stacks|
         stacks.each do |name|
+          next if @option[:stack_names].instance_of?(Array) && !@option[:stack_names].include?(name)
           puts(('deleting ' + name).color(:green))
           puts('Name        :' + @stacks[name].name) if @option[:v]
           @cfn_client.delete_stack(
@@ -273,6 +278,7 @@ module CFnDK
           )
         end
         stacks.each do |name|
+          next if @option[:stack_names].instance_of?(Array) && !@option[:stack_names].include?(name)
           @cfn_client.wait_until(
             :stack_delete_complete,
             stack_name: @stacks[name].name
@@ -285,6 +291,7 @@ module CFnDK
     def validate
       @sequence.each do |stacks|
         stacks.each do |name|
+          next if @option[:stack_names].instance_of?(Array) && !@option[:stack_names].include?(name)
           puts(('validate ' + name).color(:green))
           puts('Name        :' + @stacks[name].name) if @option[:v]
           @cfn_client.validate_template(

data/lib/cfndk/version.rb

@@ -1,3 +1,3 @@
 module CFnDK
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

data/sample/cfndk.yml

@@ -41,6 +41,16 @@ stacks:
       - CFnDKSampleSg
       - CFnDKSampleIam
     timeout_in_minutes: 2
+  CFnDKSampleElb:
+    template_file: elb/elb.yaml
+    parameter_input: elb/prod.json
+    parameters:
+      VpcName: Sample<%= append_uuid %>
+      InternalDnsName: sample<%= append_uuid %>.local
+    depends:
+      - CFnDKSampleWeb
+      - CFnDKSampleSg
+    timeout_in_minutes: 5
   CFnDKSampleDb:
     template_file: db/db.yaml
     parameter_input: db/prod.json

data/sample/elb/elb.yaml

@@ -1,8 +1,77 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Description: ELB Stack
-
 Parameters:
-
+  VpcName:
+    Description: Name for this VPC
+    Type: String
+  InternalDnsName:
+    Description: Internal DNS name
+    Type: String
+  Environment:
+    Description: Name for this Environment
+    Type: String
+  WebElbHostName:
+    Description: Local DNS Name for ELB
+    Type: String
 Resources:
-  
-Outputs:
+  WebLoadBalancer:
+    Type: "AWS::ElasticLoadBalancingV2::LoadBalancer"
+    Properties:
+      Type: application
+      Scheme: internet-facing
+      Subnets:
+      - Fn::ImportValue: !Sub ${VpcName}-${Environment}-Public-Subnet1
+      - Fn::ImportValue: !Sub ${VpcName}-${Environment}-Public-Subnet2
+      SecurityGroups:
+      - Fn::ImportValue: !Sub ${VpcName}-${Environment}-Web-ElbSg
+      Tags:
+      - Key: Name
+        Value: !Sub ${VpcName}-${Environment}-Web-Elb
+  WebLoadBalancerRecordSet:
+    Type: AWS::Route53::RecordSet
+    Properties:
+      HostedZoneId:
+        Fn::ImportValue: !Sub ${VpcName}-InternalDns
+      Comment: DNS name for ELB
+      Name:
+        !Join
+          - '.'
+          - - !Ref WebElbHostName
+            - Fn::ImportValue: !Sub ${VpcName}-InternalDnsName
+      Type: CNAME
+      TTL: '60'
+      ResourceRecords:
+      - !GetAtt WebLoadBalancer.DNSName        
+  WebTargetGroup:
+    Type: AWS::ElasticLoadBalancingV2::TargetGroup
+    Properties:
+      HealthCheckIntervalSeconds: 30
+      HealthCheckPath: /
+      HealthCheckPort: "80"
+      HealthCheckProtocol: HTTP
+      HealthCheckTimeoutSeconds: 5
+      HealthyThresholdCount: 2
+      Port: 80
+      Protocol: HTTP
+      UnhealthyThresholdCount: 5
+      VpcId:
+        Fn::ImportValue: !Sub ${VpcName}-VpcId
+      Targets:
+      - Id: 
+          Fn::ImportValue: !Sub ${VpcName}-${Environment}-Web1
+        Port: 80
+      - Id: 
+          Fn::ImportValue: !Sub ${VpcName}-${Environment}-Web2
+        Port: 80
+      Tags:
+      - Key: Name
+        Value: !Sub ${VpcName}-Web-Tg  
+  WebListener:
+    Type: AWS::ElasticLoadBalancingV2::Listener
+    Properties:
+      DefaultActions:
+      - Type: forward
+        TargetGroupArn: !Ref WebTargetGroup
+      LoadBalancerArn: !Ref WebLoadBalancer
+      Port: 80
+      Protocol: HTTP

data/sample/elb/prod.json

@@ -0,0 +1,20 @@
+{
+  "Parameters": [
+      {
+          "ParameterKey": "VpcName",
+          "ParameterValue": "sample"
+      },
+      {
+          "ParameterKey": "Environment",
+          "ParameterValue": "Prod"
+      },
+      {
+          "ParameterKey": "WebElbHostName",
+          "ParameterValue": "elb"
+      },
+      {
+        "ParameterKey": "InternalDnsName",
+        "ParameterValue": "sample.local"
+      }
+  ]
+}

data/sample/sg/prod.json

@@ -3,6 +3,10 @@
       {
           "ParameterKey": "VpcName",
           "ParameterValue": "sample"
-      }
+      },
+      {
+        "ParameterKey": "Environment",
+        "ParameterValue": "Prod"
+      }      
   ]
 }

data/sample/sg/sg.yaml

@@ -4,7 +4,31 @@ Parameters:
   VpcName:
     Description: Name for this VPC
     Type: String
+  Environment:
+    Description: Name for this Environment
+    Type: String
 Resources:
+  WebElbSg:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupName: !Sub ${VpcName}-Web-Elb-Sg
+      GroupDescription: Web ELB Acccess Security Group
+      VpcId:
+        Fn::ImportValue: !Sub ${VpcName}-VpcId
+      SecurityGroupIngress:
+      - IpProtocol: tcp
+        FromPort: 80
+        ToPort: 80
+        CidrIp: 0.0.0.0/0
+        Description: Allow HTTP Access From Internet
+      - IpProtocol: tcp
+        FromPort: 443
+        ToPort: 443
+        CidrIp: 0.0.0.0/0
+        Description: Allow HTTPS Access From Internet
+      Tags:
+      - Key: Name
+        Value: !Sub ${VpcName}-Web-Elb-Sg
   WebInstanceSg:
     Type: AWS::EC2::SecurityGroup
     Properties:
@@ -13,16 +37,11 @@ Resources:
       VpcId:
         Fn::ImportValue: !Sub ${VpcName}-VpcId
       SecurityGroupIngress:
-      - IpProtocol: tcp
-        FromPort: 22
-        ToPort: 22
-        CidrIp: 0.0.0.0/0
-        Description: Allow SSH Access From Internet
       - IpProtocol: tcp
         FromPort: 80
         ToPort: 80
-        CidrIp: 0.0.0.0/0
-        Description: Allow HTTP Access From Internet
+        SourceSecurityGroupId: !Ref WebElbSg
+        Description: Allow HTTP Access From ELB
       Tags:
       - Key: Name
         Value: !Sub ${VpcName}-Web-Instance-Sg
@@ -39,6 +58,11 @@ Resources:
           ToPort: 3306
           SourceSecurityGroupId: !Ref WebInstanceSg
 Outputs:
+  WebElbSg:
+    Description: ELB Security Group ID
+    Value: !Ref WebElbSg
+    Export:
+      Name: !Sub ${VpcName}-${Environment}-Web-ElbSg
   WebInstanceSg:
     Description: WebInstance Security Group ID
     Value: !Ref WebInstanceSg
@@ -48,4 +72,4 @@ Outputs:
     Description: Db Security Group ID
     Value: !Ref DbSg
     Export:
-      Name: !Sub ${VpcName}-DbSg
+      Name: !Sub ${VpcName}-DbSg

data/sample/web/web.yaml

@@ -129,4 +129,15 @@ Resources:
       Dimensions:
       - Name: InstanceId
         Value: !Ref Web2Instance
-    DependsOn: Web2Instance   
+    DependsOn: Web2Instance
+Outputs:
+  Web1Instance:
+    Description: EC2 ID
+    Value: !Ref Web1Instance
+    Export:
+      Name: !Sub ${VpcName}-${Environment}-Web1
+  Web2Instance:
+    Description: EC2 ID
+    Value: !Ref Web2Instance
+    Export:
+      Name: !Sub ${VpcName}-${Environment}-Web2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndk
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yoshihisa AMAKATA