Skip to content

Commit

Permalink
Merge pull request #348 from inokappa/db_parameter_group_fix_typo
Browse files Browse the repository at this point in the history
fixed typo
  • Loading branch information
k1LoW authored Feb 5, 2018
2 parents b0a854c + 2a00598 commit c8816e6
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions lib/awspec/command/generate.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ def s3_bucket(bucket_name = nil)
)

types.each do |type|
desc type + ' [paramater_name]', "Generate #{type} spec from paramater name."
define_method type do |_paramater_name|
desc type + ' [parameter_group_name]', "Generate #{type} spec from parameter group name."
define_method type do |_parameter_group_name|
Awsecrets.load(profile: options[:profile], region: options[:region], secrets_path: options[:secrets_path])
eval "puts Awspec::Generator::Spec::#{type.camelize}.new.generate_by_paramater_group(_paramater_name)"
eval "puts Awspec::Generator::Spec::#{type.camelize}.new.generate_by_parameter_group(_parameter_group_name)"
end
end

Expand Down
8 changes: 4 additions & 4 deletions lib/awspec/generator/spec/rds_db_cluster_parameter_group.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ module Awspec::Generator
module Spec
class RdsDbClusterParameterGroup
include Awspec::Helper::Finder
def generate_by_paramater_group(paramater_group)
@paramater_group = paramater_group
res = select_all_rds_db_cluster_parameters(@paramater_group)
def generate_by_parameter_group(parameter_group)
@parameter_group = parameter_group
res = select_all_rds_db_cluster_parameters(@parameter_group)
ERB.new(db_cluster_parameter_group_template, nil, '-').result(binding).gsub(/^\n/, '')
end

def db_cluster_parameter_group_template
template = <<-'EOF'
describe rds_db_cluster_parameter_group('<%= @paramater_group %>') do
describe rds_db_cluster_parameter_group('<%= @parameter_group %>') do
<% res.each do |key, value| %>
its('<%= key %>') { should eq '<%= value %>' }
<% end %>
Expand Down
12 changes: 6 additions & 6 deletions lib/awspec/generator/spec/rds_db_parameter_group.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ module Awspec::Generator
module Spec
class RdsDbParameterGroup
include Awspec::Helper::Finder
def generate_by_paramater_group(paramater_group)
@paramater_group = paramater_group
res = select_all_rds_db_parameters(@paramater_group)
ERB.new(db_paramater_group_template, nil, '-').result(binding).gsub(/^\n/, '')
def generate_by_parameter_group(parameter_group)
@parameter_group = parameter_group
res = select_all_rds_db_parameters(@parameter_group)
ERB.new(db_parameter_group_template, nil, '-').result(binding).gsub(/^\n/, '')
end

def db_paramater_group_template
def db_parameter_group_template
template = <<-'EOF'
describe rds_db_parameter_group('<%= @paramater_group %>') do
describe rds_db_parameter_group('<%= @parameter_group %>') do
<% res.each do |key, value| %>
its('<%= key %>') { should eq '<%= value %>' }
<% end %>
Expand Down
8 changes: 4 additions & 4 deletions lib/awspec/helper/finder/rds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ def select_rds_by_vpc_id(vpc_id)
end
end

def select_all_rds_db_parameters(paramater_group)
def select_all_rds_db_parameters(parameter_group)
parameters = {}
res = rds_client.describe_db_parameters({
db_parameter_group_name: paramater_group
db_parameter_group_name: parameter_group
})
loop do
res.parameters.each do |param|
Expand All @@ -35,10 +35,10 @@ def select_all_rds_db_parameters(paramater_group)
parameters
end

def select_all_rds_db_cluster_parameters(paramater_group)
def select_all_rds_db_cluster_parameters(parameter_group)
parameters = {}
res = rds_client.describe_db_cluster_parameters({
db_cluster_parameter_group_name: paramater_group
db_cluster_parameter_group_name: parameter_group
})
loop do
res.parameters.each do |param|
Expand Down

0 comments on commit c8816e6

Please sign in to comment.