amazon-pricing 0.1.131 → 0.1.132

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +8 -8
  2. data/Gemfile +3 -2
  3. data/Jenkinsfile +51 -0
  4. data/docker/Dockerfile +38 -0
  5. data/docker/config/bundle/config +3 -0
  6. data/lib/amazon-pricing/definitions/instance-type.rb +53 -0
  7. data/lib/amazon-pricing/version.rb +1 -1
  8. metadata +5 -3
  9. data/solano.yml +0 -6
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ODdlMDhmMGYyNWYwYzZjYzAwNzZmYjU4YmE5NDViNmYyMWJlM2YxYg==
4
+ MjZkMmZiZDE1N2U2YjI0MGUwY2UxZTBkNzExMzgwYmUyYzllNDdiOA==
5
5
  data.tar.gz: !binary |-
6
- YTczNjEyYWIwNjNlNTEzOWMyMzMxZGE0OTQ4YjUxMmE0NmVjZDcwMw==
6
+ NWRiNzdjYjQ5ZDVkMTQxMGE1ODRkZGZlYTk3ZTc0ODFjOTY1OWY1NQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YWYxYTVhNjQyNGYyZWU5NzNiYWQ2NWYyMGY2YmE3ZTJlYjhlNjNkZDRjMTIw
10
- NWVmMDM2YTA5YzBhNWIzYzYzYjg5NzFlMGRkNDc2YWY2NGIyM2Q0MTA5YWMz
11
- OTZiMWVlM2VlOTE4MjEzZGQ3NTlmMWM0ZWVhNmEyYTQwN2E4OGE=
9
+ NTg1YzdlNmI5NGM0ZDYwMjljNzEwMDkyZmY1ZDk4YzkwOGExZWNmZWNmNzI5
10
+ NmYyMzZkMmZiZTlkNjA4ZWI5YWU3ODI2OThhMWQ5MmM3YTljYzNjZjdkMmJl
11
+ ZDZhZWVlNzQ5NmNhOWE5ODVlNDA1NjEzNzZiMDYxYTkzNzY5MGM=
12
12
  data.tar.gz: !binary |-
13
- YWI1Y2Q3MTk1NWJlOGM0OTZkMTA0MzhmZDYzNWE4Y2Y3MDk5MWE1MThjNzU5
14
- Mjc5ZmFjNDU1NDQzZjliN2VhOTA1MzYxM2RlNGFlNDNiNDk0MzY3ZmQzYjRh
15
- OGE3OTQ5NmZiOTBjMGUxZGRkMGVmNWU1OWVjMDYwMzU4N2ZlMjc=
13
+ Y2VmNzJmM2Q3ZjNhOWRjY2VkY2JiMjVlNjJmOGEwNjE0ZjZlYTJkM2UxODI4
14
+ MmUxM2ZiNTVkMDAwN2YxOWMwYTdiYmRjMjQzYWIzZDBiYTVlNzU5OGRhNmYy
15
+ ZjdiMDFjM2JiZGExMjZmMTBiMTNmNzA1ZDZiYjEyN2YwNWM1N2U=
data/Gemfile CHANGED
@@ -7,8 +7,9 @@ group :development do
7
7
  end
8
8
 
9
9
  group :test do
10
- gem 'rake'
11
- gem 'test-unit'
10
+ gem 'rake', '11.3.0'
11
+ gem 'test-unit', '3.2.3'
12
12
  gem 'rspec', '~> 2.11.0'
13
13
  gem 'simplecov', require: false
14
+ gem 'rspec_junit_formatter', '0.3.0'
14
15
  end
data/Jenkinsfile ADDED
@@ -0,0 +1,51 @@
1
+ #!/usr/bin/env groovy
2
+ @Library('cht-jenkins-pipeline') _
3
+
4
+ properties([
5
+ [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '15']],
6
+ compressBuildLog()
7
+ ]);
8
+
9
+ if (env.BRANCH_NAME == 'master') {
10
+ properties([pipelineTriggers([cron('H H(8-10) * * 4')]),
11
+ [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '15']],
12
+ compressBuildLog()
13
+ ]);
14
+ }
15
+
16
+ // NODE FOR RUBY2.3.3-RAILS3.2
17
+ node('testing') {
18
+ try {
19
+ timestamps {
20
+ stage('Setup_2.3.3-3.0') {
21
+ checkout scm
22
+ sh "docker build -f docker/Dockerfile -t pricing_image ."
23
+ sh "docker run -dit --name=pricing-app-${JOB_BASE_NAME}_${BUILD_NUMBER} -e RAILS_ENV=test -v ${WORKSPACE}/:/home/cloudhealth/amazon-pricing/ pricing_image /bin/bash"
24
+ }
25
+ }
26
+ timestamps {
27
+ stage('Run Bundle Install') {
28
+ sh "docker exec pricing-app-${JOB_BASE_NAME}_${BUILD_NUMBER} /bin/bash -c -l 'bundle install --no-deployment --binstubs=bin'"
29
+ }
30
+ }
31
+ try {
32
+ timestamps {
33
+ stage('Test_2.3.3-3.0') {
34
+ try {
35
+ sh 'docker exec pricing-app-${JOB_BASE_NAME}_${BUILD_NUMBER} /bin/bash -c -l "bundle exec rspec --format RspecJunitFormatter --out pricing_rspec_1-3_${JOB_BASE_NAME}_${BUILD_NUMBER}.xml"'
36
+ } finally {
37
+ junit(testResults: 'pricing_rspec_1-3_${JOB_BASE_NAME}_${BUILD_NUMBER}.xml')
38
+ }
39
+ }
40
+ }
41
+ sh "exit 0"
42
+ currentBuild.result = 'SUCCESS'
43
+ } catch (Exception e) {
44
+ // Exit 0 so that we can keep running other nodes (if we are to add more) if this one fails
45
+ sh "exit 0"
46
+ currentBuild.result = 'FAILURE'
47
+ }
48
+ } finally {
49
+ sh "docker stop pricing-app-${JOB_BASE_NAME}_${BUILD_NUMBER} && docker rm -f pricing-app-${JOB_BASE_NAME}_${BUILD_NUMBER}"
50
+ }
51
+ }
data/docker/Dockerfile ADDED
@@ -0,0 +1,38 @@
1
+ FROM ubuntu:14.04
2
+
3
+ # Install https packages for apt
4
+ RUN apt-get update && apt-get install -y apt-transport-https ca-certificates
5
+ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv 1655a0ab68576280 && apt-key update && apt-get update
6
+
7
+ # Install necessary apt packages
8
+ RUN apt-get install -y build-essential libxml2-dev libxslt-dev git curl g++ gcc curl \
9
+ && apt-get clean
10
+
11
+ RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
12
+ RUN curl -sSL https://get.rvm.io | bash -s stable
13
+ RUN /bin/bash -l -c "rvm install 2.3.3"
14
+ RUN /bin/bash -l -c "rvm use 2.3.3"
15
+ RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
16
+ RUN /bin/bash -l -c "gem install bundler -v "1.16.2" --no-ri --no-rdoc"
17
+
18
+ # Setup cloudhealth user
19
+ RUN useradd -d /home/cloudhealth/ -m cloudhealth
20
+
21
+ ADD docker/config/bundle/config /home/cloudhealth/.bundle/config
22
+ RUN chown -R cloudhealth:cloudhealth /home/cloudhealth/.bundle/
23
+
24
+ RUN mkdir -p /home/cloudhealth/amazon-pricing
25
+ RUN mkdir -p /home/cloudhealth/amazon-pricing/lib
26
+ RUN mkdir -p /home/cloudhealth/amazon-pricing/lib/amazon-pricing
27
+
28
+ # Copying Gemfile and related files
29
+ COPY Gemfile /home/cloudhealth/amazon-pricing
30
+ COPY amazon-pricing.gemspec /home/cloudhealth/amazon-pricing
31
+ COPY lib/amazon-pricing/version.rb /home/cloudhealth/amazon-pricing/lib/amazon-pricing
32
+
33
+ RUN chown -R cloudhealth:cloudhealth /home/cloudhealth/amazon-pricing
34
+
35
+ WORKDIR /home/cloudhealth/amazon-pricing
36
+ USER cloudhealth
37
+
38
+ RUN /bin/bash -c -l "USE_SYSTEM_GECODE=1 RAILS_ENV=test bundle install --no-deployment --binstubs=bin"
data/docker/config/bundle/config ADDED
@@ -0,0 +1,3 @@
1
+ ---
2
+ BUNDLE_PATH: "/home/cloudhealth/bundle/"
3
+ BUNDLE_DEFAULT_INSTALL_USES_PATH: "/home/cloudhealth/bundle/"
data/lib/amazon-pricing/definitions/instance-type.rb CHANGED
@@ -134,6 +134,10 @@ module AwsPricing
134
134
  @@Name_Lookup[api_name]
135
135
  end
136
136
 
137
+ def self.get_descriptive_cache_name(api_name)
138
+ @@Cache_Name_Lookup[api_name]
139
+ end
140
+
137
141
  protected
138
142
 
139
143
  def self.get_disk(api_name)
@@ -436,6 +440,55 @@ module AwsPricing
436
440
  # e.g. RDS = http://aws-assets-pricing-prod.s3.amazonaws.com/pricing/rds/mysql/pricing-standard-deployments.js
437
441
  @@Compute_Units_Lookup = {}
438
442
 
443
+
444
+ # basic name and description lookup for cache instances
445
+ @@Cache_Name_Lookup = {
446
+ 'cache.c1.xlarge' => 'High-CPU Cache Nodes',
447
+ 'cache.m1.large' => 'Standard Cache Nodes',
448
+ 'cache.m1.medium' => 'Standard Cache Nodes',
449
+ 'cache.m1.small' => 'Standard Cache Nodes',
450
+ 'cache.m1.xlarge' => 'Standard Cache Nodes',
451
+ 'cache.m2.2xlarge' => 'Memory Optimized Cache Nodes',
452
+ 'cache.m2.4xlarge' => 'Memory Optimized Cache Nodes',
453
+ 'cache.m2.xlarge' => 'Memory Optimized Cache Nodes',
454
+ 'cache.m3.2xlarge' => 'Standard Cache Nodes',
455
+ 'cache.m3.large' => 'Standard Cache Nodes',
456
+ 'cache.m3.medium' => 'Standard Cache Nodes',
457
+ 'cache.m3.xlarge' => 'Standard Cache Nodes',
458
+ 'cache.m4.10xlarge' => 'Standard Cache Nodes',
459
+ 'cache.m4.2xlarge' => 'Standard Cache Nodes',
460
+ 'cache.m4.4xlarge' => 'Standard Cache Nodes',
461
+ 'cache.m4.large' => 'Standard Cache Nodes',
462
+ 'cache.m4.xlarge' => 'Standard Cache Nodes',
463
+ 'cache.m5.large' => 'Standard Cache Nodes',
464
+ 'cache.m5.xlarge' => 'Standard Cache Nodes',
465
+ 'cache.m5.2xlarge' => 'Standard Cache Nodes',
466
+ 'cache.m5.4xlarge' => 'Standard Cache Nodes',
467
+ 'cache.m5.12xlarge' => 'Standard Cache Nodes',
468
+ 'cache.m5.24xlarge' => 'Standard Cache Nodes',
469
+ 'cache.r3.2xlarge' => 'Memory Optimized Cache Nodes',
470
+ 'cache.r3.4xlarge' => 'Memory Optimized Cache Nodes',
471
+ 'cache.r3.8xlarge' => 'Memory Optimized Cache Nodes',
472
+ 'cache.r3.large' => 'Memory Optimized Cache Nodes',
473
+ 'cache.r3.xlarge' => 'Memory Optimized Cache Nodes',
474
+ 'cache.r4.16xlarge' => 'Memory Optimized Cache Nodes',
475
+ 'cache.r4.2xlarge' => 'Memory Optimized Cache Nodes',
476
+ 'cache.r4.4xlarge' => 'Memory Optimized Cache Nodes',
477
+ 'cache.r4.8xlarge' => 'Memory Optimized Cache Nodes',
478
+ 'cache.r4.large' => 'Memory Optimized Cache Nodes',
479
+ 'cache.r4.xlarge' => 'Memory Optimized Cache Nodes',
480
+ 'cache.r5.large' => 'Memory Optimized Cache Nodes',
481
+ 'cache.r5.xlarge' => 'Memory Optimized',
482
+ 'cache.r5.4xlarge' => 'Memory Optimized',
483
+ 'cache.r5.2xlarge' => 'Memory Optimized',
484
+ 'cache.r5.12xlarge' => 'Memory Optimized',
485
+ 'cache.r5.24xlarge' => 'Memory Optimized',
486
+ 'cache.t1.micro' => 'Micro Cache Nodes',
487
+ 'cache.t2.medium' => 'Standard Cache Nodes',
488
+ 'cache.t2.micro' => 'Standard Cache Nodes',
489
+ 'cache.t2.small' => 'Standard Cache Nodes'
490
+ }
491
+
439
492
  private
440
493
 
441
494
  # [MB/s capacity, Ops/s capacity]
data/lib/amazon-pricing/version.rb CHANGED
@@ -9,5 +9,5 @@
9
9
  #++
10
10
  module AwsPricing
11
11
 
12
- VERSION = '0.1.131' # [major,minor.fix]: Moving VPC only instance families to be in amazon-pricing gem
12
+ VERSION = '0.1.132' # [major,minor.fix]: Adding values for cache instance names
13
13
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: amazon-pricing
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.131
4
+ version: 0.1.132
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joe Kinsella
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-01-25 00:00:00.000000000 Z
11
+ date: 2019-02-14 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: A Ruby library for retrieving pricing for Amazon Web Services
14
14
  email:
@@ -23,6 +23,7 @@ files:
23
23
  - CHANGELOG.md
24
24
  - Gemfile
25
25
  - Gemfile.lock
26
+ - Jenkinsfile
26
27
  - LICENSE
27
28
  - README.md
28
29
  - Rakefile
@@ -31,6 +32,8 @@ files:
31
32
  - archive/ec2-2014-05-22.csv
32
33
  - archive/rds-2014-03-18.csv
33
34
  - archive/rds-2014-05-22.csv
35
+ - docker/Dockerfile
36
+ - docker/config/bundle/config
34
37
  - lib/amazon-pricing.rb
35
38
  - lib/amazon-pricing/aws-price-list.rb
36
39
  - lib/amazon-pricing/common/ec2_common.rb
@@ -54,7 +57,6 @@ files:
54
57
  - lib/amazon-pricing/helpers/instance-type.rb
55
58
  - lib/amazon-pricing/rds-price-list.rb
56
59
  - lib/amazon-pricing/version.rb
57
- - solano.yml
58
60
  - spec/lib/amazon-pricing/definitions/database-type_spec.rb
59
61
  - spec/lib/amazon-pricing/ec2_dh_pricing_spec.rb
60
62
  - spec/lib/amazon-pricing/ec2_dhi_pricing_spec.rb
data/solano.yml DELETED
@@ -1,6 +0,0 @@
1
- ---
2
- coverage:
3
- version: 2
4
- enabled: true
5
- environment:
6
- TZ: UTC