terrafying-components 1.7.9 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfacd67a43971d55961b42b76675fed960dab38b73abd90111bfc34e4aaa1e92
-  data.tar.gz: 59b77a22c13d919d635a4d7b74feda39e66c5b790cd641c099ad33faf12bf698
+  metadata.gz: 55faf0808fc9982431b901ab4a2bf8faedf8eb471f040340b1075e5982d61aa0
+  data.tar.gz: f81aec1f8b7236d05d9e234531827c9f7f05e9e06c2e927b42368e5d5cba3bf7
 SHA512:
-  metadata.gz: 6c77f02df068b58f294b5162f14f21c0e2c9a95587355c8fb1d15c536ee7b9cb78426da79dedea6bd7455e34de40254e5b33f69128b5165f4fee2f0871c6f4eb
-  data.tar.gz: 1f9e955e594e5b1a908ab1c0ef4d722cbf9ee380274d3bf7eed3dc9ca403635fb7e56faea925a95ab3b42cad9530c2befa0fa5f5c5c862713ea806ada88db9d9
+  metadata.gz: 0c0012e3b2469b6de2cc9c9de6c8d4ce995e07d3f5b3ec17ad3cfd5e78f9c5b08d31784f6d538963623c46ee6c81c3a81a27ba6f1dbe16a73dbda91957a0d82e
+  data.tar.gz: d7eba0ca0c56aae91f8cab7b9bdd726cebe07ed1a3de09645667d1424583d2afa97dbbd31b857bd35106cc6d37e09fec574602f9c1ae8dd30823e6252411e4ff

data/lib/terrafying/components/letsencrypt.rb

@@ -1,34 +1,36 @@
+# frozen_string_literal: true
 
 require 'terrafying/components/ca'
 require 'terrafying/generator'
 require 'open-uri'
 module Terrafying
-
   module Components
-
     class LetsEncrypt < Terrafying::Context
 
       attr_reader :name, :source
 
-      PROVIDERS = {
-        staging: {
-          server_url: 'https://acme-staging.api.letsencrypt.org/directory',
-          ca_cert:    'https://letsencrypt.org/certs/fakeleintermediatex1.pem'
-        },
-        live:    {
-          server_url: 'https://acme-v01.api.letsencrypt.org/directory',
-          ca_cert:    'https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem.txt'
-        }
-      }.freeze
-
       include CA
 
       def self.create(name, bucket, options={})
         LetsEncrypt.new.create name, bucket, options
       end
 
-      def initialize()
+      def initialize
         super
+        @acme_providers = setup_providers
+      end
+
+      def setup_providers
+        {
+          staging: {
+            ref: provider(:acme, alias: :staging, server_url: 'https://acme-staging-v02.api.letsencrypt.org/directory'),
+            ca_cert: 'https://letsencrypt.org/certs/fakeleintermediatex1.pem'
+          },
+          live: {
+            ref: provider(:acme, alias: :live, server_url: 'https://acme-v02.api.letsencrypt.org/directory'),
+            ca_cert: 'https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem.txt'
+          }
+        }
       end
 
       def create(name, bucket, options={})
@@ -42,9 +44,8 @@ module Terrafying
         @name = name
         @bucket = bucket
         @prefix = options[:prefix]
-        @provider = PROVIDERS[options[:provider].to_sym]
+        @acme_provider = @acme_providers[options[:provider]]
 
-        provider :acme, {}
         provider :tls, {}
 
         resource :tls_private_key, "#{@name}-account", {
@@ -52,31 +53,31 @@ module Terrafying
                    ecdsa_curve: "P384",
                  }
 
-        @account_key = output_of(:tls_private_key, "#{@name}-account", "private_key_pem")
+        resource :acme_registration, "#{@name}-reg", {
+          provider: @acme_provider[:ref],
+          account_key_pem: output_of(:tls_private_key, "#{@name}-account", "private_key_pem"),
+          email_address: options[:email_address],
+        }
 
-        @registration_url = resource :acme_registration, "#{@name}-reg", {
-                                       server_url: @provider[:server_url],
-                                       account_key_pem: @account_key,
-                                       email_address: options[:email_address],
-                                     }
+        @account_key = output_of(:acme_registration, "#{@name}-reg", 'account_key_pem')
 
         resource :aws_s3_bucket_object, "#{@name}-account", {
-                   bucket: @bucket,
-                   key: File.join(@prefix, @name, "account.key"),
-                   content: @account_key,
-                 }
+          bucket: @bucket,
+          key: File.join(@prefix, @name, "account.key"),
+          content: @account_key,
+        }
 
         @ca_cert_acl = options[:public_certificate] ? 'public-read' : 'private'
 
-        open(@provider[:ca_cert], 'rb') do |cert|
+        open(@acme_provider[:ca_cert], 'rb') do |cert|
           @ca_cert = cert.read
         end
 
         resource :aws_s3_bucket_object, "#{@name}-cert", {
-            bucket: @bucket,
-            key: File.join(@prefix, @name, "ca.cert"),
-            content: @ca_cert,
-            acl: @ca_cert_acl
+          bucket: @bucket,
+          key: File.join(@prefix, @name, "ca.cert"),
+          content: @ca_cert,
+          acl: @ca_cert_acl
         }
 
         @source = File.join("s3://", @bucket, @prefix, @name, "ca.cert")
@@ -118,9 +119,8 @@ module Terrafying
                      }
 
         ctx.resource :acme_certificate, key_ident, {
-                       server_url: @provider[:server_url],
+                       provider: @acme_provider[:ref],
                        account_key_pem: @account_key,
-                       registration_url: @registration_url,
                        min_days_remaining: options[:min_days_remaining],
                        dns_challenge: {
                          provider: "route53",

data/lib/terrafying/components/version.rb

@@ -1,5 +1,5 @@
 module Terrafying
   module Components
-    VERSION = "1.7.9"
+    VERSION = "1.8.0"
   end
 end

data/lib/terrafying/components/vpn.rb

@@ -122,32 +122,6 @@ module Terrafying
                             ],
                           }.merge(options[:service])
                         )
-
-        if oauth2_provider[:type] == "azure" and oauth2_provider[:register]
-
-          provider :null, {}
-
-          resource :null_resource, "ad-app-configure", {
-                     triggers: {
-                       service_resources: @service.resources.join(","),
-                     },
-                     provisioner: [
-                       {
-                         "local-exec" => {
-                           when: "create",
-                           command: "#{File.expand_path(File.dirname(__FILE__))}/support/register-vpn '#{oauth2_provider[:client_id]}' '#{oauth2_provider[:tenant_id]}' '#{@fqdn}'"
-                         },
-                       },
-                       {
-                         "local-exec" => {
-                           when: "destroy",
-                           command: "#{File.expand_path(File.dirname(__FILE__))}/support/deregister-vpn '#{oauth2_provider[:client_id]}' '#{oauth2_provider[:tenant_id]}' '#{@fqdn}'"
-                         }
-                       },
-                     ],
-                   }
-        end
-
         self
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 1.7.9
+  version: 1.8.0
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,8 +118,6 @@ files:
 - lib/terrafying/components/service.rb
 - lib/terrafying/components/staticset.rb
 - lib/terrafying/components/subnet.rb
-- lib/terrafying/components/support/deregister-vpn
-- lib/terrafying/components/support/register-vpn
 - lib/terrafying/components/templates/ignition.yaml
 - lib/terrafying/components/usable.rb
 - lib/terrafying/components/version.rb

data/lib/terrafying/components/support/deregister-vpn

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-app_id="${1}"
-tenant_id="${2}"
-new_fqdn="${3}"
-
-set +u
-if [[ ! -z $AZURE_USER ]] && [[ ! -z $AZURE_PASSWORD ]]
-then
-    set -u
-    az login --service-principal \
-       --allow-no-subscriptions \
-       -t "${tenant_id}" \
-       -u "${AZURE_USER}" \
-       -p "${AZURE_PASSWORD}" >/dev/null
-
-    function finish {
-        exit_code=$?
-        az logout
-        exit $exit_code
-    }
-    trap finish EXIT
-else
-    set -u
-fi
-
-app="$(az ad app show --id ${app_id})"
-
-function urls() {
-    echo ${app} | jq -r '.replyUrls | join("\n")'
-}
-
-if [[ $? == 0 ]]
-then
-  if urls | grep "${new_fqdn}" &>/dev/null
-  then
-      new_reply_urls="$(urls | grep -v "${new_fqdn}" | tr '\n' ' ')"
-
-      az ad app update --id ${app_id} --reply-urls ${new_reply_urls}
-  else
-    echo "Already doesn't contain a reply url for '${new_fqdn}'"
-  fi
-else
-  echo "App wasn't found"
-  exit 1
-fi

data/lib/terrafying/components/support/register-vpn

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-app_id="${1}"
-tenant_id="${2}"
-new_fqdn="${3}"
-
-set +u
-if [[ ! -z $AZURE_USER ]] && [[ ! -z $AZURE_PASSWORD ]]
-then
-    set -u
-    az login --service-principal \
-       --allow-no-subscriptions \
-       -t "${tenant_id}" \
-       -u "${AZURE_USER}" \
-       -p "${AZURE_PASSWORD}" >/dev/null
-
-    function finish {
-        exit_code=$?
-        az logout
-        exit $exit_code
-    }
-    trap finish EXIT
-else
-    set -u
-fi
-
-app="$(az ad app show --id ${app_id})"
-
-if [[ $? == 0 ]]
-then
-  reply_urls="$(echo ${app} | jq -r '.replyUrls | join(" ")')"
-
-  if echo "${reply_urls}" | grep "${new_fqdn}" &>/dev/null
-  then
-    echo "Already contains a reply url for '${new_fqdn}'"
-  else
-    new_reply_urls="${reply_urls} https://${new_fqdn}/oauth2/callback"
-
-    az ad app update --id ${app_id} --reply-urls ${new_reply_urls}
-  fi
-else
-  echo "App wasn't found"
-  exit 1
-fi