scout-camp 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e19b9f83e8b15a04642fa32d87a0af095b382a9698c169c454edffda2cdc1f
-  data.tar.gz: 92f2e5d29ed614db92ed7bfe3cdb25a55f2d64b2c8ab91bc12dda8939dfb76db
+  metadata.gz: bc2855face5f3cb3ced365171398295b656f378fc681da6f0cd530c2c2977ea6
+  data.tar.gz: baacce8525b32344f5391d9fa61b62dbb639a91bbddb2ca392a8f7ac8ce762f3
 SHA512:
-  metadata.gz: 4dab11e3e250669b167f0f8f49e16fba9b8b55b66a4b6254f1815d4e04282e257442e25e72368616a33ac9a2bfcf471b32466d01833de94328cd2138ad7522c3
-  data.tar.gz: f3c21f33ee76f8fc8a90d231e46a620262647eac1941d34adf3aba3fc4100d2f77d3b390a339ed43e379cb95fd3378fd7d25df891e9f4799221f4f97aac75995
+  metadata.gz: c4e5de039eaba61b854f1b0af3a41172d95bbd872f64750d8bd9775b6321bcc0cbe174adbdf684a14ff836195b6cc840be06d97ddd4803ceb2b56cb032302d91
+  data.tar.gz: ca4e6b9e69160ba22e57b3b2cadc9a669f628fdf47b20ea696cf2678b998f686bb6eebc6abcc9aba03369356a5257175b701f080dafd9bb464b3f71cbcceb779

data/.vimproject

@@ -29,6 +29,7 @@ scout-camp=/$PWD filter="*" {
    add
    status
    apply
+   plan
    destroy
    remove
   }
@@ -41,19 +42,28 @@ scout-camp=/$PWD filter="*" {
      output.tf
      variables.tf
     }
-    cluster=cluster {
+    lambda=lambda {
+     main.tf
+     variables.tf
+    }
+    role=role{
      main.tf
+     variables.tf
      output.tf
+    }
+    policy_attachment=policy_attachment {
+     main.tf
      variables.tf
     }
-    host=host {
-     locals.tf
+    cluster=cluster {
      main.tf
      output.tf
      variables.tf
     }
-    lambda=lambda {
+    host=host {
+     locals.tf
      main.tf
+     output.tf
      variables.tf
     }
     provider=provider {

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/scout/aws/s3.rb

@@ -18,10 +18,15 @@ module Open
     end
 
     def self.claim(uri, ...)
-      is_s3? uri
+      if Path === uri and not uri.located?
+        is_s3? uri.find
+      else
+        is_s3? uri
+      end
     end
 
     def self.parse_s3_uri(uri)
+      uri = uri.find if Path === uri and not uri.located?
       uri = uri.sub(%r{^s3://}, '')
       bucket, *key_parts = uri.split('/', -1)
       key = key_parts.join('/').sub(%r{^/}, '')

data/scout-camp.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: scout-camp 0.1.3 ruby lib
+# stub: scout-camp 0.1.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-camp".freeze
-  s.version = "0.1.3".freeze
+  s.version = "0.1.4".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "scout_commands/terraform/apply",
     "scout_commands/terraform/destroy",
     "scout_commands/terraform/list",
+    "scout_commands/terraform/plan",
     "scout_commands/terraform/remove",
     "scout_commands/terraform/status",
     "share/terraform/aws/bucket/main.tf",
@@ -56,8 +57,13 @@ Gem::Specification.new do |s|
     "share/terraform/aws/host/variables.tf",
     "share/terraform/aws/lambda/main.tf",
     "share/terraform/aws/lambda/variables.tf",
+    "share/terraform/aws/policy_attachment/main.tf",
+    "share/terraform/aws/policy_attachment/variables.tf",
     "share/terraform/aws/provider/data.tf",
     "share/terraform/aws/provider/output.tf",
+    "share/terraform/aws/role/main.tf",
+    "share/terraform/aws/role/output.tf",
+    "share/terraform/aws/role/variables.tf",
     "test/scout/aws/test_s3.rb",
     "test/scout/offsite/test_ssh.rb",
     "test/scout/offsite/test_step.rb",

data/scout_commands/terraform/add

@@ -82,11 +82,22 @@ lambda_package dependencies, workflows, code do |file|
   filename = 'lambda_package.zip'
   Open.cp file, dir[filename]
 
-  terraform.add :aws, :lambda, function_name: "#{name}Job", filename: filename, 
+  role = terraform.add :aws, :role, role_name: "lambda_execution_role", principal: {Service: ["lambda.amazonaws.com"]}
+
+  terraform.add :aws, :policy_attachment, name: "exec_policy", policy_name: "lamda_basic_execution", 
+    roles: [role.id], 
+    policy_arn: "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+
+  terraform.add :aws, :policy_attachment, name: "s3_policy", policy_name: "lamda_s3_full_access", 
+    roles: [role.id], 
+    policy_arn: "arn:aws:iam::aws:policy/AmazonS3FullAccess"
+
+  terraform.add :aws, :lambda, function_name: "#{name}Job", filename: filename, role: role.arn,
     environment_variables: {
       HOME: '.',
       HOSTNAME: "aws_lambda",
       AWS_BUCKET: options[:bucket],
+      SCOUT_NOCOLOR: "true"
     }
 
   terraform.config dir

data/scout_commands/terraform/plan

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'scout'
+
+$0 = "scout #{$previous_commands.any? ? $previous_commands*" " + " " : "" }#{ File.basename(__FILE__) }" if $previous_commands
+
+options = SOPT.setup <<EOF
+
+Work with deployment
+
+$ #{$0} [<options>] <name>
+
+-h--help Print this help
+EOF
+if options[:help]
+  if defined? scout_usage
+    scout_usage 
+  else
+    puts SOPT.doc
+  end
+  exit 0
+end
+
+name = ARGV.shift
+raise MissingParameterException, :name if name.nil?
+
+dir = Scout.var.deployments.glob_all(name).first
+
+deployment = TerraformDSL::Deployment.new dir
+deployment.plan
+

data/share/terraform/aws/lambda/main.tf

@@ -1,40 +1,13 @@
-provider "aws" {
-  region = "eu-west-2"
-}
-
 resource "aws_lambda_function" "this" {
   function_name = var.function_name
-  role          = aws_iam_role.lambda_role.arn
   handler       = "lambda_function.lambda_handler"
   runtime       = var.runtime
   filename      = var.filename
   source_code_hash = filebase64sha256(var.filename)
   timeout       = var.timeout
+  role          = var.role
 
   environment {
     variables = var.environment_variables
   }
 }
-
-resource "aws_iam_role" "lambda_role" {
-  name = "lambda_execution_role"
-  
-  assume_role_policy = jsonencode({
-    Version = "2012-10-17"
-    Statement = [
-      {
-        Action = "sts:AssumeRole"
-        Effect = "Allow"
-        Principal = {
-          Service = "lambda.amazonaws.com"
-        }
-      }
-    ]
-  })
-}
-
-resource "aws_iam_policy_attachment" "lambda_basic" {
-  name       = "lambda_basic"
-  roles      = [aws_iam_role.lambda_role.name]
-  policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-}

data/share/terraform/aws/lambda/variables.tf

@@ -21,3 +21,7 @@ variable "environment_variables" {
   description = "A map of environment variables to pass to the resource"
   default     = {}
 }
+variable "role" {
+  description = "Role to assume"
+  type = string
+}

data/share/terraform/aws/policy_attachment/main.tf

@@ -0,0 +1,5 @@
+resource "aws_iam_policy_attachment" "this" {
+  name       = var.policy_name
+  roles      = var.roles
+  policy_arn = var.policy_arn
+}

data/share/terraform/aws/policy_attachment/variables.tf

@@ -0,0 +1,12 @@
+variable "policy_arn" {
+  description = "Policy arn"
+  type = string
+}
+variable "policy_name" {
+  description = "Policy name"
+  type = string
+}
+variable "roles" {
+  description = "Roles to which to attach policy"
+  type = set(string)
+}

data/share/terraform/aws/role/main.tf

@@ -0,0 +1,14 @@
+resource "aws_iam_role" "this" {
+  name = var.role_name
+  
+  assume_role_policy = jsonencode({
+    Version = "2012-10-17"
+    Statement = [
+      {
+        Action = "sts:AssumeRole"
+        Effect = "Allow"
+        Principal = var.principal  
+      }
+    ]
+  })
+}

data/share/terraform/aws/role/output.tf

@@ -0,0 +1,15 @@
+output "arn" {
+  description = "Role arn"
+  value = aws_iam_role.this.arn
+}
+
+output "name" {
+  description = "Role name"
+  value = aws_iam_role.this.name
+}
+
+output "id" {
+  description = "Role id"
+  value = aws_iam_role.this.id
+}
+

data/share/terraform/aws/role/variables.tf

@@ -0,0 +1,11 @@
+variable "role_name" {
+  description = "Role name"
+  type = string
+}
+
+variable "principal" {
+  description = "Principal that can assume the role"
+  type = map(any)
+}
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout-camp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Miguel Vazquez
@@ -54,6 +54,7 @@ files:
 - scout_commands/terraform/apply
 - scout_commands/terraform/destroy
 - scout_commands/terraform/list
+- scout_commands/terraform/plan
 - scout_commands/terraform/remove
 - scout_commands/terraform/status
 - share/terraform/aws/bucket/main.tf
@@ -68,8 +69,13 @@ files:
 - share/terraform/aws/host/variables.tf
 - share/terraform/aws/lambda/main.tf
 - share/terraform/aws/lambda/variables.tf
+- share/terraform/aws/policy_attachment/main.tf
+- share/terraform/aws/policy_attachment/variables.tf
 - share/terraform/aws/provider/data.tf
 - share/terraform/aws/provider/output.tf
+- share/terraform/aws/role/main.tf
+- share/terraform/aws/role/output.tf
+- share/terraform/aws/role/variables.tf
 - test/scout/aws/test_s3.rb
 - test/scout/offsite/test_ssh.rb
 - test/scout/offsite/test_step.rb