kumogata-template 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cede7ec16cf8dfa6eaf114c7d174252170ff0fb8
-  data.tar.gz: 0eb8dd98244a6ed989e5b396a105b01dcbe859ae
+  metadata.gz: cbf61b8ef2bf5c32a549e814951df8e3b0d4cb07
+  data.tar.gz: 6a90ad4bf7b62fe24b80e2fd2eb3ae7168a69d40
 SHA512:
-  metadata.gz: 423ad65c4b044094dcf0500d49e36640d93e131e0bf310b6cc5eca4f3d0c279b05d9bfe748f4f3283356749ba5b463a328e2b8dd285b5f867c11c97600be8bfd
-  data.tar.gz: 8f8416f949aa84254cd7e4387117d02d15ad687df355e621ad0d9d0a379de2e3e51253c70bbd994c9bee4229291f877935feda0d7ae4f0735213bc9438cf57c5
+  metadata.gz: '0019ed1d64bad5e176a59482d69d4cba3f29e7ce5782e934aca546a92acdb55182e1521b3065cdcdfdcf56e06a4d7d4560d4e12a1fcbd3cc82a9756bb7571bff'
+  data.tar.gz: 4612fc3e3861d342cb056bd1ada8db81817ed3a270ba6827bf87273e063d88e82066c11834f2576a92c28555ff3cac38e22bf17705662f040e512482a774e7ec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kumogata-template (0.0.23)
+    kumogata-template (0.0.24)
       aws-sdk (~> 2.3)
       kumogata (= 0.5.12)
 

data/lib/kumogata/template.rb

@@ -10,6 +10,7 @@ require 'kumogata/template/const'
 require 'kumogata/template/datapipeline'
 require 'kumogata/template/dynamodb'
 require 'kumogata/template/ec2'
+require 'kumogata/template/ecr'
 require 'kumogata/template/ecs'
 require 'kumogata/template/elasticache'
 require 'kumogata/template/elasticbeanstalk'

data/lib/kumogata/template/ecr.rb

@@ -0,0 +1,24 @@
+#
+# Helper - ECR
+#
+require 'kumogata/template/helper'
+
+
+def _ecr_policy(name, args)
+  action = args[name.to_sym][:action] || []
+  user = args[name.to_sym][:user] || []
+  users = []
+  user.each do |v|
+    users << _iam_arn("iam", { account_id: v[:id], type: "user", user: v[:name] })
+  end
+  principal = _{
+    AWS users
+  }
+  policy = {
+    service: "ecr",
+    action: action,
+    principal: principal,
+    no_resource: true,
+  }
+  _iam_policy_document("policy", { policy: [ policy ] })
+end

data/lib/kumogata/template/iam.rb

@@ -18,7 +18,7 @@ end
 
 def _iam_policies(name, args)
   array = []
-  policies = args["#{name}".to_sym] || []
+  policies = args[name.to_sym] || []
   policies.each_with_index do |v, i|
     array << _{
       PolicyDocument _iam_policy_document("document", v)
@@ -30,7 +30,7 @@ end
 
 def _iam_policy_document(name, args)
   array = []
-  documents = args["#{name}".to_sym] || []
+  documents = args[name.to_sym] || []
 
   documents.each do |v|
     service = v[:service] || ""
@@ -51,7 +51,7 @@ def _iam_policy_document(name, args)
     array << _{
       Effect v[:effect] || "Allow"
       Action actions
-      Resource resource
+      Resource resource unless v.key? :no_resource
       Principal v[:principal] if v.key? :principal
     }
   end
@@ -150,7 +150,7 @@ def _iam_s3_bucket_policy(region, bucket, prefix, aws_account_id)
      service: "s3",
      action: [ "PutObject" ],
      principal: {
-       "AWS": [ account_id ],
+       AWS: [ account_id ],
      },
      resource: resource,
    },

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.23'
+KUMOGATA_TEMPLATE_VERSION = '0.0.24'

data/template/ecr-repository.rb

@@ -0,0 +1,21 @@
+#
+# ECR Repository resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/ecr'
+
+name = _resource_name(args[:name], "ecr repository")
+repo_name = _ref_name("name", args)
+policy = _ecr_policy("policy", args)
+
+_(name) do
+  Type "AWS::ECR::Repository"
+  Properties do
+    RepositoryName repo_name
+    RepositoryPolicyText do
+      Version "2012-10-17"
+      Statement policy
+    end
+  end
+end

data/test/template/ecr-repository_test.rb

@@ -0,0 +1,55 @@
+require 'abstract_unit'
+
+class EcrRepositoryTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+action = %w(
+  GetDownloadUrlForLayer
+  BatchGetImage
+  BatchCheckLayerAvailability
+  PutImage
+  InitiateLayerUpload
+  UploadLayerPart
+  CompleteLayerUpload
+)
+user = [
+  { id: 1, name: "test" }
+]
+_ecr_repository "test", { policy: { action: action, user: user } }
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestEcrRepository": {
+    "Type": "AWS::ECR::Repository",
+    "Properties": {
+      "RepositoryName": "test",
+      "RepositoryPolicyText": {
+        "Version": "2012-10-17",
+        "Statement": [
+          {
+            "Effect": "Allow",
+            "Action": [
+              "ecr:GetDownloadUrlForLayer",
+              "ecr:BatchGetImage",
+              "ecr:BatchCheckLayerAvailability",
+              "ecr:PutImage",
+              "ecr:InitiateLayerUpload",
+              "ecr:UploadLayerPart",
+              "ecr:CompleteLayerUpload"
+            ],
+            "Principal": {
+              "AWS": [
+                "arn:aws:iam::1:user/test"
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumogata-template
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Naoya Nakazawa
@@ -111,6 +111,7 @@ files:
 - lib/kumogata/template/datapipeline.rb
 - lib/kumogata/template/dynamodb.rb
 - lib/kumogata/template/ec2.rb
+- lib/kumogata/template/ecr.rb
 - lib/kumogata/template/ecs.rb
 - lib/kumogata/template/elasticache.rb
 - lib/kumogata/template/elasticbeanstalk.rb
@@ -169,6 +170,7 @@ files:
 - template/ec2-vpc-endpoint.rb
 - template/ec2-vpc-gateway-attachment.rb
 - template/ec2-vpc.rb
+- template/ecr-repository.rb
 - template/ecs-cluster.rb
 - template/ecs-service.rb
 - template/ecs-task-definition.rb
@@ -311,6 +313,7 @@ files:
 - test/template/ec2-volume_test.rb
 - test/template/ec2-vpc-gateway-attachment_test.rb
 - test/template/ec2-vpc_test.rb
+- test/template/ecr-repository_test.rb
 - test/template/ecs-cluster_test.rb
 - test/template/ecs-service_test.rb
 - test/template/ecs-task-definition_test.rb
@@ -479,6 +482,7 @@ test_files:
 - test/template/ec2-volume_test.rb
 - test/template/ec2-vpc-gateway-attachment_test.rb
 - test/template/ec2-vpc_test.rb
+- test/template/ecr-repository_test.rb
 - test/template/ecs-cluster_test.rb
 - test/template/ecs-service_test.rb
 - test/template/ecs-task-definition_test.rb