scout-camp 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 225a937ec9eac0522929e3da409bed070cf387a725d8c8cc5e4041832746fee5
-  data.tar.gz: 5d88f8bc6d5d382b0de9b1765a5cf95e688708dfdbe67cb4372055876fcc5f4c
+  metadata.gz: e451509a388ca0463eccc9609ef4e506cc793a6ee3df3c720ed441f806641c13
+  data.tar.gz: 3950a94e466395630140a5265f3351f8e482b7a983402488587f840af4f177d3
 SHA512:
-  metadata.gz: 7008e9b2ae08a9f6c8fdef48e913d09a6d07eb42825c246bd6182b23868798c1d5227fbcd8acf9147dc1918e0b920d90851539c6a8d74cae481e1cc65afce22a
-  data.tar.gz: 9cfc47356b2225417cceab5625e43a047df912011b655ff6754f770d6cdf9beca85dd6cddfe266ffe6a4018ba5ee52728d7a199051dfcfa4a026aa7248801f10
+  metadata.gz: 96ee495972e08312e7b1f9ed10e8e47d7f72983d554b3113c17967c5080a20ec01ff6317939da97e90cb5db6b5b2ad2ffd9aeb2cf7fb092e3e8a2faaadc0543b
+  data.tar.gz: 16daf0c75fbe0028eaf44d5be4a174f2de7ad05866568fd27e1376851397e4c493607bdce1e03f8943e47b22a7533dfe13599c7f10126a3e60f3b6dfe20f226b

data/.vimproject

@@ -19,35 +19,74 @@ scout-camp=/$PWD filter="*" {
     ssh.rb
     step.rb
     sync.rb
+    resource.rb
    }
   }
  }
  scout_commands=scout_commands {
   offsite
+  sync
+
   terraform=terraform{
    list
-   add
-   fargate
+   add=add{
+    relay
+    lambda
+    host
+    fargate
+   }
    status
+   outputs
    apply
    plan
    destroy
    remove
-   task
+   lambda_task
   }
  }
  share=share {
   terraform=terraform {
    aws=aws {
+    fargate=fargate{
+     main.tf
+     variables.tf
+     locals.tf
+    }
+
+    efs_host=efs_host{
+     main.tf
+     variables.tf
+     locals.tf
+     data.tf
+     output.tf
+    }
+
+    efs=efs{
+     main.tf
+     variables.tf
+     data.tf
+     locals.tf
+     output.tf
+    }
+
+    network=network{
+     data.tf
+     main.tf
+     variables.tf
+     output.tf
+    }
+
     bucket=bucket {
      main.tf
      output.tf
      variables.tf
     }
+
     lambda=lambda {
      main.tf
      variables.tf
     }
+
     role=role{
      main.tf
      variables.tf
@@ -68,16 +107,28 @@ scout-camp=/$PWD filter="*" {
      output.tf
      variables.tf
     }
-    fargate=fargate{
-     locals.tf
-     main.tf
-     variables.tf
-    }
     provider=provider {
      data.tf
      output.tf
     }
    }
+   ssh=ssh{
+    cmd=cmd{
+     main.tf
+     variables.tf
+    }
+    ollama=ollama{
+     main.tf
+     variables.tf
+    }
+    vllm=vllm{
+     main.tf
+     variables.tf
+    }
+    relay=relay{
+
+    }
+   }
   }
   aws=aws{
    lambda_function.rb

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.8

data/lib/scout/aws/s3.rb

@@ -10,7 +10,11 @@ module Open
     extend Hook
 
     def self.lock(*args, &block)
-      yield nil
+      begin
+        yield nil
+      rescue KeepLocked
+        $!.payload
+      end
     end
 
     def self.is_s3?(uri)
@@ -51,6 +55,7 @@ module Open
       bucket, key = parse_s3_uri(uri)
       s3 = Aws::S3::Client.new
       content = Open.open_pipe(&block).read if block_given?
+      content = content.read if IO === content
       s3.put_object(bucket: bucket, key: key, body: content)
     end
 
@@ -130,6 +135,18 @@ module Open
       false
     end
 
+    def self.cp(source, target)
+      source_bucket, source_key = parse_s3_uri(source)
+      target_bucket, target_key = parse_s3_uri(target)
+
+      s3 = Aws::S3::Client.new
+      s3.copy_object({
+        copy_source: "#{source_bucket}/#{source_key}",
+        bucket: target_bucket,
+        key: target_key
+      })
+    end
+
     def self.exists?(uri)
       bucket, key = parse_s3_uri(uri)
       return false if key.empty? # Can't check existence of bucket this way
@@ -142,14 +159,26 @@ module Open
     end
 
     self.singleton_class.alias_method :exist?, :exists?
-  
 
     def self.sensible_write(path, content = nil, options = {}, &block)
+      content = content.to_s if content.respond_to?(:write_file)
       Open::S3.write(path, content)
     end
 
     def self.mkdir(path)
     end
+
+    def self.link(source, target, options = {})
+      cp(source, target)
+    end
+
+    def self.ln(source, target, options = {})
+      cp(source, target)
+    end
+
+    def self.ln_s(source, target, options = {})
+      cp(source, target)
+    end
   end
 end
 
@@ -162,8 +191,8 @@ module Path
     end
 
     def glob(*args)
-      if Open::S3.is_s3?(self)
-        Open::S3.glob(self, *args)
+      if Open::S3.is_s3?(self.find)
+        Open::S3.glob(self.find, *args)
       else
         orig_glob(*args)
       end

data/lib/scout/offsite/resource.rb

@@ -0,0 +1,34 @@
+require 'scout/resource'
+require_relative 'sync'
+module Resource
+  def self.sync(path, map = nil, source: nil, target: nil, resource: nil, **kwargs)
+    map = 'user' if map.nil?
+
+    if source
+      paths = [path]
+      real_paths, identified_paths = SSHLine.locate(source, paths)
+    else
+      resource = path.pkgdir if resource.nil? and path.is_a?(Path) and path.pkgdir.is_a?(Resource)
+      resource = Resource.default_resource if resource.nil?
+
+      if File.exist?(path)
+        real_paths = [path]
+      else
+        path = Path.setup(path, pkgdir: resource) unless path.is_a?(Path)
+        real_paths = path.directory? ? path.find_all : path.glob_all
+      end
+      
+      identified_paths = real_paths.collect{|path| resource.identify(path) }
+    end
+
+    if target
+      target_paths = SSHLine.locate(target, identified_paths, map: map)
+    else
+      target_paths = identified_paths.collect{|p| p.find(map) }
+    end
+
+    real_paths.zip(target_paths).each do |source_path,target_path|
+      Open.sync(source_path, target_path, kwargs.merge(source: source, target: target))
+    end
+  end
+end

data/lib/scout/offsite/ssh.rb

@@ -1,4 +1,5 @@
 require 'net/ssh'
+require 'scout/persist'
 require_relative 'exceptions'
 
 class SSHLine
@@ -90,6 +91,7 @@ class SSHLine
   def scout(script)
     scout_script =<<-EOF
 require 'scout'
+require 'scout/offsite/ssh'
 SSHLine.run_local do
 #{script.strip}
 end

data/lib/scout/offsite/sync.rb

@@ -1,3 +1,4 @@
+require_relative 'ssh'
 class SSHLine
   def self.locate(server, paths, map: :user)
     SSHLine.scout server, <<-EOF
@@ -5,6 +6,7 @@ map = :#{map}
 paths = [#{paths.collect{|p| "'" + p + "'" } * ", " }]
 located = paths.collect{|p| Path.setup(p).find(map) }
 identified = paths.collect{|p| Resource.identify(p) }
+located = located.collect{|path| path << "/" if path.directory? }
 [located, identified]
     EOF
   end

data/lib/scout/terraform_dsl/util.rb

@@ -13,9 +13,9 @@ class TerraformDSL
   # @param prefix [nil,String] Optional prefix to prepend
   def self.log(msg, prefix = nil)
     if prefix
-      STDOUT.puts("[#{prefix}] " + msg)
+      Log.info("[#{prefix}] " + msg)
     else
-      STDOUT.puts(msg)
+      Log.info(msg)
     end
   end
 

data/lib/scout/terraform_dsl.rb

@@ -80,7 +80,12 @@ class TerraformDSL
     def to_json(*_args)
       ['module', @name].join('.')
     end
+  end
 
+  module DirectReference
+    def to_json(*_args)
+      self
+    end
   end
 
   MODULES_DIR = Scout.share.terraform
@@ -180,6 +185,52 @@ class TerraformDSL
     nil
   end
 
+  # Add a backend template file without using modules.
+  #
+  # @param variables [Hash] variables for the backend:
+  #   :bucket, :key & :region
+  def backend(type, variables = {})
+    variables = variables.dup
+
+    text =<<~EOF
+    terraform {
+        backend "#{type}" {
+        #{variable_block(variables)}
+        }
+    }
+    EOF
+
+    element_file = ['backend_config', type.to_s].join('.')
+
+    custom(element_file, text)
+
+    nil
+  end
+
+  # Connect to a remote state through a backend
+  #
+  # @param variables [Hash] variables for the backend:
+  #   :bucket, :key & :region
+  def remote(type, key, variables = {})
+    variables = variables.dup
+    variables[:key] = key unless variables.include?(:key)
+
+    text =<<~EOF
+    data "terraform_remote_state" "#{key}" {
+        backend = "#{type}"
+        config = {
+          #{variable_block(variables)}
+        }
+    }
+    EOF
+
+    element_file = ['remote', type.to_s, key.to_s].join('.')
+
+    custom(element_file, text)
+
+    "data.terraform_remote_state.#{key}".extend DirectReference 
+  end
+
   # Add a provider template file without using modules.
   # Defining providers in modules is problematic when providers
   # are not managed by Hashicorp. Hopefully we can

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.5 ruby lib
+# stub: scout-camp 0.1.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-camp".freeze
-  s.version = "0.1.5".freeze
+  s.version = "0.1.8".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-31"
+  s.date = "1980-01-02"
   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]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "lib/scout/aws/s3.rb",
     "lib/scout/offsite.rb",
     "lib/scout/offsite/exceptions.rb",
+    "lib/scout/offsite/resource.rb",
     "lib/scout/offsite/ssh.rb",
     "lib/scout/offsite/step.rb",
     "lib/scout/offsite/sync.rb",
@@ -38,10 +39,14 @@ Gem::Specification.new do |s|
     "lib/scout/terraform_dsl/util.rb",
     "scout-camp.gemspec",
     "scout_commands/offsite",
-    "scout_commands/terraform/add",
+    "scout_commands/sync",
+    "scout_commands/terraform/add/lambda",
+    "scout_commands/terraform/add/relay",
     "scout_commands/terraform/apply",
     "scout_commands/terraform/destroy",
+    "scout_commands/terraform/lambda_task",
     "scout_commands/terraform/list",
+    "scout_commands/terraform/outputs",
     "scout_commands/terraform/plan",
     "scout_commands/terraform/remove",
     "scout_commands/terraform/status",
@@ -53,12 +58,29 @@ Gem::Specification.new do |s|
     "share/terraform/aws/cluster/main.tf",
     "share/terraform/aws/cluster/output.tf",
     "share/terraform/aws/cluster/variables.tf",
+    "share/terraform/aws/efs/data.tf",
+    "share/terraform/aws/efs/locals.tf",
+    "share/terraform/aws/efs/main.tf",
+    "share/terraform/aws/efs/output.tf",
+    "share/terraform/aws/efs/variables.tf",
+    "share/terraform/aws/efs_host/data.tf",
+    "share/terraform/aws/efs_host/locals.tf",
+    "share/terraform/aws/efs_host/main.tf",
+    "share/terraform/aws/efs_host/output.tf",
+    "share/terraform/aws/efs_host/variables.tf",
+    "share/terraform/aws/fargate/locals.tf",
+    "share/terraform/aws/fargate/main.tf",
+    "share/terraform/aws/fargate/variables.tf",
     "share/terraform/aws/host/locals.tf",
     "share/terraform/aws/host/main.tf",
     "share/terraform/aws/host/output.tf",
     "share/terraform/aws/host/variables.tf",
     "share/terraform/aws/lambda/main.tf",
     "share/terraform/aws/lambda/variables.tf",
+    "share/terraform/aws/network/data.tf",
+    "share/terraform/aws/network/main.tf",
+    "share/terraform/aws/network/output.tf",
+    "share/terraform/aws/network/variables.tf",
     "share/terraform/aws/policy_attachment/main.tf",
     "share/terraform/aws/policy_attachment/variables.tf",
     "share/terraform/aws/provider/data.tf",
@@ -66,7 +88,10 @@ Gem::Specification.new do |s|
     "share/terraform/aws/role/main.tf",
     "share/terraform/aws/role/output.tf",
     "share/terraform/aws/role/variables.tf",
+    "share/terraform/ssh/cmd/main.tf",
+    "share/terraform/ssh/cmd/variables.tf",
     "test/scout/aws/test_s3.rb",
+    "test/scout/offsite/test_resource.rb",
     "test/scout/offsite/test_ssh.rb",
     "test/scout/offsite/test_step.rb",
     "test/scout/offsite/test_sync.rb",
@@ -75,7 +100,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/mikisvaz/scout-camp".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.6.5".freeze
+  s.rubygems_version = "3.6.7".freeze
   s.summary = "Deploy you scouts".freeze
 
   s.specification_version = 4

data/scout_commands/sync

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+require 'scout'
+require 'scout/offsite/resource'
+
+$0 = "scout #{$previous_commands.any? ? $previous_commands*" " + " " : "" }#{ File.basename(__FILE__) }" if $previous_commands
+
+options = SOPT.setup <<EOF
+
+Sync to resources between path maps or between hosts
+
+$ #{$0} [<options>] <path> [<path_map>]
+
+Path map defaults to :user
+
+-h--help Print this help
+-s--source* Host of source path
+-t--target* Host of target path
+EOF
+if options[:help]
+  if defined? scout_usage
+    scout_usage 
+  else
+    puts SOPT.doc
+  end
+  exit 0
+end
+
+path, path_map = ARGV
+
+raise MissingParameterException, :path if path.nil?
+
+Resource.sync(Path.setup(path.dup), path_map, **options)

data/scout_commands/terraform/add/relay

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+
+require 'scout'
+
+$0 = "scout #{$previous_commands.any? ? $previous_commands*" " + " " : "" }#{ File.basename(__FILE__) }" if $previous_commands
+
+options = SOPT.setup <<EOF
+
+Add a new deployment
+
+$ #{$0} [<options>] <name>
+
+-h--help Print this help
+-s--server* Server name
+-u--user* User in server
+-m--model* Model name
+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?
+
+server, user, model = IndiferentHash.process_options options, :server, :user, :model
+
+deployments = Scout.var.deployments.glob_all("*").collect(&:basename)
+raise "Deployment clash" if deployments.include? name
+dir =  Scout.var.deployments[name]
+
+terraform = TerraformDSL.new
+
+ollama = terraform.add :ssh, :cmd, service_id: "#{name}_ollama", name: "ollama", host: server, user: user, command: 'module load ollama; ollama serve'
+terraform.add :ssh, :cmd, service_id: "#{name}_ollama", name: "process", host: server, user: user, command: %Q(bash -l -c "scout-ai llm process -ck 'backend ollama ask,model #{model} ask'"), depends_on: [ollama] 
+terraform.config dir

data/scout_commands/terraform/lambda_task

@@ -0,0 +1,124 @@
+#!/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
+--clean Clean job
+--recursive_clean Clean job recursively
+EOF
+workflow, task_name = ARGV
+
+if workflow.nil? && options[:help]
+  if defined? scout_usage
+    scout_usage 
+  else
+    puts SOPT.doc
+  end
+  exit 0
+end
+
+raise ParamterException, "No workflow specified" if workflow.nil?
+
+prefix, clean, recursive_clean = IndiferentHash.process_options options, :prefix, :clean, :recursive_clean, 
+  prefix: "Scout"
+
+require 'aws-sdk-lambda'
+
+payload = {}
+payload["workflow"] = workflow
+payload["task_name"] = task_name
+
+if clean
+  payload["clean"] = true
+elsif recursive_clean
+  payload["clean"] = 'recursive'
+end
+
+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
+
+      if options[:help]
+          if defined? scout_usage
+            scout_usage 
+          else
+            puts SOPT.doc
+          end
+          exit 0
+        end
+
+        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)
+
+        if options[:help]
+          if defined? scout_usage
+            scout_usage 
+          else
+            puts SOPT.doc
+          end
+          exit 0
+        end
+
+        aws_lambda(lambda_handler, payload)
+      end
+
+if Hash === res && res["errorMessage"]
+  Log.error res["errorMessage"]
+  Log.stack res["stackTrace"] if res["stackTrace"]
+  exit -1
+else
+  iii res
+end

data/scout_commands/terraform/list

@@ -11,6 +11,7 @@ List all deployments
 $ #{$0} [<options>] <filename>
 
 -h--help Print this help
+-a--active Show if they are active
 EOF
 if options[:help]
   if defined? scout_usage
@@ -24,12 +25,20 @@ end
 deployments = Scout.var.deployments.glob_all("*")
 
 deployments.each do |dir|
+  next unless File.directory?(dir)
   name = File.basename dir
   deployment = TerraformDSL::Deployment.new dir
-  active = deployment.provisioned_elements.any?
+  #active = options[:active] && deployment.provisioned_elements.any?
   
-  if active
-    puts Log.color(:title, name ) + "\t" + dir + "\t" + "Active" 
+  if options[:active]
+    Log.with_severity 5 do
+      print Log.color(:title, name ) + "\t" + dir + "\t" 
+      if deployment.provisioned_elements.any?
+        puts Log.color :present, "Active" 
+      else
+        puts Log.color :missing, "Inactive" 
+      end
+    end
   else
     puts Log.color(:title, name) + "\t" + dir
   end

data/scout_commands/terraform/outputs

@@ -0,0 +1,33 @@
+#!/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.provisioned_elements.each do |element|
+  ppp deployment.element_state(element)
+end
+

data/share/aws/lambda_function.rb

@@ -7,11 +7,11 @@ def lambda_handler(event:, context:)
   require 'scout/workflow'
   require 'scout/aws/s3'
 
-  workflow, task_name, jobname, inputs = IndiferentHash.process_options event, 
-  :workflow, :task_name, :jobname, :inputs
-  
+  workflow, task_name, jobname, inputs, clean = IndiferentHash.process_options event,
+  :workflow, :task_name, :jobname, :inputs, :clean
+
   raise ParamterException, "No workflow specified" if workflow.nil?
-  
+
   workflow = Workflow.require_workflow workflow
 
   case task_name
@@ -22,6 +22,16 @@ def lambda_handler(event:, context:)
     return workflow.task_info(inputs["task_name"])
   else
     job = workflow.job(task_name, jobname, inputs)
-    job.run
+
+    case clean
+    when true, 'true'
+      job.clean
+    when 'recursive'
+      job.recursive_clean
+    end
+
+    job.produce
+
+    job.load
   end
 end

data/share/terraform/aws/efs/data.tf

@@ -0,0 +1,12 @@
+# Get default VPC (optional if you want to restrict to default VPC)
+data "aws_vpc" "default" {
+  default = true
+}
+
+# Get all subnets in the region (filtered to default VPC if needed)
+data "aws_subnets" "all" {
+  filter {
+    name   = "vpc-id"
+    values = [data.aws_vpc.default.id]
+  }
+}

data/share/terraform/aws/efs/locals.tf

@@ -0,0 +1,6 @@
+locals {
+  security_group_ids = [
+    for sg_key in var.sg_keys :
+    lookup(var.remote.outputs, sg_key, null)
+  ]
+}

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

@@ -0,0 +1,14 @@
+resource "aws_efs_file_system" "this" {
+  creation_token = "herlab-efs"
+  tags = {
+    Name = "HERLab main EFS"
+  }
+}
+
+resource "aws_efs_mount_target" "this" {
+  for_each = toset(data.aws_subnets.all.ids)
+
+  file_system_id  = aws_efs_file_system.this.id
+  subnet_id       = each.value
+  security_groups = local.security_group_ids
+}

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

@@ -0,0 +1,3 @@
+output "id" {
+  value = aws_efs_file_system.this.id
+}

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

@@ -0,0 +1,9 @@
+variable "remote" {
+  description = "Name of the remote state block to use"
+}
+
+variable "sg_keys" {
+  description = "List of output names in the remote state representing security group IDs"
+  type        = list(string)
+  default     = ["aws_network_efs_sg_id"]
+}

data/share/terraform/aws/efs_host/data.tf

@@ -0,0 +1,11 @@
+data "aws_ami" "amazon_linux_2" {
+  most_recent = true
+  owners      = ["amazon"]
+
+  # Filter for Amazon Linux 2 AMIs
+  filter {
+    name   = "name"
+    values = ["amzn2-ami-hvm-*-x86_64-gp2"]
+  }
+}
+

data/share/terraform/aws/efs_host/locals.tf

@@ -0,0 +1,8 @@
+locals {
+  security_group_ids = [
+    for sg_key in var.sg_keys :
+    lookup(var.network.outputs, sg_key, null)
+  ]
+
+  efs_id = lookup(var.efs.outputs, "aws_efs_id", null)
+}

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

@@ -0,0 +1,31 @@
+resource "aws_key_pair" "this" {
+  key_name   = "my-key"
+  public_key = file("~/.ssh/id_rsa.pub") # Adjust if your key is elsewhere
+}
+
+resource "aws_instance" "this" {
+  ami           = data.aws_ami.amazon_linux_2.id
+  instance_type = "t2.micro"
+
+  key_name      = aws_key_pair.this.key_name
+
+  tags = {
+    Name = "EFS-Service"
+  }
+
+  # Open port 22 for SSH
+  vpc_security_group_ids = local.security_group_ids
+
+  user_data = <<-EOF
+              #cloud-config
+              package_update: true
+              package_upgrade: true
+              packages:
+                - amazon-efs-utils
+              runcmd:
+                - mkdir -p /mnt/efs
+                - mount -t efs -o tls ${local.efs_id}:/ ${var.mount_point}
+                - echo "${local.efs_id}:/ ${var.mount_point} efs defaults,_netdev 0 0" >> /etc/fstab
+EOF
+}
+

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

@@ -0,0 +1,3 @@
+output "public_ip" {
+  value = aws_instance.this.public_ip
+}

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

@@ -0,0 +1,20 @@
+variable "network" {
+  description = "Name of the remote state block to use for the network"
+}
+
+variable "efs" {
+  description = "Name of the remote state block to use for the EFS"
+}
+
+variable "sg_keys" {
+  description = "List of output names in the remote state representing security group IDs"
+  type        = list(string)
+  default     = ["aws_network_efs_sg_id", "aws_network_ssh_sg_id"]
+}
+
+variable "mount_point" {
+  description = "Where to mount the efs drive"
+  type = string
+  default = "/mnt/efs"
+}
+

data/share/terraform/aws/fargate/locals.tf

@@ -0,0 +1,8 @@
+locals {
+  security_group_ids = [
+    for sg_key in var.sg_keys :
+    lookup(var.network.outputs, sg_key, null)
+  ]
+
+  efs_id = lookup(var.efs.outputs, "aws_efs_id", null)
+}

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

@@ -0,0 +1,38 @@
+resource "aws_ecs_task_definition" "this" {
+  family                   = var.task_family
+  requires_compatibilities = ["FARGATE"]
+  network_mode             = "awsvpc"
+  cpu                      = var.cpu
+  memory                   = var.memory
+  execution_role_arn       = var.role_arn
+
+  container_definitions = jsonencode([
+    {
+      name      = var.container_name
+      image     = var.image
+      essential = true
+      portMappings = var.port_mappings
+      //entryPoint = var.entry_point
+      command = var.command
+
+      mountPoints = [
+        {
+          sourceVolume  = "efs-volume"
+          containerPath = var.mount_point
+        }
+      ]
+    }
+  ])
+
+  volume {
+    name = "efs-volume"
+    efs_volume_configuration {
+      file_system_id = local.efs_id
+      root_directory = "/"
+    }
+  }
+}
+
+resource "aws_ecs_cluster" "this" {
+  name = "${var.task_family}_cluster"
+}

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

@@ -0,0 +1,73 @@
+variable "network" {
+  description = "Name of the remote state block to use for the network"
+}
+
+variable "efs" {
+  description = "Name of the remote state block to use for the EFS"
+}
+
+variable "sg_keys" {
+  description = "List of output names in the remote state representing security group IDs"
+  type        = list(string)
+  default     = ["aws_network_efs_sg_id", "aws_network_ssh_sg_id"]
+}
+
+variable "mount_point" {
+  description = "Where to mount the efs drive"
+  type = string
+  default = "/mnt/efs"
+}
+
+variable "task_family" {
+  type        = string
+  description = "The family name of the ECS task definition"
+}
+
+variable "cpu" {
+  type        = number
+  description = "The CPU units for the task"
+  default     = 256
+}
+
+variable "memory" {
+  type        = number
+  description = "The memory (MiB) for the task"
+  default     = 512
+}
+
+variable "role_arn" {
+  type        = string
+  description = "ARN of the task execution role"
+}
+
+variable "container_name" {
+  type        = string
+  description = "Name of the container"
+  default     = "app"
+}
+
+variable "image" {
+  type        = string
+  description = "Docker image URL for the container"
+}
+
+variable "port_mappings" {
+  type = list(object({
+    containerPort = number
+    hostPort      = number
+    protocol      = string
+  }))
+  description = "List of port mappings for the container"
+  default     = []
+}
+
+variable "command" {
+  type        = list(string)
+  description = "Command to run"
+}
+
+variable "entry_point" {
+  type        = list(string)
+  description = "Container entry point"
+  default     = ["bash"]
+}

data/share/terraform/aws/network/data.tf

@@ -0,0 +1,15 @@
+data "aws_vpc" "default" {
+  filter {
+    name   = "is-default"
+    values = ["true"]
+  }
+}
+
+# Get all subnets in the default VPC
+data "aws_subnets" "default" {
+  filter {
+    name   = "vpc-id"
+    values = [data.aws_vpc.default.id]
+  }
+}
+

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

@@ -0,0 +1,41 @@
+resource "aws_security_group" "efs" {
+  name        = "efs-sg"
+  description = "Allow NFS"
+
+  ingress {
+    from_port   = 2049
+    to_port     = 2049
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  egress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  tags = {
+    Name = "efs-sg"
+  }
+}
+
+resource "aws_security_group" "ssh" {
+  name        = "allow_ssh"
+  description = "Allow SSH inbound traffic"
+
+  ingress {
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]  # WARNING: open to the world. Limit this for production.
+  }
+
+  egress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+}

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

@@ -0,0 +1,7 @@
+output "efs_sg_id" {
+  value = aws_security_group.efs.id
+}
+
+output "ssh_sg_id" {
+  value = aws_security_group.ssh.id
+}

data/share/terraform/ssh/cmd/main.tf

@@ -0,0 +1,34 @@
+terraform {
+  required_providers {
+    ssh = {
+      source  = "loafoe/ssh"
+      version = ">= 1.0.0"
+    }
+  }
+}
+
+resource "ssh_resource" "up" {
+  host = var.host
+  user = var.user
+  agent = true
+  when = "create"
+
+  commands = [
+    "${var.command} > ${var.service_id}.log 2>&1 & echo $! > /tmp/${var.service_id}.pid"
+  ]
+
+}
+
+resource "ssh_resource" "down" {
+  host = var.host
+  user = var.user
+  agent = true
+  when = "destroy"
+
+  commands = [
+    "kill $(cat /tmp/${var.service_id}.pid) || true",
+    "rm -f /tmp/${var.service_id}.pid"
+  ]
+}
+
+

data/share/terraform/ssh/cmd/variables.tf

@@ -0,0 +1,19 @@
+variable "host" {
+  description = "Target host for SSH"
+  type        = string
+}
+
+variable "user" {
+  description = "Username for SSH"
+  type        = string
+}
+
+variable "service_id" {
+  description = "Identifier of the service, should be unique to avoid collisions"
+  type        = string
+}
+
+variable "command" {
+  description = "Command to execute"
+  type        = string
+}

data/test/scout/offsite/test_resource.rb

@@ -0,0 +1,46 @@
+require File.expand_path(__FILE__).sub(%r(/test/.*), '/test/test_helper.rb')
+require File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1')
+
+require 'scout'
+class TestResourceSync < Test::Unit::TestCase
+  def test_sync_file
+    TmpFile.with_path do |source|
+      TmpFile.with_path do |target|
+        Open.write(source.file, 'payload')
+        Misc.in_dir target.find do
+          Resource.sync(source.file, :current)
+        end
+
+        assert_equal 'payload', Open.read(target[Resource.identify(source)].file)
+      end
+    end
+  end
+
+  def test_sync_dir
+    TmpFile.with_path do |source|
+      TmpFile.with_path do |target|
+        Open.write(source.file, 'payload')
+        Misc.in_dir target.find do
+          Resource.sync(source, :current)
+        end
+
+        assert_equal 'payload', Open.read(target[Resource.identify(source)].file)
+      end
+    end
+  end
+
+  def test_sync_from_localhost
+    TmpFile.with_path do |source|
+      TmpFile.with_path do |target|
+        Open.write(source.file, 'payload')
+        Misc.in_dir target.find do
+          sss 0
+          Resource.sync(source, :current, source: 'localhost')
+        end
+
+        assert_equal 'payload', Open.read(target[Resource.identify(source)].file)
+      end
+    end
+  end
+end
+

data/test/scout/offsite/test_sync.rb

@@ -1,6 +1,7 @@
 require File.expand_path(__FILE__).sub(%r(/test/.*), '/test/test_helper.rb')
 require File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1')
 
+require 'scout'
 class TestSync < Test::Unit::TestCase
   def test_sync
     TmpFile.with_path do |tmpdir|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: scout-camp
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 platform: ruby
 authors:
 - Miguel Vazquez
 bindir: bin
 cert_chain: []
-date: 2025-03-31 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scout-essentials
@@ -42,6 +42,7 @@ files:
 - lib/scout/aws/s3.rb
 - lib/scout/offsite.rb
 - lib/scout/offsite/exceptions.rb
+- lib/scout/offsite/resource.rb
 - lib/scout/offsite/ssh.rb
 - lib/scout/offsite/step.rb
 - lib/scout/offsite/sync.rb
@@ -50,10 +51,14 @@ files:
 - lib/scout/terraform_dsl/util.rb
 - scout-camp.gemspec
 - scout_commands/offsite
-- scout_commands/terraform/add
+- scout_commands/sync
+- scout_commands/terraform/add/lambda
+- scout_commands/terraform/add/relay
 - scout_commands/terraform/apply
 - scout_commands/terraform/destroy
+- scout_commands/terraform/lambda_task
 - scout_commands/terraform/list
+- scout_commands/terraform/outputs
 - scout_commands/terraform/plan
 - scout_commands/terraform/remove
 - scout_commands/terraform/status
@@ -65,12 +70,29 @@ files:
 - share/terraform/aws/cluster/main.tf
 - share/terraform/aws/cluster/output.tf
 - share/terraform/aws/cluster/variables.tf
+- share/terraform/aws/efs/data.tf
+- share/terraform/aws/efs/locals.tf
+- share/terraform/aws/efs/main.tf
+- share/terraform/aws/efs/output.tf
+- share/terraform/aws/efs/variables.tf
+- share/terraform/aws/efs_host/data.tf
+- share/terraform/aws/efs_host/locals.tf
+- share/terraform/aws/efs_host/main.tf
+- share/terraform/aws/efs_host/output.tf
+- share/terraform/aws/efs_host/variables.tf
+- share/terraform/aws/fargate/locals.tf
+- share/terraform/aws/fargate/main.tf
+- share/terraform/aws/fargate/variables.tf
 - share/terraform/aws/host/locals.tf
 - share/terraform/aws/host/main.tf
 - share/terraform/aws/host/output.tf
 - share/terraform/aws/host/variables.tf
 - share/terraform/aws/lambda/main.tf
 - share/terraform/aws/lambda/variables.tf
+- share/terraform/aws/network/data.tf
+- share/terraform/aws/network/main.tf
+- share/terraform/aws/network/output.tf
+- share/terraform/aws/network/variables.tf
 - share/terraform/aws/policy_attachment/main.tf
 - share/terraform/aws/policy_attachment/variables.tf
 - share/terraform/aws/provider/data.tf
@@ -78,7 +100,10 @@ files:
 - share/terraform/aws/role/main.tf
 - share/terraform/aws/role/output.tf
 - share/terraform/aws/role/variables.tf
+- share/terraform/ssh/cmd/main.tf
+- share/terraform/ssh/cmd/variables.tf
 - test/scout/aws/test_s3.rb
+- test/scout/offsite/test_resource.rb
 - test/scout/offsite/test_ssh.rb
 - test/scout/offsite/test_step.rb
 - test/scout/offsite/test_sync.rb
@@ -102,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Deploy you scouts
 test_files: []