Skip to content

repeated services caused incorrect snippet #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
r2oro wants to merge 2 commits into
base: master
Choose a base branch
from
Open

repeated services caused incorrect snippet #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3efc4a
reworked snippet generation for repeated services
arpi-scalr May 21, 2018
46bd034
made rubocop happier
arpi-scalr May 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions lib/generate-grammars.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ def parse_service_map
chars = policies[index..-1].split ''
# Pull the following object
obj = []
lb=rb=0
lb = rb = 0
chars.each do |c|
lb += 1 if c== '{'
rb += 1 if c== '}'
lb += 1 if c == '{'
rb += 1 if c == '}'
obj.push c
break if lb>0 and lb==rb
break if (lb > 0) && (lb == rb)
end
# Turn Javascript Object into JSON (FML -- can't aws just give us the JSON?)
service_map = obj.join.gsub(/\s/, '')
Expand All @@ -34,10 +34,10 @@ def parse_service_map
JSON.load(service_map)
end

def generate_grammar service_map
def generate_grammar(service_map)
# extract fields
cson = File.read './policy.cson'
service_count = service_map['serviceMap'].keys.length
# service_count = service_map['serviceMap'].keys.length

# Get Services
prefixes = service_map['serviceMap'].values.collect { |v| v['StringPrefix'] }
Expand All @@ -46,16 +46,15 @@ def generate_grammar service_map
puts service_list

# Get Actions
actions = service_map['serviceMap'].values.collect {|v|v['Actions']}.flatten
actions = service_map['serviceMap'].values.collect { |v| v['Actions'] }.flatten
action_list = actions.join('|').downcase
cson.gsub! '{{ACTION_LIST}}', action_list
puts action_list

File.write '../grammars/generated-policy.cson', cson
end

def get_service_snippet service, actions

def get_service_snippet(service, actions)
snippet = []
snippet.push " 'All #{service} Actions':"
snippet.push " 'prefix': '#{service}:'"
Expand All @@ -67,13 +66,18 @@ def get_service_snippet service, actions
snippet.join "\n"
end

def generate_snippets service_map

def generate_snippets(service_map)
cson = File.read './snippets.cson'

actions_for_service = {}
service_map['serviceMap'].keys.each do |k|
service = service_map['serviceMap'][k]['StringPrefix']
actions = service_map['serviceMap'][k]['Actions']
actions_for_service[service] = [] if actions_for_service[service].nil?
actions_for_service[service].concat actions
end

actions_for_service.each do |service, actions|
snippet = get_service_snippet service, actions
cson += snippet
end
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "iam-syntax",
"author": "Rob Witoff <twitter.com/rwitoff>",
"version": "0.1.5",
"version": "0.1.6",
"description": "Syntax Highlighting for IAM Policies",
"repository": "git@github.com:witoff/atom-iam-syntax.git",
"keywords": [
Expand Down