scout-camp 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e19b9f83e8b15a04642fa32d87a0af095b382a9698c169c454edffda2cdc1f
-  data.tar.gz: 92f2e5d29ed614db92ed7bfe3cdb25a55f2d64b2c8ab91bc12dda8939dfb76db
+  metadata.gz: 225a937ec9eac0522929e3da409bed070cf387a725d8c8cc5e4041832746fee5
+  data.tar.gz: 5d88f8bc6d5d382b0de9b1765a5cf95e688708dfdbe67cb4372055876fcc5f4c
 SHA512:
-  metadata.gz: 4dab11e3e250669b167f0f8f49e16fba9b8b55b66a4b6254f1815d4e04282e257442e25e72368616a33ac9a2bfcf471b32466d01833de94328cd2138ad7522c3
-  data.tar.gz: f3c21f33ee76f8fc8a90d231e46a620262647eac1941d34adf3aba3fc4100d2f77d3b390a339ed43e379cb95fd3378fd7d25df891e9f4799221f4f97aac75995
+  metadata.gz: 7008e9b2ae08a9f6c8fdef48e913d09a6d07eb42825c246bd6182b23868798c1d5227fbcd8acf9147dc1918e0b920d90851539c6a8d74cae481e1cc65afce22a
+  data.tar.gz: 9cfc47356b2225417cceab5625e43a047df912011b655ff6754f770d6cdf9beca85dd6cddfe266ffe6a4018ba5ee52728d7a199051dfcfa4a026aa7248801f10

data/.vimproject

@@ -27,10 +27,13 @@ scout-camp=/$PWD filter="*" {
   terraform=terraform{
    list
    add
+   fargate
    status
    apply
+   plan
    destroy
    remove
+   task
   }
  }
  share=share {
@@ -41,6 +44,19 @@ scout-camp=/$PWD filter="*" {
      output.tf
      variables.tf
     }
+    lambda=lambda {
+     main.tf
+     variables.tf
+    }
+    role=role{
+     main.tf
+     variables.tf
+     output.tf
+    }
+    policy_attachment=policy_attachment {
+     main.tf
+     variables.tf
+    }
     cluster=cluster {
      main.tf
      output.tf
@@ -52,7 +68,8 @@ scout-camp=/$PWD filter="*" {
      output.tf
      variables.tf
     }
-    lambda=lambda {
+    fargate=fargate{
+     locals.tf
      main.tf
      variables.tf
     }
@@ -62,6 +79,9 @@ scout-camp=/$PWD filter="*" {
     }
    }
   }
+  aws=aws{
+   lambda_function.rb
+  }
  }
  test=test {
   test_helper.rb

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.5

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{^/}, '')
@@ -64,8 +69,13 @@ module Open
 
         resp.contents.each do |object|
           key = object.key
-          remaining = key[prefix.length..-1] || ''
-          remaining = remaining.sub(%r{^/}, '') if prefix.empty? # Handle root-level keys with leading slash
+
+          if prefix.empty?
+            remaining = key.sub(%r{^/}, '')
+          else
+            remaining = key[prefix.length..-1] || ''
+            remaining = remaining.sub(%r{^/}, '')
+          end
 
           if File.fnmatch?(pattern, remaining, File::FNM_PATHNAME)
             matches << "s3://#{bucket}/#{key}"
@@ -138,6 +148,8 @@ module Open
       Open::S3.write(path, content)
     end
 
+    def self.mkdir(path)
+    end
   end
 end
 

data/scout-camp.gemspec

@@ -2,16 +2,16 @@
 # 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.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-camp".freeze
-  s.version = "0.1.3".freeze
+  s.version = "0.1.5".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Miguel Vazquez".freeze]
-  s.date = "2025-03-25"
+  s.date = "2025-03-31"
   s.description = "Functionalities to deploy and use scouts in remote servers like AWS".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.executables = ["scout-camp".freeze]
@@ -42,8 +42,11 @@ 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",
+    "scout_commands/terraform/task",
+    "share/aws/lambda_function.rb",
     "share/terraform/aws/bucket/main.tf",
     "share/terraform/aws/bucket/output.tf",
     "share/terraform/aws/bucket/variables.tf",
@@ -56,8 +59,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

@@ -14,6 +14,7 @@ $ #{$0} [<options>] <name>
 -w--workflows* Workflows to provision
 -w--dependencies* Workflows to provision
 -b--bucket* Bucket to connect
+--pkg* Pkgdir, scout or rbbt (defaults to scout)
 EOF
 if options[:help]
   if defined? scout_usage
@@ -31,37 +32,20 @@ deployments = Scout.var.deployments.glob_all("*").collect(&:basename)
 raise "Deployment clash" if deployments.include? name
 dir =  Scout.var.deployments[name]
 
-IndiferentHash.add_defaults options, workflows: '', dependencies: 'scout-gear,scout-camp', bucket: 'scout.var'
+IndiferentHash.add_defaults options, workflows: '', dependencies: 'scout-gear,scout-camp', bucket: 'scout.var', pkg: 'scout'
 
 workflows = options[:workflows].split(",")
 dependencies = options[:dependencies].split(",")
+dependencies.push 'scout-camp' unless dependencies.include?('scout-camp')
+pkg = options[:pkg]
 
-code =<<-'EOF'
-def lambda_handler(event:, context:)
-  require 'scout'
-  Path.path_maps[:bucket] = "s3://#{ENV["AWS_BUCKET"]}/{TOPLEVEL}/{SUBPATH}"
-  Path.path_maps[:default] = :bucket
-
-  require 'scout/workflow'
-  require 'scout/aws/s3'
-
-  workflow, task_name, jobname, inputs = IndiferentHash.process_options event, 
-  :workflow, :task_name, :jobname, :inputs
-
-  wf = Workflow.require_workflow workflow
-
-  job = wf.job(task_name, jobname, inputs)
-  job.run
-end
-EOF
-
-def lambda_package(dependencies, workflows, code)
+def lambda_package(dependencies, workflows, function_file, pkg)
   TmpFile.with_path do |dir|
-    dir["lambda_function.rb"].write code
+    Open.cp function_file, dir["lambda_function.rb"]
     dir["Gemfile"].write "source 'https://rubygems.org'\n" + dependencies.collect{|d| "gem '#{d}'"}*"\n"
     workflows.each do |workflow|
-      Open.mkdir dir[".scout"].workflows
-      Open.cp Scout.workflows[workflow], dir[".scout"].workflows[workflow]
+      Open.mkdir dir[".#{pkg}"].workflows
+      Open.ln_s Scout.workflows[workflow], dir[".#{pkg}"].workflows[workflow]
     end
     Misc.in_dir dir do
       `bundle config set path 'vendor/bundle'`
@@ -69,24 +53,34 @@ def lambda_package(dependencies, workflows, code)
       `rm -Rf vendor/bundle/ruby/*/cache`
       `rm -Rf vendor/bundle/ruby/*/gems/RubyInline*`
       TmpFile.with_file nil, extension: :zip do |zip|
-        `zip -r "#{zip}" vendor/bundle lambda_function.rb .scout`
+        `zip -r "#{zip}" vendor/bundle lambda_function.rb .#{pkg}`
         yield zip
       end
     end
   end
 end
 
-require 'aws-sdk'
-lambda_package dependencies, workflows, code do |file|
-  terraform = TerraformDSL.new
+lambda_package dependencies, workflows, Scout.share.aws.lambda_function.set_extension('rb'), options[:pkg] do |file|
   filename = 'lambda_package.zip'
   Open.cp file, dir[filename]
 
-  terraform.add :aws, :lambda, function_name: "#{name}Job", filename: filename, 
+  terraform = TerraformDSL.new
+  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/scout_commands/terraform/task

@@ -0,0 +1,92 @@
+#!/usr/bin/env ruby
+
+require 'scout'
+
+$0 = "scout #{$previous_commands.any? ? $previous_commands*" " + " " : "" }#{ File.basename(__FILE__) }" if $previous_commands
+
+options = SOPT.setup <<EOF
+
+Call a task on AWS
+
+$ #{$0} [<options>] <workflow> <task> [<other|->]*
+
+-h--help Print this help
+--prefix* Prefix, defaults to Scout
+EOF
+if options[:help]
+  if defined? scout_usage
+    scout_usage 
+  else
+    puts SOPT.doc
+  end
+  exit 0
+end
+
+workflow, task_name = ARGV
+
+raise ParamterException, "No workflow specified" if workflow.nil?
+
+prefix = IndiferentHash.process_options options, :prefix, prefix: "Scout"
+require 'aws-sdk-lambda'
+payload = {}
+payload["workflow"] = workflow
+payload["task_name"] = task_name
+lambda_handler = "#{prefix}Job"
+
+def aws_lambda(name, payload)
+  client = Aws::Lambda::Client.new
+  resp = client.invoke({
+    function_name: name, 
+    payload: payload.to_json, 
+  })
+
+  JSON.load(resp.payload)
+end
+
+def SOPT_str(task_info)
+  sopt_options = []
+  task_info[:inputs].each do |name|
+    options = task_info[:input_options][name]
+    type = task_info[:input_types][name]
+    shortcut = (options && options[:shortcut]) || name.to_s.slice(0,1)
+    boolean = type.to_sym == :boolean
+
+    sopt_options << "-#{shortcut}--#{name}#{boolean ? "" : "*"}"
+  end
+
+  sopt_options * ":"
+end
+
+def get_SOPT(task_info)
+  IndiferentHash.setup task_info
+  sopt_option_string = self.SOPT_str(task_info)
+  job_options = SOPT.get sopt_option_string
+
+  task_info[:inputs].each do |name|
+    options = task_info[:input_options][name]
+    type = task_info[:input_types][name]
+    next unless type.to_s.include?('array')
+    if job_options.include?(name) && (! Open.exist?(job_options[name]) || type.to_s.include?('file') || type.to_s.include?('path'))
+      job_options[name] = job_options[name].split(",")
+    end
+  end
+  job_options
+end
+
+res = case task_name
+      when nil
+        aws_lambda(lambda_handler, payload)
+      else
+        task_info = aws_lambda(lambda_handler, payload.merge(task_name: "info", inputs: {task_name: task_name}))
+        
+        payload["inputs"] = get_SOPT(task_info)
+
+        aws_lambda(lambda_handler, payload)
+      end
+
+if res["errorMessage"]
+  Log.error res["errorMessage"]
+  Log.stack res["stackTrace"]
+else
+  iii res
+end

data/share/aws/lambda_function.rb

@@ -0,0 +1,27 @@
+def lambda_handler(event:, context:)
+  require 'scout'
+
+  Path.path_maps[:bucket] = "s3://#{ENV["AWS_BUCKET"]}/{TOPLEVEL}/{SUBPATH}"
+  Path.path_maps[:default] = :bucket
+
+  require 'scout/workflow'
+  require 'scout/aws/s3'
+
+  workflow, task_name, jobname, inputs = IndiferentHash.process_options event, 
+  :workflow, :task_name, :jobname, :inputs
+  
+  raise ParamterException, "No workflow specified" if workflow.nil?
+  
+  workflow = Workflow.require_workflow workflow
+
+  case task_name
+  when nil
+    return {tasks: workflow.tasks.keys, documentation: workflow.documentation}
+  when "info"
+    raise ParamterException, "No task_name specified" if task_name.nil?
+    return workflow.task_info(inputs["task_name"])
+  else
+    job = workflow.job(task_name, jobname, inputs)
+    job.run
+  end
+end

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

@@ -1,4 +1,3 @@
-
 variable "ami" {
   description = "AMI id for host"
   type = string

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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: scout-camp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Miguel Vazquez
 bindir: bin
 cert_chain: []
-date: 2025-03-25 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scout-essentials
@@ -54,8 +54,11 @@ 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
+- scout_commands/terraform/task
+- share/aws/lambda_function.rb
 - share/terraform/aws/bucket/main.tf
 - share/terraform/aws/bucket/output.tf
 - share/terraform/aws/bucket/variables.tf
@@ -68,8 +71,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