diff --git a/devops-client/lib/devops-client/handler/stack_template_preset.rb b/devops-client/lib/devops-client/handler/stack_template_preset.rb index 5c95925..a6811cf 100644 --- a/devops-client/lib/devops-client/handler/stack_template_preset.rb +++ b/devops-client/lib/devops-client/handler/stack_template_preset.rb @@ -21,20 +21,44 @@ class StackTemplatePreset < Handler when :show show_handler output + when :build + build_handler end end def show_handler - r = inspect_parameters @options_parser.show_params, @args[2] - unless r.nil? + wrong_params = inspect_parameters(@options_parser.show_params, @args[2]) + if wrong_params @options_parser.invalid_show_command - abort(r) + abort(wrong_params) end @show = get "/stack_template_presets/#{@args[2]}" end def list_handler - @list = get("/stack_template_presets") + @list = get('/stack_template_presets') + end + + def build_handler + wrong_params = inspect_parameters(@options_parser.build_params, @args[2]) + if wrong_params + @options_parser.invalid_build_command + abort(wrong_params) + end + + preset = @args[2] + provider = options[:provider] || resources_selector.select_available_provider + stack_template_id_to_create = options[:stack_template] || enter_parameter(I18n.t('handler.stack_template_preset.create.stack_template')) + parameters = options[:parameters] || enter_hash(I18n.t('handler.stack_template_preset.create.parameters')) + + params = { + id: preset, + provider: provider, + stack_template: stack_template_id_to_create, + parameters: parameters + } + + result = post_body("/stack_template_presets/#{preset}/build_stack_template", JSON.pretty_generate(params)) end end diff --git a/devops-client/lib/devops-client/options/stack_template_preset_options.rb b/devops-client/lib/devops-client/options/stack_template_preset_options.rb index 6f13137..ad52987 100644 --- a/devops-client/lib/devops-client/options/stack_template_preset_options.rb +++ b/devops-client/lib/devops-client/options/stack_template_preset_options.rb @@ -2,7 +2,7 @@ require "devops-client/options/common_options" class StackTemplatePresetOptions < CommonOptions - commands :list, :show + commands :list, :show, :build def initialize args, def_options super(args, def_options) @@ -10,6 +10,26 @@ class StackTemplatePresetOptions < CommonOptions self.banner_header = "stack_template_preset" self.list_params = ["[provider]", "[ec2|openstack]"] self.show_params = ["STACK"] + self.build_params = ["PRESET"] + end + + def build_options + self.options do |parser, options| + parser.banner << self.build_banner + + parser.recognize_option_value(:provider, 'stack') + parser.recognize_option_value(:stack_template, 'stack') + + parser.recognize_option_value(:parameters, 'stack') do |parameters| + begin + hash = JSON.parse(parameters) + options[:parameters] = hash + rescue JSON::ParserError + raise ArgumentError.new('Should be proper JSON string') + end + end + + end end diff --git a/devops-client/locales/en.yml b/devops-client/locales/en.yml index b0fa640..931114f 100644 --- a/devops-client/locales/en.yml +++ b/devops-client/locales/en.yml @@ -118,6 +118,10 @@ en: question: create: "Are you sure to create stack?" delete: "Are you sure to delete stack '%{name}'?" + stack_template_preset: + create: + parameters: Parameters hash as single quoted JSON string + stack_template: 'Name of stack template to build: ' message: choose_list_default: "Choose %{name} (comma separated), like 1,2,3 or empty for default value '%{default}': " choose_list: "Choose %{name} (comma separated), like 1,2,3: " diff --git a/devops-service/lib/stack_template_presets/base.rb b/devops-service/lib/stack_template_presets/base.rb index 90ec310..8f959c6 100644 --- a/devops-service/lib/stack_template_presets/base.rb +++ b/devops-service/lib/stack_template_presets/base.rb @@ -15,9 +15,9 @@ module Devops def build_template_from_preset(provider, stack_template_id, template_attrs) stack_template_attrs = { - id: stack_template_id, - provider: provider, - template_body: serialize(actual_template_hash(template_attrs)) + 'id' => stack_template_id, + 'provider' => provider, + 'template_body' => serialize(actual_template_hash(template_attrs)) } template_model = Model::StackTemplateFactory.create(provider, stack_template_attrs) end @@ -37,9 +37,9 @@ module Devops end def actual_template_hash(template_attrs) - actual = template_preset_body.dup + actual = template_preset_hash.dup template_attrs.each do |key, value| - path = param_attrs_pathes_in_preset[key.to_sym] + path = param_attrs_pathes_in_preset[key.to_s] next unless path insert_value_at(actual, value, path) end diff --git a/devops-service/lib/stack_template_presets/factory.rb b/devops-service/lib/stack_template_presets/factory.rb index 2feaeae..f3cb3ad 100644 --- a/devops-service/lib/stack_template_presets/factory.rb +++ b/devops-service/lib/stack_template_presets/factory.rb @@ -1,5 +1,6 @@ require_relative 'base' require_relative 'postgres_cluster' +require_relative 'preset_not_found' class Devops::StackTemplatePresetsFactory @@ -14,7 +15,9 @@ class Devops::StackTemplatePresetsFactory end def self.get(id) - list.detect { |preset| preset.id == id } + preset = list.detect { |preset| preset.id == id } + raise PresetNotFound, "Preset '#{preset}' not found" unless preset + preset end end \ No newline at end of file diff --git a/devops-service/lib/stack_template_presets/postgres_cluster.json b/devops-service/lib/stack_template_presets/postgres_cluster.json index a02461a..4a2e98f 100644 --- a/devops-service/lib/stack_template_presets/postgres_cluster.json +++ b/devops-service/lib/stack_template_presets/postgres_cluster.json @@ -1,137 +1,5 @@ { - "AWSTemplateFormatVersion" : "2010-09-09", - - "Description" : "AWS CloudFormation Sample Template EC2InstanceWithSecurityGroupSample: Create an Amazon EC2 instance running the Amazon Linux AMI. The AMI is chosen based on the region in which the stack is run. This example creates an EC2 security group for the instance to give you SSH access. **WARNING** This template creates an Amazon EC2 instance. You will be billed for the AWS resources used if you create a stack from this template.", - - "Parameters" : { - "KeyName": { - "Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instance", - "Type": "AWS::EC2::KeyPair::KeyName", - "ConstraintDescription" : "must be the name of an existing EC2 KeyPair." - }, - - "InstanceType" : { - "Description" : "WebServer EC2 instance type", - "Type" : "String", - "Default" : "m1.small", - "AllowedValues" : [ "t1.micro", "t2.micro", "t2.small", "t2.medium", "m1.small", "m1.medium", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "m3.medium", "m3.large", "m3.xlarge", "m3.2xlarge", "c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", "g2.2xlarge", "r3.large", "r3.xlarge", "r3.2xlarge", "r3.4xlarge", "r3.8xlarge", "i2.xlarge", "i2.2xlarge", "i2.4xlarge", "i2.8xlarge", "hi1.4xlarge", "hs1.8xlarge", "cr1.8xlarge", "cc2.8xlarge", "cg1.4xlarge"] -, - "ConstraintDescription" : "must be a valid EC2 instance type." - }, - - "SSHLocation" : { - "Description" : "The IP address range that can be used to SSH to the EC2 instances", - "Type": "String", - "MinLength": "9", - "MaxLength": "18", - "Default": "0.0.0.0/0", - "AllowedPattern": "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})", - "ConstraintDescription": "must be a valid IP CIDR range of the form x.x.x.x/x." - } - }, - - "Mappings" : { - "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "PV64" }, - "t2.micro" : { "Arch" : "HVM64" }, - "t2.small" : { "Arch" : "HVM64" }, - "t2.medium" : { "Arch" : "HVM64" }, - "m1.small" : { "Arch" : "PV64" }, - "m1.medium" : { "Arch" : "PV64" }, - "m1.large" : { "Arch" : "PV64" }, - "m1.xlarge" : { "Arch" : "PV64" }, - "m2.xlarge" : { "Arch" : "PV64" }, - "m2.2xlarge" : { "Arch" : "PV64" }, - "m2.4xlarge" : { "Arch" : "PV64" }, - "m3.medium" : { "Arch" : "HVM64" }, - "m3.large" : { "Arch" : "HVM64" }, - "m3.xlarge" : { "Arch" : "HVM64" }, - "m3.2xlarge" : { "Arch" : "HVM64" }, - "c1.medium" : { "Arch" : "PV64" }, - "c1.xlarge" : { "Arch" : "PV64" }, - "c3.large" : { "Arch" : "HVM64" }, - "c3.xlarge" : { "Arch" : "HVM64" }, - "c3.2xlarge" : { "Arch" : "HVM64" }, - "c3.4xlarge" : { "Arch" : "HVM64" }, - "c3.8xlarge" : { "Arch" : "HVM64" }, - "c4.large" : { "Arch" : "HVM64" }, - "c4.xlarge" : { "Arch" : "HVM64" }, - "c4.2xlarge" : { "Arch" : "HVM64" }, - "c4.4xlarge" : { "Arch" : "HVM64" }, - "c4.8xlarge" : { "Arch" : "HVM64" }, - "g2.2xlarge" : { "Arch" : "HVMG2" }, - "r3.large" : { "Arch" : "HVM64" }, - "r3.xlarge" : { "Arch" : "HVM64" }, - "r3.2xlarge" : { "Arch" : "HVM64" }, - "r3.4xlarge" : { "Arch" : "HVM64" }, - "r3.8xlarge" : { "Arch" : "HVM64" }, - "i2.xlarge" : { "Arch" : "HVM64" }, - "i2.2xlarge" : { "Arch" : "HVM64" }, - "i2.4xlarge" : { "Arch" : "HVM64" }, - "i2.8xlarge" : { "Arch" : "HVM64" }, - "hi1.4xlarge" : { "Arch" : "HVM64" }, - "hs1.8xlarge" : { "Arch" : "HVM64" }, - "cr1.8xlarge" : { "Arch" : "HVM64" }, - "cc2.8xlarge" : { "Arch" : "HVM64" } - } -, - "AWSRegionArch2AMI" : { - "us-east-1" : {"PV64" : "ami-50311038", "HVM64" : "ami-5231103a", "HVMG2" : "ami-8c6b40e4"}, - "us-west-2" : {"PV64" : "ami-5d79546d", "HVM64" : "ami-43795473", "HVMG2" : "ami-abbe919b"}, - "us-west-1" : {"PV64" : "ami-eb4fa8af", "HVM64" : "ami-f74fa8b3", "HVMG2" : "ami-f31ffeb7"}, - "eu-west-1" : {"PV64" : "ami-a71588d0", "HVM64" : "ami-a51588d2", "HVMG2" : "ami-d5bc24a2"}, - "eu-central-1" : {"PV64" : "ami-ac5c61b1", "HVM64" : "ami-a25c61bf", "HVMG2" : "ami-7cd2ef61"}, - "ap-northeast-1" : {"PV64" : "ami-8d1df78d", "HVM64" : "ami-a51df7a5", "HVMG2" : "ami-6318e863"}, - "ap-southeast-1" : {"PV64" : "ami-887041da", "HVM64" : "ami-5e73420c", "HVMG2" : "ami-3807376a"}, - "ap-southeast-2" : {"PV64" : "ami-bb1e6e81", "HVM64" : "ami-ad1e6e97", "HVMG2" : "ami-89790ab3"}, - "sa-east-1" : {"PV64" : "ami-29aa1234", "HVM64" : "ami-27aa123a", "HVMG2" : "NOT_SUPPORTED"}, - "cn-north-1" : {"PV64" : "ami-503aa869", "HVM64" : "ami-543aa86d", "HVMG2" : "NOT_SUPPORTED"} - } - - }, - - "Resources" : { - "EC2Instance" : { - "Type" : "AWS::EC2::Instance", - "Properties" : { - "InstanceType" : { "Ref" : "InstanceType" }, - "SecurityGroups" : [ { "Ref" : "InstanceSecurityGroup" } ], - "KeyName" : { "Ref" : "KeyName" }, - "ImageId" : { "Fn::FindInMap" : [ "AWSRegionArch2AMI", { "Ref" : "AWS::Region" }, - { "Fn::FindInMap" : [ "AWSInstanceType2Arch", { "Ref" : "InstanceType" }, "Arch" ] } ] } - } - }, - - "InstanceSecurityGroup" : { - "Type" : "AWS::EC2::SecurityGroup", - "Properties" : { - "GroupDescription" : "Enable SSH access via port 22", - "SecurityGroupIngress" : [ { - "IpProtocol" : "tcp", - "FromPort" : "22", - "ToPort" : "22", - "CidrIp" : { "Ref" : "SSHLocation"} - } ] - } - } - }, - - "Outputs" : { - "InstanceId" : { - "Description" : "InstanceId of the newly created EC2 instance", - "Value" : { "Ref" : "EC2Instance" } - }, - "AZ" : { - "Description" : "Availability Zone of the newly created EC2 instance", - "Value" : { "Fn::GetAtt" : [ "EC2Instance", "AvailabilityZone" ] } - }, - "PublicDNS" : { - "Description" : "Public DNSName of the newly created EC2 instance", - "Value" : { "Fn::GetAtt" : [ "EC2Instance", "PublicDnsName" ] } - }, - "PublicIP" : { - "Description" : "Public IP address of the newly created EC2 instance", - "Value" : { "Fn::GetAtt" : [ "EC2Instance", "PublicIp" ] } - } + "template": { + "users_count": null } } diff --git a/devops-service/lib/stack_template_presets/postgres_cluster.rb b/devops-service/lib/stack_template_presets/postgres_cluster.rb index 28f7255..fec48ca 100644 --- a/devops-service/lib/stack_template_presets/postgres_cluster.rb +++ b/devops-service/lib/stack_template_presets/postgres_cluster.rb @@ -1,4 +1,9 @@ module Devops::StackTemplatePresets class PostgresCluster < Base + def param_attrs_pathes_in_preset + { + 'users_count' => %w(template users_count) + } + end end end \ No newline at end of file diff --git a/devops-service/lib/stack_template_presets/preset_not_found.rb b/devops-service/lib/stack_template_presets/preset_not_found.rb new file mode 100644 index 0000000..5b28c4d --- /dev/null +++ b/devops-service/lib/stack_template_presets/preset_not_found.rb @@ -0,0 +1,3 @@ +class PresetNotFound < StandardError + +end \ No newline at end of file diff --git a/devops-service/routes/v2.0/handlers/stack_template_preset.rb b/devops-service/routes/v2.0/handlers/stack_template_preset.rb index 666dbae..5082102 100644 --- a/devops-service/routes/v2.0/handlers/stack_template_preset.rb +++ b/devops-service/routes/v2.0/handlers/stack_template_preset.rb @@ -21,14 +21,16 @@ module Devops end def self.build_stack_template - lamda { + lambda { # check_privileges("stack_template_presets", "r") check_privileges('stack_template', 'w') attrs = create_object_from_json_body - provider = attrs.delete('provider') - stack_template_id = attrs.delete('stack_template_id') - stack_template = build_template_from_preset(provider, stack_template_id, attrs) + + provider, stack_template, parameters = attrs.fetch('provider'), attrs.fetch('stack_template'), attrs.fetch('parameters') + + preset = Devops::StackTemplatePresetsFactory.get(attrs.fetch('id')) + template_model = preset.build_template_from_preset(provider, stack_template, parameters) settings.mongo.stack_template_insert(template_model) create_response 'Created', template_model.to_hash, 201