env_setup 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78f518974541de10a07ab4ed5f9fe126ae435859d30d2de063cbd903cfa3c99b
-  data.tar.gz: 52f4e06dc2db21cb4bcdc048e61a687ef0bc80a4a6ddf2c9eca14a95142be495
+  metadata.gz: 9eac51205869d1c0692b2e0f646c850ab73d501c4fb5991317f90c9a4bda8841
+  data.tar.gz: 25367896b58d2a8b2f173dd7b6f1a2b044b29c1329e00b1e6b64b45475f36ef1
 SHA512:
-  metadata.gz: ecfb474839b17b793687e44ad35a4b8a74d8977eafa8f4a8c73b2fc7dfe394d19aa21c54a4255046686e0c2972281b50393776defcc69541dc3718575593662d
-  data.tar.gz: dcb26f5c5894812693f575e9dfbaaf1c4b3317d9cf94f9b5a3fff202e4ff4850913b82341f847ff4058ebef7c04d0acba034e40cab231f703fcd5895812a0a45
+  metadata.gz: f8a31297a413089eb778c894904db38a0b8c57821ed14b09ecde3d0cadfb5066e9e3851a73fcb45d9857b91bc8725899d8f0e5ae722d754373ae740756dd31be
+  data.tar.gz: 0e92b90ebf6de86b492d7c6c74c15443a702476fd8a8e673d90dca9cc3fa02fbe47d4c02862483e405aa89032bb5a76181b79f83bc56b98144c7256f9c0742e5

data/bin/env_setup

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
-# require 'env_setup/env_builder'
+require 'env_setup/env_builder'
 require 'json'
 
 inputs = Hash[ARGV.flat_map { |s| s.scan(/--?([^=\s]+)(?:=(\S+))?/) }]
 template_file = inputs.delete('TEMPLATE')
-puts "template #{template_file}"
 template = JSON.parse(File.read(template_file))
 env_file = inputs.delete('ENV_FILE') || '.env'
 aws_access_key = inputs.delete('AWS_ACCESS_KEY')
@@ -13,11 +12,9 @@ aws_secret_access_key = inputs.delete('AWS_SECRET_ACCESS_KEY')
 aws_region = inputs.delete('AWS_REGION')
 aws_secret_name = inputs.delete('AWS_SECRET_NAME')
 generate_env_file = inputs.key?('GENERATE_ENV_FILE')
-env_name = inputs.delete('ENV_NAME')
 
 EnvSetup.configure do |config|
   config.template = template
-  config.env_name = env_name
   config.aws_access_key = aws_access_key
   config.aws_secret_access_key = aws_secret_access_key
   config.aws_region = aws_region

data/lib/env_setup/builder/json.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'env_setup/builder/base'
+require 'json'
+
+module EnvSetup
+  module Builder
+    class Json < Base
+      def call
+        template.to_s
+      end
+    end
+  end
+end

data/lib/env_setup/configuration.rb

@@ -3,7 +3,7 @@
 module EnvSetup
   class Configuration
     attr_accessor :aws_access_key, :aws_secret_access_key, :aws_region, :aws_secret_name,
-                  :template, :env_name
+                  :template
 
     def aws_ready?
       aws_secret_name && aws_access_key && aws_secret_access_key

data/lib/env_setup/env_builder.rb

@@ -5,6 +5,7 @@ require 'env_setup/builder/pattern'
 require 'env_setup/builder/input'
 require 'env_setup/builder/generator'
 require 'env_setup/builder/nested_value'
+require 'env_setup/builder/json'
 require 'aws-sdk-secretsmanager'
 
 module EnvSetup
@@ -18,7 +19,7 @@ module EnvSetup
 
     def build_json
       secrets = aws_secrets
-      configuration.template.merge(secrets).each do |key, var_template|
+      secrets.merge(configuration.template).each do |key, var_template|
         vars[key.to_s] = build_var(var_template)
       end
       vars
@@ -33,18 +34,23 @@ module EnvSetup
     private
 
     def var_builder(var_template)
-      builder = [
-        { builder: EnvSetup::Builder::Pattern, if: -> { var_template['pattern'] } },
-        { builder: EnvSetup::Builder::NestedValue, if: -> { var_template['value'] } },
-        { builder: EnvSetup::Builder::Input, if: -> { var_template['input'] } },
-        { builder: EnvSetup::Builder::Generator, if: -> { var_template['generator'] } }
-      ].find { |option| option[:if].call }
+      builder = var_builder_class(var_template)
 
       raise "Invalid var builder: #{var_template.inspect}" unless builder
 
       builder[:builder].new(var_template, vars.merge(inputs))
     end
 
+    def var_builder_class(var_template)
+      [
+        { builder: EnvSetup::Builder::Pattern, if: -> { var_template['pattern'] } },
+        { builder: EnvSetup::Builder::NestedValue, if: -> { var_template['value'] } },
+        { builder: EnvSetup::Builder::Input, if: -> { var_template['input'] } },
+        { builder: EnvSetup::Builder::Generator, if: -> { var_template['generator'] } },
+        { builder: EnvSetup::Builder::Json, if: -> { var_template.is_a?(Hash) } }
+      ].find { |option| option[:if].call }
+    end
+
     def configuration
       EnvSetup.configuration
     end

data/lib/env_setup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EnvSetup
-  VERSION = '0.1.3'
+  VERSION = '0.1.8'
 end

data/spec/env_setup/builder/json_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'env_setup/builder/json'
+
+RSpec.describe EnvSetup::Builder::Json do
+  let(:builder) { described_class.new(value, params) }
+  let(:params) { {} }
+  let(:value) do
+    {
+      'some' => {
+        'custom' => 'data'
+      }
+    }
+  end
+
+  it 'generates json string format' do
+    expect(builder.call).to eq "{\"some\"=>{\"custom\"=>\"data\"}}"
+  end
+end

data/spec/env_setup/env_builder_spec.rb

@@ -4,7 +4,6 @@ require 'env_setup/env_builder'
 
 RSpec.describe EnvSetup::EnvBuilder do
   describe '.build_json' do
-    let(:env_name) { 'PR-12345' }
     let(:secret) { SecureRandom.hex }
     let(:salt) { SecureRandom.hex(2) }
     let(:template) do
@@ -22,30 +21,41 @@ RSpec.describe EnvSetup::EnvBuilder do
         'APP_PASSWORD' => {
           'generator' => 'salt'
         },
+        'HOST' => { 'pattern' => 'wss://{{APP_NAME}}-community2-cable.{{DOMAIN}}/cable' },
         'INTEGRATION_APP_HOST' => {
           'input' => 'INTEGRATION_APP_HOST'
         },
         'INTEGRATION_APP_URL' => {
           'pattern' => '{{INTEGRATION_APP_HOST}}/api/integrate'
+        },
+        'WELCOME_MSG' => {
+          'pattern' => 'Welcome {{USERNAME}}'
+        },
+        'DOMAINS' => {
+          'APP' => ['abc.com', 'def.com'],
+          'ADMIN' => ['abc-admin.com', 'def-admin.com']
         }
       }
     end
 
     context 'with aws secrets manager' do
       let(:inputs) do
-        { 'INTEGRATION_APP_HOST' => 'https://integrate.foobar2.com' }
+        { 'INTEGRATION_APP_HOST' => 'https://integrate.foobar2.com', 'ENV_NAME' => 'PR-12345' }
       end
       let(:expected_json) do
         {
           'LANG' => 'en_US.UTF-8',
+          'USERNAME' => 'foo',
+          'HOST' => 'wss://pr-123-community2-cable.foobar.com/cable',
           'DOMAIN' => 'foobar.com',
           'APP_NAME' => 'pr-123',
-          'HOST' => 'wss://pr-123-community2-cable.foobar.com/cable',
           'APP_HOST' => 'https://pr-123.foobar.com',
           'APP_SECRET' => secret,
           'APP_PASSWORD' => salt,
           'INTEGRATION_APP_HOST' => inputs['INTEGRATION_APP_HOST'],
-          'INTEGRATION_APP_URL' => "#{inputs['INTEGRATION_APP_HOST']}/api/integrate"
+          'INTEGRATION_APP_URL' => "#{inputs['INTEGRATION_APP_HOST']}/api/integrate",
+          'WELCOME_MSG' => 'Welcome foo',
+          'DOMAINS' => '{"APP"=>["abc.com", "def.com"], "ADMIN"=>["abc-admin.com", "def-admin.com"]}'
         }
       end
 
@@ -55,7 +65,6 @@ RSpec.describe EnvSetup::EnvBuilder do
 
         allow(EnvSetup).to receive(:configuration).and_return(
           EnvSetup::Configuration.new.tap do |config|
-            config.env_name = env_name
             config.template = template
             config.aws_access_key = 'aws_access_key'
             config.aws_secret_access_key = 'aws_secret_access_key'
@@ -66,7 +75,7 @@ RSpec.describe EnvSetup::EnvBuilder do
         allow_any_instance_of(EnvSetup::EnvBuilder).to receive(:aws_secrets).and_return(
           {
             'LANG' => 'en_US.UTF-8',
-            'HOST' => {"pattern" => "wss://{{APP_NAME}}-community2-cable.{{DOMAIN}}/cable"},
+            'USERNAME' => 'foo'
           }
         )
       end
@@ -78,7 +87,7 @@ RSpec.describe EnvSetup::EnvBuilder do
 
     context 'without aws secrets manager' do
       let(:inputs) do
-        { 'INTEGRATION_APP_HOST' => 'https://integrate.foobar2.com' }
+        { 'INTEGRATION_APP_HOST' => 'https://integrate.foobar2.com', 'USERNAME' => 'foo' }
       end
       let(:expected_json) do
         {
@@ -87,8 +96,11 @@ RSpec.describe EnvSetup::EnvBuilder do
           'APP_HOST' => 'https://pr-123.foobar.com',
           'APP_SECRET' => secret,
           'APP_PASSWORD' => salt,
+          'HOST' => 'wss://pr-123-community2-cable.foobar.com/cable',
           'INTEGRATION_APP_HOST' => inputs['INTEGRATION_APP_HOST'],
-          'INTEGRATION_APP_URL' => "#{inputs['INTEGRATION_APP_HOST']}/api/integrate"
+          'INTEGRATION_APP_URL' => "#{inputs['INTEGRATION_APP_HOST']}/api/integrate",
+          'WELCOME_MSG' => 'Welcome foo',
+          'DOMAINS' => '{"APP"=>["abc.com", "def.com"], "ADMIN"=>["abc-admin.com", "def-admin.com"]}'
         }
       end
 
@@ -98,7 +110,6 @@ RSpec.describe EnvSetup::EnvBuilder do
 
         allow(EnvSetup).to receive(:configuration).and_return(
           EnvSetup::Configuration.new.tap do |config|
-            config.env_name = env_name
             config.template = template
           end
         )
@@ -108,74 +119,10 @@ RSpec.describe EnvSetup::EnvBuilder do
         expect(described_class.new(inputs).build_json).to eq expected_json
       end
     end
-
-    context 'test' do
-      before do
-        allow_any_instance_of(EnvSetup::Builder::Generator).to receive(:secret).and_return("secret")
-        allow_any_instance_of(EnvSetup::Builder::Generator).to receive(:salt).and_return("salt")
-
-        allow(EnvSetup).to receive(:configuration).and_return(
-          EnvSetup::Configuration.new.tap do |config|
-            config.env_name = 'pr-123'
-            config.template = template
-          end
-        )
-      end
-
-      let(:template) do
-        {
-          "ASSET_HOST": {
-            "pattern": "https://{{ENV_NAME}}.{{DOMAIN}}"
-          },
-          "CANONICAL_URL": {
-            "pattern": "https://{{ENV_NAME}}.{{DOMAIN}}"
-          },
-          "DISCOURSE_AUTH_DOMAIN": {
-            "pattern": "https://{{ENV_NAME}}.goeatrightnow.com"
-          },
-          "DOMAIN_NAME": {
-            "input": "DOMAIN"
-          },
-          "MESSENGER_URI": {
-            "input": "MESSENGER_URI"
-          },
-          "MSCOMMUNITY_URL": {
-            "input": "MSCOMMUNITY_URL"
-          },
-          "PROGRAM_BBS_APP_HOST": {
-            "pattern": "{{ENV_NAME}}.breathebysharecare.com"
-          },
-          "PROGRAM_CTQ_APP_HOST": {
-            "pattern": "{{ENV_NAME}}.cravingtoquit.com"
-          },
-          "PROGRAM_ERN_APP_HOST": {
-            "pattern": "{{ENV_NAME}}.goeatrightnow.com"
-          },
-          "PROGRAM_UA_APP_HOST": {
-            "pattern": "{{ENV_NAME}}.unwindinganxiety.com"
-          },
-          "PROGRAM_UFS_APP_HOST": {
-            "pattern": "{{ENV_NAME}}.unwindingfromsharecare.com"
-          }
-        }
-      end
-
-      let(:inputs) do
-        {
-          'DOMAIN' => 'mindsciences.net',
-          'MESSENGER_URI' => 'messenger.mindsciences.net',
-          'MSCOMMUNITY_URL' => 'mscom.mindsciences.net'
-        }
-      end
-
-      it 'generate json' do
-        described_class.new(inputs).build_json
-      end
-    end
   end
 
   describe '.build_var' do
-    let(:inputs) { { 'MY_VAR' => 'Hey!', 'FOO' => 'bar' } }
+    let(:inputs) { { 'MY_VAR' => 'Hey!', 'FOO' => 'bar', 'ENV_NAME' => 'env-test' } }
     let(:env_name) { 'env-test' }
     let(:template) { {} }
     let(:builder) { described_class.new(inputs) }
@@ -183,7 +130,6 @@ RSpec.describe EnvSetup::EnvBuilder do
     before do
       EnvSetup.configure do |config|
         config.template = template
-        config.env_name = env_name
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: env_setup
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Jonatas Daniel Hermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - lib/env_setup/builder/base.rb
 - lib/env_setup/builder/generator.rb
 - lib/env_setup/builder/input.rb
+- lib/env_setup/builder/json.rb
 - lib/env_setup/builder/nested_value.rb
 - lib/env_setup/builder/pattern.rb
 - lib/env_setup/configuration.rb
@@ -103,6 +104,7 @@ files:
 - lib/env_setup/version.rb
 - spec/env_setup/builder/generator_spec.rb
 - spec/env_setup/builder/input_spec.rb
+- spec/env_setup/builder/json_spec.rb
 - spec/env_setup/builder/pattern_spec.rb
 - spec/env_setup/env_builder_spec.rb
 - spec/env_setup_spec.rb
@@ -134,5 +136,6 @@ test_files:
 - spec/env_setup_spec.rb
 - spec/env_setup/env_builder_spec.rb
 - spec/env_setup/builder/generator_spec.rb
+- spec/env_setup/builder/json_spec.rb
 - spec/env_setup/builder/pattern_spec.rb
 - spec/env_setup/builder/input_spec.rb