tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

replace $cfname variable

Browse Source
This commit is contained in:
Anton Chuchkalov 2016-02-20 17:39:02 +03:00
parent 80ca2d7ad1
commit ac896bc5ab
3 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
devops-service/spec/workers/chef_node_name_builder_spec.rb
View File

@ -1,45 +1,54 @@
require 'workers/stack_bootstrap/chef_node_name_builder' require 'workers/stack_bootstrap/chef_node_name_builder'
RSpec.describe ChefNodeNameBuilder do RSpec.describe ChefNodeNameBuilder do
# real response
let(:server_info) do let(:server_info) do
{ {
'id' => 'server1', "name"=>"stack-achuchkalov-aws-test-1455976199-master01",
'name' => 'server_name', "id"=>"i-fac32c7e",
'key_name' => 'key', "key_name"=>"achuchkalov",
'private_ip' => '127.0.0.1', "private_ip"=>"172.31.11.30",
'public_ip' => '127.0.0.2', "public_ip"=>"52.90.250.51",
'tags' => { "tags" => {
'cid:priority' => '3' "Name"=>"master01",
"aws:cloudformation:logical-id"=>"EC2Instance1",
"aws:cloudformation:stack-name"=>"stack-achuchkalov-aws-test-1455976199",
"StackTemplate"=>"1inst",
"aws:cloudformation:stack-id" => "arn:aws:cloudformation:us-east-1:736558555923:stack/stack-achuchkalov-aws-test-1455976199/d5f3ca60-d7d8-11e5-9ba1-50d5cd24fac6",
"cid:deployEnv"=>"test",
"cid:project"=>"aws",
"cid:user"=>"root",
"cid:priority"=>0
} }
} }
end end
let(:project) { build(:project, id: 'proj', with_deploy_env_identifiers: %w(dev)) } let(:project) { build(:project, id: 'proj', with_deploy_env_identifiers: %w(dev)) }
let(:env) { project.deploy_env('dev') } let(:env) { project.deploy_env('dev') }
let(:name_builder) { described_class.new(server_info, project, env) } let(:build_node_name) {
let(:build_name) { name_builder.build_node_name } described_class.new(server_info, project, env).build_node_name
}
def set_mask(mask) def set_mask(mask)
server_info['tags']['cid:node-name-mask'] = mask server_info['tags']['cid:node-name-mask'] = mask
end end
describe '#build_node_name' do describe '#build_node_name' do
it 'uses default mask ("$project-$nodename-$env")' do it 'uses default mask ("$project-$cfname-$env")' do
expect(build_name).to eq 'proj-server1-dev' expect(build_node_name).to eq 'proj-master01-dev'
end end
it 'substitutes project, env and nodename' do it 'substitutes project, env, instanceid and cfname' do
set_mask('$project/$env/$nodename') set_mask('$project/$env/$instanceid/$cfname')
expect(build_name).to eq 'proj/dev/server1' expect(build_node_name).to eq 'proj/dev/i-fac32c7e/master01'
end end
it 'substitutes $time' do it 'substitutes $time' do
set_mask('$nodename-$time') set_mask('$project-$time')
expect(build_name).to match /server1-\d+/ expect(build_node_name).to match /proj-\d+/
end end
it 'substitutes underscores to dashes' do it 'substitutes underscores to dashes' do
server_info['id'] = 'server_1' server_info['tags']['Name'] = 'server_1'
expect(build_name).to match 'proj-server-1-dev' expect(build_node_name).to match 'proj-server-1-dev'
end end
end end
end end

7
devops-service/spec/workers/stack_servers_persister_spec.rb
View File

@ -15,7 +15,8 @@ RSpec.describe StackServersPersister, stubbed_connector: true do
'private_ip' => '127.0.0.1', 'private_ip' => '127.0.0.1',
'public_ip' => '127.0.0.2', 'public_ip' => '127.0.0.2',
'tags' => { 'tags' => {
'cid:priority' => '3' 'cid:priority' => '3',
'Name' => 'server1'
} }
} }
end end
@ -97,7 +98,7 @@ RSpec.describe StackServersPersister, stubbed_connector: true do
persister.persist persister.persist
end end
it 'build chef_node_name with default mask "$project-$nodename-$env"' do it 'build chef_node_name with default mask "$project-$cfname-$env"' do
expect(stubbed_connector).to receive(:server_insert) do |server| expect(stubbed_connector).to receive(:server_insert) do |server|
expect(server.chef_node_name).to eq 'name-server1-foo' expect(server.chef_node_name).to eq 'name-server1-foo'
end end
@ -105,7 +106,7 @@ RSpec.describe StackServersPersister, stubbed_connector: true do
end end
it "builds chef_node_name with custom mask if info['tags']['cid:node-name-mask'] exists" do it "builds chef_node_name with custom mask if info['tags']['cid:node-name-mask'] exists" do
server_info_hash['tags']['cid:node-name-mask'] = '$project-$nodename-123' server_info_hash['tags']['cid:node-name-mask'] = '$project-$cfname-123'
expect(stubbed_connector).to receive(:server_insert) do |server| expect(stubbed_connector).to receive(:server_insert) do |server|
expect(server.chef_node_name).to eq 'name-server1-123' expect(server.chef_node_name).to eq 'name-server1-123'
end end

7
devops-service/workers/stack_bootstrap/chef_node_name_builder.rb
View File

@ -1,13 +1,16 @@
class ChefNodeNameBuilder class ChefNodeNameBuilder
DEFAULT_MASK = '$project-$cfname-$env'
def initialize(server_info, project, env) def initialize(server_info, project, env)
@server_info, @project, @env = server_info, project, env @server_info, @project, @env = server_info, project, env
@mask = server_info['tags']['cid:node-name-mask'] || '$project-$nodename-$env' @mask = (server_info['tags']['cid:node-name-mask'] || DEFAULT_MASK).dup
end end
def build_node_name def build_node_name
@mask.gsub!('$project', @project.id) @mask.gsub!('$project', @project.id)
@mask.gsub!('$env', @env.identifier) @mask.gsub!('$env', @env.identifier)
@mask.gsub!('$nodename', @server_info['id']) @mask.gsub!('$instanceid', @server_info['id'])
@mask.gsub!('$cfname', @server_info['tags']['Name'] || '')
@mask.gsub!('$time', Time.now.to_i.to_s) @mask.gsub!('$time', Time.now.to_i.to_s)
@mask.gsub!('_', '-') @mask.gsub!('_', '-')
@mask @mask