skull_island 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b1ddcc4d39d09012c127f337b438f83c2e5397f8e05ecfb87d696872bd57544
-  data.tar.gz: f096c22899ea60a9f35053b22f9cd628c2f7677dd3065417aee2d83404ba7f90
+  metadata.gz: 7ae162b00d41479f3b316a7eee57bbb4139cdb24364016c8c9d86e97814cd5a8
+  data.tar.gz: '091baaeb7c97ffa277426aba9aae09f45134d9b7d001a69ff8ff862e28bb2273'
 SHA512:
-  metadata.gz: 100b4cd19f08fd8499e8c13fab6871faf1c635edc1968f34d280c56b0f1d665244e29dbe52ef4a583a6762ab8bdaa7f2e86a0717f06277a2d51f8a29316b0e29
-  data.tar.gz: 21bf5f772e7be86408fae7b0e6791a2c698e8bc8b1aee6815d00a4cb5c30e4235b4720519fc99239044961d62ed08f69aabcb4d891faa981435fd5fcb642b8ce
+  metadata.gz: 1453614d3ecf8b88f1c8e484b1d9f8a16ac52f90caf1996289677348f8bd4d31346ba8f8fc0abbfb7430042d170300ef80542265044331939657d4fc42f79c17
+  data.tar.gz: 217318107925b29eb979a10660c237d7687411c149ad97c2f54c88ffdcb154d3f76a3c2097dd5d9e872f7e7c38134ec44142babd8cc69106fc401aae534e3216

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    skull_island (0.2.4)
+    skull_island (0.2.5)
       deepsort (~> 0.4)
       erubi (~> 1.8)
       json (~> 2.1)

data/README.md

@@ -118,6 +118,7 @@ The import/export CLI functions produce YAML with support for embedded Ruby ([ER
 ```yaml
 ---
 version: '0.14'
+certificates: []
 consumers:
 - username: foo
   custom_id: foo
@@ -127,6 +128,7 @@ consumers:
     basic-auth:
     - username: foo
       password: bar
+upstreams: []
 services:
 - name: apidocs
   protocol: https
@@ -160,7 +162,6 @@ services:
     regex_priority: 0
     strip_path: true
     preserve_host: false
-upstreams: []
 plugins:
 - name: key-auth
   enabled: true
@@ -176,7 +177,9 @@ plugins:
 
 All top-level keys (other than `version`) require an Array as a parameter, either by providing a list of entries or an empty Array (`[]`). The above shows how to use the `lookup()` function to refer to another resource. This "looks up" the resource type (`service` in this case) by `name` (`search_api` in this case) and resolves its `id`. This function can also be used to lookup a `route` or `upstream` by its `name`, or a `consumer` by its `username`. Note that Kong itself doesn't _require_ `route` resources to have unique names, so you'll need to enforce that practice yourself for `lookup` to be useful for Routes.
 
+While technically _any_ Ruby is valid, the following are pretty helpful for templating your YAML files:
 
+* `ENV.fetch('VARIABLE_NAME', 'default value')` - This allows looking up the environment variable `VARIABLE_NAME` and using its value, or, if it isn't defined, it uses `default value` as the value. With this we could change `host: api.example.com` to `host: <%= ENV.fetch('API_HOST', 'api.example.com') %>`. With this, if `API_HOST` is provided, it'll use that, otherwise it will default to `api.example.com`.
 
 ## SDK Usage
 
@@ -275,7 +278,7 @@ my_consumer.username
 Some resource types are related to others, such as `Routes` and `Services`:
 
 ```ruby
-service = Resources::Services.all.first
+service = Resources::Service.all.first
 # => #<SkullIsland::Resources::Services:0x00007f9f201f6f44...
 service.routes
 # => #<SkullIsland::ResourceCollection:0x00007f9f1e569e1d...

data/lib/skull_island/cli.rb

@@ -27,9 +27,10 @@ module SkullIsland
       output = { 'version' => '0.14' }
 
       [
+        Resources::Certificate,
         Resources::Consumer,
-        Resources::Service,
         Resources::Upstream,
+        Resources::Service,
         Resources::Plugin
       ].each { |clname| export_class(clname, output) }
 
@@ -64,9 +65,10 @@ module SkullIsland
       # rubocop:enable Security/YAMLLoad
 
       [
+        Resources::Certificate,
         Resources::Consumer,
-        Resources::Service,
         Resources::Upstream,
+        Resources::Service,
         Resources::Plugin
       ].each { |clname| import_class(clname, input) }
     end

data/lib/skull_island/resources/upstream.rb

@@ -90,7 +90,7 @@ module SkullIsland
         # TODO: do something with lazy requests...
 
         ResourceCollection.new(
-          target_list_data[root].each do |record|
+          target_list_data[root].map do |record|
             UpstreamTarget.new(
               entity: record,
               lazy: false,

data/lib/skull_island/version.rb

@@ -4,6 +4,6 @@ module SkullIsland
   VERSION = [
     0, # Major
     2, # Minor
-    4  # Patch
+    5  # Patch
   ].join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skull_island
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deepsort