convection 2.2.13 → 2.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc4c4bbe225ec33757f900d24c62f5629644e4ae
-  data.tar.gz: b3e00e9748782113a6a7491cacb12cdc0b2f71e0
+  metadata.gz: db4f0ff7ceba52ed22c04a56074eb50a8e47bbb7
+  data.tar.gz: 451da49003a3086b1d66817c2cefd3533d3e47d1
 SHA512:
-  metadata.gz: 731c78af0486d452e249a27c40499bbe4d44d44df7a5fd35c7501c6104ddb4720ccdf60b870574f2b3808510a85870530351e241a20aa6167fe712116a21d09f
-  data.tar.gz: 88af87c51fa62ca1be9e73748d90abfe9a0bbb63b0946d028fe3a5a2ae01eb218b6285ae4145faf4fb40acac07cf2cfb864697dad6678a7e156679a6529bc653
+  metadata.gz: 3f72ea77bd23236a874b0072481505fc330bf060dff21d6f3cdd2cda4ddf3f285ec05953caeb2634277e3b7302b4669b1dd88718d58d335b187e88dae0b17691
+  data.tar.gz: 246c0a685b68d385eb9d3cacbf48ba441734f8b352158e30cd162782039b3174aed21e65c72a303195e986171c2f9646f21d7f6ffa4b45211f2355f044bec6fe

data/lib/convection/model/template/resource/aws_cloud_watch_alarm.rb

@@ -24,6 +24,44 @@ module Convection
           property :statistic, 'Statistic'
           property :threshold, 'Threshold'
           property :unit, 'Unit'
+
+          def terraform_import_commands(module_path: 'root')
+            prefix = "#{module_path}." unless module_path == 'root'
+            commands = ['# Run the following commands to import your infrastructure into terraform management.', '# ensure :module_path is set correctly', '']
+            commands << "terraform import #{prefix}aws_cloudwatch_metric_alarm.#{name.underscore} #{stack.resources[name].physical_resource_id}"
+            commands << ''
+            commands
+          end
+
+          def to_hcl_json(*)
+            tf_alarm_attrs = {
+              alarm_name: alarm_name,
+              comparison_operator: comparison_operator,
+              evaluation_periods: evaluation_periods,
+              metric_name: metric_name,
+              namespace: namespace,
+              period: period,
+              statistic: statistic,
+              threshold: threshold,
+              actions_enabled: actions_enabled,
+              alarm_actions: alarm_action,
+              alarm_description: alarm_description,
+              dimensions: dimension,
+              insufficient_data_actions: insufficient_data_action,
+              ok_actions: ok_action,
+              unit: unit
+            }
+
+            tf_alarm_attrs.reject! { |_, v| v.nil? }
+
+            tf_alarm = {
+              aws_cloudwatch_metric_alarm: {
+                name.underscore => tf_alarm_attrs
+              }
+            }
+
+            { resource: [tf_alarm] }.to_json
+          end
         end
       end
     end

data/lib/convection/model/template/resource/aws_iam_user.rb

@@ -94,7 +94,6 @@ module Convection
                 {
                   aws_iam_user: {
                     name.underscore => {
-                      managed_policy_arns: '${var.managed_policy_arns}',
                       name: '${var.name}',
                       path: '${var.path}'
                     }
@@ -114,6 +113,15 @@ module Convection
                 }
               }
             end
+            policy_resources << {
+              aws_iam_user_policy_attachment: {
+                "#{name.underscore}_managed" => {
+                  count: managed_policy_arn.count,
+                  user: "${aws_iam_user.#{name.underscore}.id}",
+                  policy_arn: '${element(var.managed_policy_arns, count.index)}'
+                }
+              }
+            }
             result["#{module_prefix}#{name.underscore}-policy.tf.json"] = { resource: policy_resources }
 
             result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 2.2.13
+  version: 2.2.14
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport