fhcap-cli 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddbd3378ec5fc7f63b7f35b5258b280094410dad
-  data.tar.gz: e2f741990616c6df616b0d3e15943d9c92016ede
+  metadata.gz: 1685de7948d976df40d6c15e0870a51f12393fc2
+  data.tar.gz: 4a812cdd3b1e2865105e0ee69ffc55e74f82881b
 SHA512:
-  metadata.gz: c0c9e75019bf435b9f0bbf2b334a4886515e508d2746cd6623a65c28836bf6fba5a17df56af77ce97033fdbd6eda9d020e43e4c1364d46cc5fbf238ddd5e1037
-  data.tar.gz: 1a4fa88a8a2a39cb787f8cf3e6d5ea521515beda310cd88382b6a4199f5227a6c892411c1ec61d83b0bb270bf801c457c35e45254de7757c6cd76be09481bece
+  metadata.gz: f4ce224936b910162e7fcf0b2bd10f0f0d415a4fd35c523cebabdbfe860ccc74b9fc0d31c19290e088064e59926224be8cd0063df2c0658c5cdfafc6ee95fe0b
+  data.tar.gz: 7e0917eceb7b16367d7c71683f949c8bfd6c4e2398a5e8d7608b5e866507b5f12cf10c173442321eb40fc4e837c0e481159462a7bc29687253024309bf7bccc0

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 
 ## Unreleased
 
+## 0.4.9
+
+* [RHMAP-9021] - Add support for longer AWS Instance and ELB Ids (Patched with upstream changes made in chef-provisioning-aws gem)
+* Fix knife user import, incorrect attributes were being referenced causing the private key to appear empty.
+* [RHMAP-5646] - Setting min RubyGems version to 2.6.3, fixes an issue when running commands inside the fhcap directory (undefined method `this' for #<Gem::Specification:0x3ff25ccfb780...)
+
 ## 0.4.8
 
 * [RHMAP-7637] - Fix Chef::Config constant in global namespace
@@ -16,7 +22,7 @@
 
 ## 0.4.6
 
-* [RHMAP-3031] - Add aws-tags (Name, Organisationm, Environment and Role) to all instances
+* [RHMAP-3031] - Add aws-tags (Name, Organisation, Environment and Role) to all instances
 * [RHMAP-3815] - Add dry-run option to all chef_provisions tasks, sets why-run option on chef run (chef-provisioning)
 * [RHMAP-4038] - Fix aws templates to set correct required security group protocols/ports for environment.
 

data/fhcap-cli.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/fheng/fhcap-cli"
   spec.license       = "MIT"
   spec.required_ruby_version = '>= 2.0.0'
-  spec.required_rubygems_version = '>= 2.5.0'
+  spec.required_rubygems_version = '>= 2.6.3'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/cookbooks/provision/recipes/aws.rb

@@ -2,6 +2,8 @@ raise "Missing aws credentials" unless node['provider_credentials']['aws-access-
 
 require 'chef/provisioning/aws_driver'
 require 'extensions/chef/provisioning/aws_driver/driver.rb'
+require 'extensions/chef/resource/aws_instance' # https://github.com/chef/chef-provisioning-aws/blob/master/CHANGELOG.md#v190-2016-04-14
+require 'extensions/chef/resource/aws_ebs_volume' # https://github.com/chef/chef-provisioning-aws/blob/master/CHANGELOG.md#v1110-2016-08-11
 
 cluster_config = cluster_config_for(node)
 

data/lib/extensions/chef/resource/aws_ebs_volume.rb

@@ -0,0 +1,8 @@
+require 'chef/provisioning/aws_driver/aws_resource_with_entry'
+require 'chef/resource/aws_instance'
+
+class Chef::Resource::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
+  attribute :volume_id,         kind_of: String, aws_id_attribute: true, lazy_default: proc {
+    name =~ /^vol-(?:[a-f0-9]{8}|[a-f0-9]{17})$/ ? name : nil
+  }
+end

data/lib/extensions/chef/resource/aws_instance.rb

@@ -0,0 +1,8 @@
+require 'chef/provisioning/aws_driver/aws_resource_with_entry'
+require 'chef/provisioning/aws_driver/aws_taggable'
+
+class Chef::Resource::AwsInstance < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
+  attribute :instance_id, kind_of: String, aws_id_attribute: true, lazy_default: proc {
+    name =~ /^i-(?:[a-f0-9]{8}|[a-f0-9]{17})$/ ? name : nil
+  }
+end

data/lib/fhcap/tasks/chef/cookbook/update_config.rb

@@ -13,7 +13,6 @@ module Fhcap
               "millicore" => "millicore/src/main/resources/config/cluster-config.properties",
               "fh-reaper" => "millicore/src/main/resources/config/reaper.properties",
               "fh-supercore" => "fh-supercore/config/dev.json",
-              "fh-docs" => ["fh-docs/config/development.json", "fh-docs/config/config.json"],
               "fh-doxy" => "fh-doxy/config/dev.json",
               "fh-messaging" => "fh-messaging/fh-messaging/config/dev.json",
               "fh-metrics" => "fh-messaging/fh-metrics/config/dev.json",

data/lib/fhcap/tasks/knife/add.rb

@@ -74,7 +74,7 @@ module Fhcap
                           :node_name => knife_config[:node_name],
                           :cookbook_path => cookbook_path
             )
-            private_key = '-----BEGIN RSA PRIVATE KEY-----
+            @private_key = '-----BEGIN RSA PRIVATE KEY-----
 MIIEpAIBAAKCAQEA0sOY9tHvVtLZ6xmVmH8d8LrRrNcWOXbrvvCrai+T3GtRvRSL
 hksLrpOpD0L9EHM6NdThNF/eGA9Oq+UKAe6yXR0hwsKuxKXqQ8SEmlhZZ9GiuggD
 B/zYD3ItB6SGpdkRe7kQqTChQyrIXqbRkJqxoTXLyeJDF0sCyTdp3L8IZCUWodM8
@@ -114,8 +114,8 @@ KcVGsryKN6cjE7yCDasnA7R2rVBV/7NWeJV77bmzT5O//rW4yIfUIg==
           thor.empty_directory File.join(knife_config_dir, name)
           thor.empty_directory File.join(knife_config_dir, 'keys')
 
-          thor.create_file(File.join(knife_config_dir, name, "#{knife_config[:node_name]}.pem"), private_key, :force => true) if private_key
-          thor.create_file(File.join(knife_config_dir, name, "#{knife_config[:validation_client_name]}.pem"), private_key, :force => true) if validation_key
+          thor.create_file(File.join(knife_config_dir, name, "#{knife_config[:node_name]}.pem"), @private_key, :force => true) if @private_key
+          thor.create_file(File.join(knife_config_dir, name, "#{knife_config[:validation_client_name]}.pem"), @validation_key, :force => true) if @validation_key
 
           validate_knife_config(knife_config_file) unless name == 'local'
 

data/lib/fhcap/version.rb

@@ -1,3 +1,3 @@
 module Fhcap
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

data/templates/chef/environment_core.json.erb

@@ -16,7 +16,6 @@ def random_key(name)
     @keys[name] = SecureRandom.urlsafe_base64(16)
   end
   @keys[name]
-  
 end
 -%>
 {
@@ -61,7 +60,7 @@ end
     },
     "feedhenry_galera": {
       "cluster_enabled": true,
-      "safe-updates": false,
+      "safe-updates": true,
       "wsrep": {
         "password": "<%= random_password('galerawsrep') %>"
       }
@@ -104,7 +103,7 @@ end
     "fh-metrics": {
       "conf": {
         "metrics": {
-          "metricsAPIKey": "<%=random_key('fh-metrics')%>",  
+          "metricsAPIKey": "<%=random_key('fh-metrics')%>",
           "database": {
             "auth": {
               "user": "u-messaging",
@@ -117,10 +116,10 @@ end
     "fh-supercore": {
       "conf": {
         "fhsupercore": {
-          "fhmetrics":{
+          "fhmetrics": {
             "apikey":"<%=random_key('fh-metrics')%>"
           },
-          "fhmessaging":{
+          "fhmessaging": {
             "apikey":"<%=random_key('fh-messaging')%>"
           },
           "database": {
@@ -134,15 +133,7 @@ end
       }
     },
     "millicore": {
-      "migrates": {
-        "enabled": true
-      },
       "conf": {
-        "csrf": {
-          "checks": {
-            "enabled": true
-          }
-        },
         "digger": {
           "polling": {
             "iphone": true,
@@ -168,22 +159,9 @@ end
             }
           }
         },
-        "fhaaa": {
-          "authorisation": {
-            "enabled": true
-          }
-        },
-        "fhcore": {
-          "polling_status": {
-            "enabled": false
-          }
-        },
         "git": {
-          "enabled": true,
           "admin-host": "git.<%= config[:domain] %>",
-          "external-host": "git.<%= config[:domain] %>",
-          "service": "gitlab-shell",
-          "enable-branch-selector": true
+          "external-host": "git.<%= config[:domain] %>"
         },
         "mongodb": {
           "migrates": {
@@ -209,14 +187,7 @@ end
         "studio-js-cloudresources-enabled": false,
         "studio-js-admin-environments-mbaases-ui": true,
         "studio-protocol": "http",
-        "millicore.protocol": "http",
-        "studio": {
-          "version": {
-            "option": {
-              "enabled": false
-            }
-          }
-        }
+        "millicore.protocol": "http"
       }
     },
     "mongodb": {
@@ -303,4 +274,4 @@ end
       "password": "feedhenry101"
     }
   }
-}
+}

data/templates/chef/environment_mbaas.json.erb

@@ -15,7 +15,6 @@ def random_key(name)
     @keys[name] = SecureRandom.urlsafe_base64(16)
   end
   @keys[name]
-  
 end
 -%>
 {
@@ -76,22 +75,22 @@ end
           "username": "df-<%= config[:name] %>",
           "_password": "<%= random_password('fh-proxy') %>"
         },
-        "fhmetrics":{
+        "fhmetrics": {
           "apikey": "<%=random_key('fh-metrics')%>"
         },
-        "fhmessaging":{
+        "fhmessaging": {
           "apikey": "<%=random_key('fh-messaging')%>"
         }
       }
     },
-    "fh-metrics":{
+    "fh-metrics": {
       "conf":{
         "metrics": {
           "metricsAPIKey": "<%=random_key('fh-metrics')%>"
         }
       }
     },
-    "fh-messaging":{
+    "fh-messaging": {
       "conf":{
         "msgAPIKey":  "<%=random_key('fh-messaging')%>"
       }
@@ -100,10 +99,7 @@ end
       "conf": {
         "fhproxy": {
           "user": "df-<%= config[:name] %>",
-          "passwd": "<%= random_password('fh-proxy') %>",
-          "suspendapps": {
-            "inactive_minutes": 10080
-          }
+          "passwd": "<%= random_password('fh-proxy') %>"
         }
       }
     },
@@ -152,4 +148,4 @@ end
       }
     }
   }
-}
+}

data/templates/chef/environment_single.json.erb

@@ -95,10 +95,7 @@ end
       "conf": {
         "fhproxy": {
           "port": 9080,
-          "user": "df-<%= config[:name] %>",
-          "suspendapps": {
-            "inactive_minutes": 10080
-          }
+          "user": "df-<%= config[:name] %>"
         }
       }
     },

data/templates/cluster/aws/core-small-9node.json.erb

@@ -271,7 +271,7 @@
         "subnet": "1a"
       },
       "load_balancers": ["scm", "messaging", "metrics"],
-      "run_list": ["role[mount_data_volumes]", "role[fh-scm]", "role[fh-messaging]", "role[fh-metrics]", "role[fh-docs]", "role[fh-stats]"],
+      "run_list": ["role[mount_data_volumes]", "role[fh-scm]", "role[fh-messaging]", "role[fh-metrics]", "role[fh-stats]"],
       "source_dest_check": true
     },
     "util2": {

data/templates/cluster/aws/farm-3node.json.erb

@@ -32,6 +32,12 @@
           "start": 443,
           "end": 443,
           "sources": ["0.0.0.0/0"]
+        },
+        {
+          "protocols": ["tcp"],
+          "start": 80,
+          "end": 80,
+          "sources": ["0.0.0.0/0"]
         }
       ]
     },

data/templates/cluster/aws/farm-single.json.erb

@@ -32,6 +32,12 @@
           "start": 443,
           "end": 443,
           "sources": ["0.0.0.0/0"]
+        },
+        {
+          "protocols": ["tcp"],
+          "start": 80,
+          "end": 80,
+          "sources": ["0.0.0.0/0"]
         }
       ]
     },

data/templates/cluster/aws/mbaas-3node.json.erb

@@ -17,12 +17,6 @@
   "security_groups": {
     "<%= config[:environment_name] %>-api-lb": {
       "authorize_ingress": [
-        {
-          "protocols": ["tcp"],
-          "start": 80,
-          "end": 80,
-          "sources": ["0.0.0.0/0"]
-        },
         {
           "protocols": ["tcp"],
           "start": 443,
@@ -44,12 +38,6 @@
           "start": -1,
           "end": -1,
           "groups": ["<%= config[:environment_name] %>"]
-        },
-        {
-          "protocols": ["tcp"],
-          "start": 80,
-          "end": 80,
-          "groups": ["<%= config[:environment_name] %>-api-lb"]
         }
       ]
     },
@@ -80,12 +68,6 @@
       "subnets": ["1a", "1b"],
       "scheme": "internet-facing",
       "listeners": [
-        {
-          "port": 80,
-          "protocol": "http",
-          "instance_port": 80,
-          "instance_protocol": "http"
-        },
         {
           "port": 443,
           "protocol": "https",

data/templates/cluster/openstack/core-small-9node.json.erb

@@ -17,7 +17,7 @@
       "run_list": ["role[galera_server]", "role[platform_mongo_server]", "role[rabbitmq_server]"]
     },
     "util1": {
-      "run_list": ["role[fh-scm]", "role[fh-messaging]", "role[fh-metrics]", "role[fh-docs]", "role[fh-stats]"]
+      "run_list": ["role[fh-scm]", "role[fh-messaging]", "role[fh-metrics]", "role[fh-stats]"]
     },
     "util2": {
       "run_list": ["role[fh-scm]", "role[fh-messaging]", "role[fh-metrics]", "role[fh-stats]"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fhcap-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Michael Nairn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -425,6 +425,8 @@ files:
 - lib/extensions/chef/provisioning.rb
 - lib/extensions/chef/provisioning/aws_driver/driver.rb
 - lib/extensions/chef/provisioning/chef_run_data.rb
+- lib/extensions/chef/resource/aws_ebs_volume.rb
+- lib/extensions/chef/resource/aws_instance.rb
 - lib/extensions/chef/solr/query/regexpable_query.rb
 - lib/extensions/cheffish/merged_config.rb
 - lib/fhcap.rb
@@ -591,7 +593,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.3
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.4