cloud_compose 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 911ce0a7cef992d7d2f3444a8af8b4a048607b7bc7ab1654f4f393ae0f99601b
-  data.tar.gz: a140ca4dab194b1baa95af251caf6932451626f385e9461728818b962c6b45de
+  metadata.gz: ac283bb55bcf40add93a3946568a01957ee43960a19fd5be45bb9c68a0d73191
+  data.tar.gz: 1c34ac3b7fb9170826d1f8c4a948885def05de9608a35b317d618e1ac9bd04ff
 SHA512:
-  metadata.gz: 9b28093b6baf4811a934554a76bed2bb8733628ea7e8f3f5b58d77173a5fb1cc561435b3466195cbe851d12a548c2b22ce8c8745756ad805fa185a179b75116c
-  data.tar.gz: 99f7e122d7b1729c406abb88ec26c7fcf7358a202c0ac6ad2ae925b64d6213bdb2a965e3e264ed847b7c3839c3dc5ce5c9d0b05ea434b9f13ac3bf379d60703a
+  metadata.gz: 1a1ae8b4a4e5ef9b76c108b9c9d3325ed8e8a125018060b18f466a79b659a60d4d9cea20b037cc52d04e87b0636e94f586fba6e515a880781e1fcc6bea093a35
+  data.tar.gz: 591cb3e9ba60076644ef7dd61f6b23c7111f3eb7e3685cdecd0feeaff623503362da05515d5940531fc23189b9a7caec119bd1baab0034a4b4774d6572b60a14

data/README.md

@@ -2,7 +2,7 @@
 
 Compose multiple cloud formation templates into one file.
 
-`cloud-compose ./template.yml ./output`
+`cloud-compose build ./template.yml ./output`
 
 ```yaml
 # template.yml
@@ -15,6 +15,22 @@ $cloud_compose:
       path: ./sub_readme.yml
     - name: SubTemplateTwo
       path: ./sub_readme.yml
+    - name: DevUserOne
+      path: !Builtin iam_console_user.yml
+      parameters:
+        username: dev-user-one
+---
+
+Resources:
+  $(GlobalName)MainResource:
+    Type: AWS::Fake::Thing
+    Properties:
+      Name: My Main Resource
+  SecondaryResource:
+    Type: AWS::Fake::Thing
+    Properties:
+      ParentThing: !Ref $(GlobalName)MainResource
+
 ---
 
 Resources:
@@ -66,9 +82,42 @@ Resources:
     Type: AWS::Fake::Thing
     Properties:
       ParentThing: !Ref TestTemplateMainResource
+  DevUserOneUserAccount:
+    Type: AWS::IAM::User
+    Properties:
+      UserName: dev-user-one
+      ManagedPolicyArns: !Ref DevUserOneManagedPolicyArnsParameter
+      LoginProfile:
+        Password: !FindInMap
+        - DevUserOneUserAccount
+        - Password
+        - Value
+        PasswordResetRequired: true
+Parameters:
+  DevUserOneManagedPolicyArnsParameter:
+    Type: CommaDelimitedList
+    Description: List of Managed Profile Arns.
+    Default: arn:aws:iam::aws:policy/ReadOnlyAccess
+Mappings:
+  DevUserOneUserAccount:
+    Password:
+      Value: 124aa4d58a48b77b8b4397be
 Outputs:
   SubTemplateOneResourceOutput:
     Value: !Ref SubTemplateOneResource
   SubTemplateTwoResourceOutput:
     Value: !Ref SubTemplateTwoResource
+  DevUserOneUserAccountName:
+    Value: !Ref DevUserOneUserAccount
+  DevUserOneUserAccountArn:
+    Value: !GetAtt
+    - DevUserOneUserAccount
+    - Arn
+  DevUserOneUserAccountTemporaryPassword:
+    Value: !FindInMap
+    - DevUserOneUserAccount
+    - Password
+    - Value
+
+
 ```

data/exe/cloud-compose

@@ -1,17 +1,30 @@
 #!/usr/bin/env ruby
 
 require 'cloud_compose'
+require 'cloud_compose/cli'
 
-command = ARGV.shift
+COMMANDS = {
+  'build' => CloudCompose::Cli::Build,
+  'version' => ->(_) { STDOUT.puts CloudCompose::VERSION },
+  'help' => ->(_) { STDERR.puts HELP_MESSAGE },
+  'print' => CloudCompose::Cli::Print
+}.freeze
 
-case command
-when 'build'
-  input_file_path = File.expand_path(ARGV.shift)
-  output_file_path = File.expand_path(ARGV.shift || './') + '/' + File.basename(input_file_path)
+HELP_MESSAGE = <<~EOF.freeze
+  CloudCompose #{CloudCompose::VERSION} Help
 
-  template = CloudCompose::Template.new(input_file_path, File.expand_path('.'))
-  File.open(output_file_path, 'w') { |f| f.write(template.to_s) }
-else
-  STDERR.puts "Unknown Command #{command}"
+  Commands
+  #{COMMANDS.keys.map { |k| "  - #{k}" }.join("\n")}
+EOF
+
+command_name = ARGV.shift
+
+command_name = 'help' if command_name.nil? || command_name.empty?
+
+begin
+  command = COMMANDS.fetch(command_name)
+  command.call(ARGV)
+rescue StandardError => error
+  STDERR.puts "Error: #{error}"
   exit(1)
 end

data/lib/cloud_compose/builtin/iam_console_user.yml

@@ -0,0 +1,31 @@
+---
+$cloud_compose:
+  partial: true
+  require:
+    - username
+---
+Parameters:
+  $(name)ManagedPolicyArnsParameter:
+    Type: CommaDelimitedList
+    Description: List of Managed Profile Arns.
+    Default: arn:aws:iam::aws:policy/ReadOnlyAccess
+Mappings:
+  $(name)UserAccount:
+    Password:
+      Value: !Random [ hex, 12 ]
+Resources:
+  $(name)UserAccount:
+    Type: AWS::IAM::User
+    Properties:
+      UserName: $(username)
+      ManagedPolicyArns: !Ref $(name)ManagedPolicyArnsParameter
+      LoginProfile:
+        Password: !FindInMap [ $(name)UserAccount, Password, Value ]
+        PasswordResetRequired: true
+Outputs:
+  $(name)UserAccountName:
+    Value: !Ref $(name)UserAccount
+  $(name)UserAccountArn:
+    Value: !GetAtt [ $(name)UserAccount, Arn ]
+  $(name)UserAccountTemporaryPassword:
+    Value: !FindInMap [ $(name)UserAccount, Password, Value ]

data/lib/cloud_compose/cli.rb

@@ -0,0 +1,2 @@
+require_relative 'cli/build'
+require_relative 'cli/print'

data/lib/cloud_compose/cli/build.rb

@@ -0,0 +1,33 @@
+require 'pry'
+
+module CloudCompose
+  module Cli
+    class Build
+      class << self
+        def call(args)
+          input_file = args.shift
+
+          if input_file.nil?
+            raise ArgumentError, 'Missing input path `cloud-compose build <input-path>`'
+          end
+
+          template_path = File.expand_path(input_file)
+          template = CloudCompose::Template.new(template_path, File.expand_path('.'))
+          content = template.to_s
+
+          file_name = File.basename(template_path)
+          file_name.slice!(File.extname(file_name))
+          file_name += '-build.yml'
+          output_path = File.dirname(template_path)
+          output_path += "/#{file_name}"
+
+          File.open(output_path, 'w') do |f|
+            f.write(content)
+          end
+
+          STDERR.puts "Built: #{output_path}"
+        end
+      end
+    end
+  end
+end

data/lib/cloud_compose/cli/print.rb

@@ -0,0 +1,21 @@
+require_relative '../template'
+
+module CloudCompose
+  module Cli
+    class Print
+      class << self
+        def call(args)
+          input_file = args.shift
+
+          if input_file.nil?
+            raise ArgumentError, 'Missing input path `cloud-compose print <input-path>`'
+          end
+
+          template_path = File.expand_path(input_file)
+          template = CloudCompose::Template.new(template_path, File.expand_path('.'))
+          STDOUT.puts(template.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/cloud_compose/config.rb

@@ -35,7 +35,7 @@ module CloudCompose
     private
 
     def import_path(obj)
-      File.expand_path(obj.fetch('path'), @root)
+      File.expand_path(obj.fetch('path').to_s, @root)
     end
   end
 end

data/lib/cloud_compose/parser.rb

@@ -2,14 +2,17 @@ require 'psych'
 
 require_relative 'tags/simple_type'
 
+require_relative 'tags/builtin'
 require_relative 'tags/get_att'
 require_relative 'tags/sub'
+require_relative 'tags/random'
 
 module CloudCompose
   class Parser
     CUSTOM_TAGS = {
       '!And' => CloudCompose::Tags::And,
       '!Base64' => CloudCompose::Tags::Base64,
+      '!Builtin' => CloudCompose::Tags::Builtin,
       '!Cidr' => CloudCompose::Tags::Cidr,
       '!Condition' => CloudCompose::Tags::Condition,
       '!Equals' => CloudCompose::Tags::Equals,
@@ -21,6 +24,7 @@ module CloudCompose
       '!Join' => CloudCompose::Tags::Join,
       '!Not' => CloudCompose::Tags::Not,
       '!Or' => CloudCompose::Tags::Or,
+      '!Random' => CloudCompose::Tags::Random,
       '!Ref' => CloudCompose::Tags::Ref,
       '!Select' => CloudCompose::Tags::Select,
       '!Split' => CloudCompose::Tags::Split,

data/lib/cloud_compose/tags/builtin.rb

@@ -0,0 +1,32 @@
+require_relative 'base'
+
+module CloudCompose
+  module Tags
+    class Builtin < Base
+      def type_from_coder(_coder)
+        :scalar
+      end
+
+      def value_from_coder(coder)
+        case coder.type
+        when :scalar
+          path = File.expand_path('../builtin', File.dirname(__FILE__))
+          path += File::SEPARATOR
+          path += coder.scalar
+          path
+        else
+          raise InvalidTypeError.new(coder.tag, coder.type)
+        end
+      end
+
+      def encode_with(coder)
+        coder.tag = nil
+        coder.scalar = value
+      end
+
+      def to_s
+        value
+      end
+    end
+  end
+end

data/lib/cloud_compose/tags/random.rb

@@ -0,0 +1,34 @@
+require 'securerandom'
+
+require_relative 'base'
+
+module CloudCompose
+  module Tags
+    class Random < Base
+      def type_from_coder(_coder)
+        :scalar
+      end
+
+      def value_from_coder(coder)
+        case coder.type
+        when :seq
+          @random_type = coder.seq[0]
+          @random_count = coder.seq[1].to_i
+          []
+        else
+          raise InvalidTypeError.new(coder.tag, coder.type)
+        end
+      end
+
+      def encode_with(coder)
+        coder.tag = nil
+        case @random_type
+        when 'hex'
+          coder.scalar = SecureRandom.hex(@random_count)
+        else
+          raise ArgumentError, "Invalid Random Type #{@random_type}"
+        end
+      end
+    end
+  end
+end

data/lib/cloud_compose/template.rb

@@ -36,7 +36,7 @@ module CloudCompose
       @checksum = Digest::SHA256.hexdigest(content)
       parts = content.split(/^---/, 3)
       @config = CloudCompose::Config.new(parts[1], @root)
-      @content = parts[2]
+      @content = parts[2] || ''
     end
 
     def to_h
@@ -133,9 +133,7 @@ module CloudCompose
     end
 
     def create_hash(context)
-      CloudCompose::Parser.load_yaml(
-        CloudCompose::Processor.preprocess(content, context)
-      )
+      CloudCompose::Parser.load_yaml(CloudCompose::Processor.preprocess(content, context)) || {}
     end
 
     def preload_imports!

data/lib/cloud_compose/version.rb

@@ -1,3 +1,3 @@
 module CloudCompose
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud_compose
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Maddie Schipper
@@ -106,12 +106,18 @@ files:
 - Rakefile
 - exe/cloud-compose
 - lib/cloud_compose.rb
+- lib/cloud_compose/builtin/iam_console_user.yml
+- lib/cloud_compose/cli.rb
+- lib/cloud_compose/cli/build.rb
+- lib/cloud_compose/cli/print.rb
 - lib/cloud_compose/config.rb
 - lib/cloud_compose/parser.rb
 - lib/cloud_compose/processor.rb
 - lib/cloud_compose/tags/base.rb
+- lib/cloud_compose/tags/builtin.rb
 - lib/cloud_compose/tags/get_att.rb
 - lib/cloud_compose/tags/map_type.rb
+- lib/cloud_compose/tags/random.rb
 - lib/cloud_compose/tags/scalar_type.rb
 - lib/cloud_compose/tags/sequenced_type.rb
 - lib/cloud_compose/tags/simple_type.rb