Skip to content

Commit

Permalink
Merge pull request #74 from CDLUC3/ssm
Browse files Browse the repository at this point in the history 
SSM Migration and Other Dependencies
  • Loading branch information
@terrywbrady
terrywbrady authored Sep 8, 2020
2 parents 8bf8f87 + cc5a011 commit cccbbac
Show file tree
Hide file tree
Showing 44 changed files with 393 additions and 285 deletions.
4 changes: 1 addition & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ public/assets/*.js
public/assets/*.css
public/assets/*.gz
public/assets/.sprockets*
public/assets/wztip

.config-secret

Expand All @@ -26,9 +27,6 @@ mrt-dashboard_production
console
help/*
sqlite/*
config/atom.yml
config/ldap.yml
config/database.yml
db/schema.rb
.DS_Store
.project
Expand Down
9 changes: 8 additions & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ source 'http://rubygems.org'
gem 'activeresource'
gem 'multi_json'
gem 'mysql2', '~> 0.4.0' # TODO: update to 0.5 once we're on a Rails that supports it
gem 'rails', '~> 4.2.10'
gem 'rails', '~> 4.2.11'

gem 'aws-sdk-ec2'
gem 'aws-sdk-ssm'
gem 'builder'
gem 'capistrano', '~> 3.4.1'
gem 'capistrano-rails'
Expand All @@ -20,10 +22,15 @@ gem 'rack-cache'
gem 'rest-client', '~> 2.0'
gem 'sprockets', '~> 3.7.2'
gem 'thin'
gem 'uc3-ssm', git: 'https://github.com/CDLUC3/uc3-ssm', branch: 'main'
gem 'unicode'
gem 'uuidtools'
gem 'will_paginate'

# source "https://rubygems.pkg.github.com/cdluc3" do
# gem "uc3-ssm", "0.1.1"
# end

group :development do
gem 'web-console', '~> 2.0'
end
Expand Down
157 changes: 94 additions & 63 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,50 @@
GIT
remote: https://github.com/CDLUC3/uc3-ssm
revision: c7a6a28515def7dc7c1fe21c38680d2e642a7136
branch: main
specs:
uc3-ssm (0.1.7)
aws-sdk-ssm (~> 1.84)
logger (~> 1.4)
yaml (~> 0.1)

GEM
remote: http://rubygems.org/
specs:
actionmailer (4.2.11.1)
actionpack (= 4.2.11.1)
actionview (= 4.2.11.1)
activejob (= 4.2.11.1)
actionmailer (4.2.11.3)
actionpack (= 4.2.11.3)
actionview (= 4.2.11.3)
activejob (= 4.2.11.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.11.1)
actionview (= 4.2.11.1)
activesupport (= 4.2.11.1)
actionpack (4.2.11.3)
actionview (= 4.2.11.3)
activesupport (= 4.2.11.3)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.11.1)
activesupport (= 4.2.11.1)
actionview (4.2.11.3)
activesupport (= 4.2.11.3)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.11.1)
activesupport (= 4.2.11.1)
activejob (4.2.11.3)
activesupport (= 4.2.11.3)
globalid (>= 0.3.0)
activemodel (4.2.11.1)
activesupport (= 4.2.11.1)
activemodel (4.2.11.3)
activesupport (= 4.2.11.3)
builder (~> 3.1)
activerecord (4.2.11.1)
activemodel (= 4.2.11.1)
activesupport (= 4.2.11.1)
activerecord (4.2.11.3)
activemodel (= 4.2.11.3)
activesupport (= 4.2.11.3)
arel (~> 6.0)
activeresource (4.1.0)
activemodel (~> 4.0)
activesupport (~> 4.0)
rails-observers (~> 0.1.2)
activesupport (4.2.11.1)
activesupport (4.2.11.3)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
Expand All @@ -43,21 +53,36 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
ansi (1.5.0)
arel (6.0.4)
ast (2.4.0)
ast (2.4.1)
aws-eventstream (1.1.0)
aws-partitions (1.361.0)
aws-sdk-core (3.105.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.184.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-ssm (1.88.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.2)
aws-eventstream (~> 1, >= 1.0.2)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.4)
byebug (11.1.1)
byebug (11.1.3)
capistrano (3.4.1)
i18n
rake (>= 10.0.0)
sshkit (~> 1.3)
capistrano-bundler (1.6.0)
capistrano-bundler (2.0.1)
capistrano (~> 3.1)
capistrano-rails (1.4.0)
capistrano-rails (1.6.1)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capybara (3.32.1)
capistrano-bundler (>= 1.1, < 3)
capybara (3.32.2)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
Expand All @@ -71,16 +96,16 @@ GEM
rack-proxy (>= 0.6.0)
selenium-webdriver (~> 3.0)
childprocess (3.0.0)
coderay (1.1.2)
coderay (1.1.3)
colorize (0.8.1)
concurrent-ruby (1.1.6)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.6)
daemons (1.3.1)
database_cleaner (1.8.4)
database_cleaner (1.8.5)
debug_inspector (0.0.3)
diff-lcs (1.3)
diff-lcs (1.4.4)
diffy (3.3.0)
docile (1.3.2)
domain_name (0.5.20190701)
Expand All @@ -89,7 +114,7 @@ GEM
nokogiri (>= 1.4.3)
erubis (2.7.0)
eventmachine (1.2.7)
exception_notification (4.4.0)
exception_notification (4.4.3)
actionmailer (>= 4.0, < 7)
activesupport (>= 4.0, < 7)
factory_bot (4.11.1)
Expand All @@ -107,42 +132,44 @@ GEM
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
jquery-rails (4.3.5)
jmespath (1.4.0)
jquery-rails (4.4.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.3.0)
json (2.3.1)
launchy (2.5.0)
addressable (~> 2.7)
loofah (2.5.0)
logger (1.4.2)
loofah (2.6.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
mime-types-data (3.2020.0512)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.0)
minitest (5.14.1)
mrt-ingest (0.0.4)
json (~> 2.0)
rest-client (~> 2.0)
multi_json (1.14.1)
multi_json (1.15.0)
mysql2 (0.4.10)
net-ldap (0.16.2)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-ssh (5.2.0)
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0)
netrc (0.11.0)
nio4r (2.5.2)
nokogiri (1.10.9)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
orchard (0.2)
parallel (1.19.1)
parser (2.7.1.1)
ast (~> 2.4.0)
parallel (1.19.2)
parser (2.7.1.4)
ast (~> 2.4.1)
powerpack (0.1.2)
pry (0.13.1)
coderay (~> 1.1)
Expand All @@ -152,26 +179,26 @@ GEM
pry-remote (0.1.8)
pry (~> 0.9)
slop (~> 3.0)
public_suffix (4.0.4)
puma (4.3.3)
public_suffix (4.0.5)
puma (4.3.5)
nio4r (~> 2.0)
rack (1.6.13)
rack-cache (1.11.1)
rack-cache (1.12.0)
rack (>= 0.4)
rack-proxy (0.6.5)
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.11.1)
actionmailer (= 4.2.11.1)
actionpack (= 4.2.11.1)
actionview (= 4.2.11.1)
activejob (= 4.2.11.1)
activemodel (= 4.2.11.1)
activerecord (= 4.2.11.1)
activesupport (= 4.2.11.1)
rails (4.2.11.3)
actionmailer (= 4.2.11.3)
actionpack (= 4.2.11.3)
actionview (= 4.2.11.3)
activejob (= 4.2.11.3)
activemodel (= 4.2.11.3)
activerecord (= 4.2.11.3)
activesupport (= 4.2.11.3)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.11.1)
railties (= 4.2.11.3)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
Expand All @@ -183,22 +210,22 @@ GEM
loofah (~> 2.3)
rails-observers (0.1.5)
activemodel (>= 4.0)
railties (4.2.11.1)
actionpack (= 4.2.11.1)
activesupport (= 4.2.11.1)
railties (4.2.11.3)
actionpack (= 4.2.11.3)
activesupport (= 4.2.11.3)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
rake (13.0.1)
regexp_parser (1.7.0)
regexp_parser (1.7.1)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rspec-core (3.9.1)
rspec-support (~> 3.9.1)
rspec-expectations (3.9.1)
rspec-core (3.9.2)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
Expand All @@ -212,7 +239,7 @@ GEM
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.2)
rspec-support (3.9.3)
rubocop (0.58.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
Expand Down Expand Up @@ -262,13 +289,13 @@ GEM
unf_ext (0.0.7.7)
unicode (0.4.4.4)
unicode-display_width (1.7.0)
uuidtools (2.1.5)
uuidtools (2.2.0)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
webdrivers (3.8.0)
webdrivers (3.9.4)
nokogiri (~> 1.6)
rubyzip (~> 1.0)
selenium-webdriver (~> 3.0)
Expand All @@ -279,12 +306,15 @@ GEM
will_paginate (3.3.0)
xpath (3.2.0)
nokogiri (~> 1.8)
yaml (0.1.0)

PLATFORMS
ruby

DEPENDENCIES
activeresource
aws-sdk-ec2
aws-sdk-ssm
builder
byebug
capistrano (~> 3.4.1)
Expand All @@ -311,7 +341,7 @@ DEPENDENCIES
pry-remote
puma
rack-cache
rails (~> 4.2.10)
rails (~> 4.2.11)
rest-client (~> 2.0)
rspec-rails (~> 3.0)
rubocop (= 0.58.1)
Expand All @@ -320,6 +350,7 @@ DEPENDENCIES
simplecov-console (~> 0.4)
sprockets (~> 3.7.2)
thin
uc3-ssm!
unicode
uuidtools
web-console (~> 2.0)
Expand Down
15 changes: 15 additions & 0 deletions app/assets/javascripts/presign_download_page.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,19 @@ jQuery(document).ready(function(){
presignDialogs.assemblyTokenList.clearData();
return true;
})
jQuery("header nav li.dropdown a.expandable, header nav li.dropdown span.expandable")
.on('keypress', function(e) {
if (e.which == 32) {
jQuery(this).parent("li").toggleClass("menuopen");
return false;
}
});
jQuery("header nav img.expandable")
.on('keypress', function(e) {
if (e.which == 32) {
jQuery("nav.menu > ul").toggle();
return false;
}
});

});
Loading

0 comments on commit cccbbac

Please sign in to comment.