amazon-pricing 0.1.131 → 0.1.132

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODdlMDhmMGYyNWYwYzZjYzAwNzZmYjU4YmE5NDViNmYyMWJlM2YxYg==
+    MjZkMmZiZDE1N2U2YjI0MGUwY2UxZTBkNzExMzgwYmUyYzllNDdiOA==
   data.tar.gz: !binary |-
-    YTczNjEyYWIwNjNlNTEzOWMyMzMxZGE0OTQ4YjUxMmE0NmVjZDcwMw==
+    NWRiNzdjYjQ5ZDVkMTQxMGE1ODRkZGZlYTk3ZTc0ODFjOTY1OWY1NQ==
 SHA512:
   metadata.gz: !binary |-
-    YWYxYTVhNjQyNGYyZWU5NzNiYWQ2NWYyMGY2YmE3ZTJlYjhlNjNkZDRjMTIw
-    NWVmMDM2YTA5YzBhNWIzYzYzYjg5NzFlMGRkNDc2YWY2NGIyM2Q0MTA5YWMz
-    OTZiMWVlM2VlOTE4MjEzZGQ3NTlmMWM0ZWVhNmEyYTQwN2E4OGE=
+    NTg1YzdlNmI5NGM0ZDYwMjljNzEwMDkyZmY1ZDk4YzkwOGExZWNmZWNmNzI5
+    NmYyMzZkMmZiZTlkNjA4ZWI5YWU3ODI2OThhMWQ5MmM3YTljYzNjZjdkMmJl
+    ZDZhZWVlNzQ5NmNhOWE5ODVlNDA1NjEzNzZiMDYxYTkzNzY5MGM=
   data.tar.gz: !binary |-
-    YWI1Y2Q3MTk1NWJlOGM0OTZkMTA0MzhmZDYzNWE4Y2Y3MDk5MWE1MThjNzU5
-    Mjc5ZmFjNDU1NDQzZjliN2VhOTA1MzYxM2RlNGFlNDNiNDk0MzY3ZmQzYjRh
-    OGE3OTQ5NmZiOTBjMGUxZGRkMGVmNWU1OWVjMDYwMzU4N2ZlMjc=
+    Y2VmNzJmM2Q3ZjNhOWRjY2VkY2JiMjVlNjJmOGEwNjE0ZjZlYTJkM2UxODI4
+    MmUxM2ZiNTVkMDAwN2YxOWMwYTdiYmRjMjQzYWIzZDBiYTVlNzU5OGRhNmYy
+    ZjdiMDFjM2JiZGExMjZmMTBiMTNmNzA1ZDZiYjEyN2YwNWM1N2U=

data/Gemfile

@@ -7,8 +7,9 @@ group :development do
 end
 
 group :test do
-  gem 'rake'
-  gem 'test-unit'
+  gem 'rake', '11.3.0'
+  gem 'test-unit', '3.2.3'
   gem 'rspec', '~> 2.11.0'
   gem 'simplecov', require: false
+  gem 'rspec_junit_formatter', '0.3.0'
 end

data/Jenkinsfile

@@ -0,0 +1,51 @@
+#!/usr/bin/env groovy
+@Library('cht-jenkins-pipeline') _
+
+properties([
+    [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '15']],
+    compressBuildLog()
+]);
+
+if (env.BRANCH_NAME == 'master') {
+   properties([pipelineTriggers([cron('H H(8-10) * * 4')]),
+       [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '15']],
+       compressBuildLog()
+   ]);
+}
+
+// NODE FOR RUBY2.3.3-RAILS3.2
+node('testing') {
+    try {
+        timestamps {
+            stage('Setup_2.3.3-3.0') {
+                checkout scm
+                sh "docker build -f docker/Dockerfile -t pricing_image ."
+                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"
+           }
+        }
+        timestamps {
+            stage('Run Bundle Install') {
+                sh "docker exec pricing-app-${JOB_BASE_NAME}_${BUILD_NUMBER} /bin/bash -c  -l 'bundle install --no-deployment --binstubs=bin'"
+            }
+        }
+        try {
+            timestamps {
+                stage('Test_2.3.3-3.0') {
+                    try {
+                        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"'
+                    } finally {
+                        junit(testResults: 'pricing_rspec_1-3_${JOB_BASE_NAME}_${BUILD_NUMBER}.xml')
+                    }
+                }
+            }
+            sh "exit 0"
+            currentBuild.result = 'SUCCESS'
+        } catch (Exception e) {
+        // Exit 0 so that we can keep running other nodes (if we are to add more) if this one fails
+            sh "exit 0"
+            currentBuild.result = 'FAILURE'
+        }
+    } finally {
+        sh "docker stop pricing-app-${JOB_BASE_NAME}_${BUILD_NUMBER} && docker rm -f pricing-app-${JOB_BASE_NAME}_${BUILD_NUMBER}"
+    }
+}

data/docker/Dockerfile

@@ -0,0 +1,38 @@
+FROM ubuntu:14.04
+
+# Install https packages for apt
+RUN apt-get update && apt-get install -y apt-transport-https ca-certificates
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv 1655a0ab68576280 && apt-key update && apt-get update
+
+# Install necessary apt packages
+RUN apt-get install -y build-essential libxml2-dev libxslt-dev git curl g++ gcc curl \
+&& apt-get clean
+
+RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN curl -sSL https://get.rvm.io | bash -s stable
+RUN /bin/bash -l -c "rvm install 2.3.3"
+RUN /bin/bash -l -c "rvm use 2.3.3"
+RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
+RUN /bin/bash -l -c "gem install bundler -v "1.16.2" --no-ri --no-rdoc"
+
+# Setup cloudhealth user
+RUN useradd -d /home/cloudhealth/ -m cloudhealth
+
+ADD docker/config/bundle/config /home/cloudhealth/.bundle/config
+RUN chown -R cloudhealth:cloudhealth /home/cloudhealth/.bundle/
+
+RUN mkdir -p /home/cloudhealth/amazon-pricing
+RUN mkdir -p /home/cloudhealth/amazon-pricing/lib
+RUN mkdir -p /home/cloudhealth/amazon-pricing/lib/amazon-pricing
+
+# Copying Gemfile and related files
+COPY Gemfile /home/cloudhealth/amazon-pricing
+COPY amazon-pricing.gemspec /home/cloudhealth/amazon-pricing
+COPY lib/amazon-pricing/version.rb /home/cloudhealth/amazon-pricing/lib/amazon-pricing
+
+RUN chown -R cloudhealth:cloudhealth /home/cloudhealth/amazon-pricing
+
+WORKDIR /home/cloudhealth/amazon-pricing
+USER cloudhealth
+
+RUN /bin/bash -c -l "USE_SYSTEM_GECODE=1 RAILS_ENV=test bundle install --no-deployment --binstubs=bin"

data/docker/config/bundle/config

@@ -0,0 +1,3 @@
+---
+BUNDLE_PATH: "/home/cloudhealth/bundle/"
+BUNDLE_DEFAULT_INSTALL_USES_PATH: "/home/cloudhealth/bundle/"

data/lib/amazon-pricing/definitions/instance-type.rb

@@ -134,6 +134,10 @@ module AwsPricing
       @@Name_Lookup[api_name]
     end
 
+    def self.get_descriptive_cache_name(api_name)
+      @@Cache_Name_Lookup[api_name]
+    end
+
     protected
 
     def self.get_disk(api_name)
@@ -436,6 +440,55 @@ module AwsPricing
     # e.g. RDS = http://aws-assets-pricing-prod.s3.amazonaws.com/pricing/rds/mysql/pricing-standard-deployments.js
     @@Compute_Units_Lookup = {}
 
+
+    # basic name and description lookup for cache instances
+    @@Cache_Name_Lookup = {
+      'cache.c1.xlarge' => 'High-CPU Cache Nodes',
+      'cache.m1.large' => 'Standard Cache Nodes',
+      'cache.m1.medium' => 'Standard Cache Nodes',
+      'cache.m1.small' => 'Standard Cache Nodes',
+      'cache.m1.xlarge' => 'Standard Cache Nodes',
+      'cache.m2.2xlarge' => 'Memory Optimized Cache Nodes',
+      'cache.m2.4xlarge' => 'Memory Optimized Cache Nodes',
+      'cache.m2.xlarge' => 'Memory Optimized Cache Nodes',
+      'cache.m3.2xlarge' => 'Standard Cache Nodes',
+      'cache.m3.large' => 'Standard Cache Nodes',
+      'cache.m3.medium' => 'Standard Cache Nodes',
+      'cache.m3.xlarge' => 'Standard Cache Nodes',
+      'cache.m4.10xlarge' => 'Standard Cache Nodes',
+      'cache.m4.2xlarge' => 'Standard Cache Nodes',
+      'cache.m4.4xlarge' => 'Standard Cache Nodes',
+      'cache.m4.large' => 'Standard Cache Nodes',
+      'cache.m4.xlarge' => 'Standard Cache Nodes',
+      'cache.m5.large' => 'Standard Cache Nodes',
+      'cache.m5.xlarge' => 'Standard Cache Nodes',
+      'cache.m5.2xlarge' => 'Standard Cache Nodes',
+      'cache.m5.4xlarge'  => 'Standard Cache Nodes',
+      'cache.m5.12xlarge' => 'Standard Cache Nodes',
+      'cache.m5.24xlarge' => 'Standard Cache Nodes',
+      'cache.r3.2xlarge' => 'Memory Optimized Cache Nodes',
+      'cache.r3.4xlarge' => 'Memory Optimized Cache Nodes',
+      'cache.r3.8xlarge' => 'Memory Optimized Cache Nodes',
+      'cache.r3.large' => 'Memory Optimized Cache Nodes',
+      'cache.r3.xlarge' => 'Memory Optimized Cache Nodes',
+      'cache.r4.16xlarge' => 'Memory Optimized Cache Nodes',
+      'cache.r4.2xlarge' => 'Memory Optimized Cache Nodes',
+      'cache.r4.4xlarge' => 'Memory Optimized Cache Nodes',
+      'cache.r4.8xlarge' => 'Memory Optimized Cache Nodes',
+      'cache.r4.large' => 'Memory Optimized Cache Nodes',
+      'cache.r4.xlarge' => 'Memory Optimized Cache Nodes',
+      'cache.r5.large' => 'Memory Optimized Cache Nodes',
+      'cache.r5.xlarge' => 'Memory Optimized',
+      'cache.r5.4xlarge' =>  'Memory Optimized',
+      'cache.r5.2xlarge' => 'Memory Optimized',
+      'cache.r5.12xlarge'  => 'Memory Optimized',
+      'cache.r5.24xlarge' => 'Memory Optimized',
+      'cache.t1.micro' => 'Micro Cache Nodes',
+      'cache.t2.medium' => 'Standard Cache Nodes',
+      'cache.t2.micro' => 'Standard Cache Nodes',
+      'cache.t2.small' => 'Standard Cache Nodes'
+    }
+
     private
 
     # [MB/s capacity, Ops/s capacity]

data/lib/amazon-pricing/version.rb

@@ -9,5 +9,5 @@
 #++
 module AwsPricing
 
-VERSION = '0.1.131' # [major,minor.fix]: Moving VPC only instance families to be in amazon-pricing gem
+VERSION = '0.1.132' # [major,minor.fix]: Adding values for cache instance names
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.131
+  version: 0.1.132
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-02-14 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -23,6 +23,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- Jenkinsfile
 - LICENSE
 - README.md
 - Rakefile
@@ -31,6 +32,8 @@ files:
 - archive/ec2-2014-05-22.csv
 - archive/rds-2014-03-18.csv
 - archive/rds-2014-05-22.csv
+- docker/Dockerfile
+- docker/config/bundle/config
 - lib/amazon-pricing.rb
 - lib/amazon-pricing/aws-price-list.rb
 - lib/amazon-pricing/common/ec2_common.rb
@@ -54,7 +57,6 @@ files:
 - lib/amazon-pricing/helpers/instance-type.rb
 - lib/amazon-pricing/rds-price-list.rb
 - lib/amazon-pricing/version.rb
-- solano.yml
 - spec/lib/amazon-pricing/definitions/database-type_spec.rb
 - spec/lib/amazon-pricing/ec2_dh_pricing_spec.rb
 - spec/lib/amazon-pricing/ec2_dhi_pricing_spec.rb

data/solano.yml

@@ -1,6 +0,0 @@
----
-coverage:
-  version: 2
-  enabled: true
-environment:
-  TZ: UTC