scout-camp 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b22b7fc83e0cee051edf923ffd40bfaa3759f78eb59d80c7abb0b120be250682
-  data.tar.gz: aa35cfafdb9ac3aeee81b247c1f81e1ab3bfb638b51c08108eb88e23940254f2
+  metadata.gz: bc2855face5f3cb3ced365171398295b656f378fc681da6f0cd530c2c2977ea6
+  data.tar.gz: baacce8525b32344f5391d9fa61b62dbb639a91bbddb2ca392a8f7ac8ce762f3
 SHA512:
-  metadata.gz: 7c48331d38a61928b7de2aa8c94d04a6feaf11e60bedcac7bde2be0ecb242a78f622b519ee7dccc2faefa42d721ed58fd22a3ce58202641ce92c67c2b3d90988
-  data.tar.gz: c6ede844ae01c2acffe2150b88b2ab1b674fe2e3937161da471a0a03be710d3cbf728a2a353be840f5ef1a3cdab20a1660d41bd579cbc4dc30b6281b890a8e93
+  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.2
+0.1.4

data/bin/scout-camp

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$LOAD_PATH.unshift File.join(__dir__, '../lib')
+
 require 'scout-camp'
 
 load Scout.bin.scout.find

data/lib/scout/aws/s3.rb

@@ -9,15 +9,24 @@ module Open
   module S3
     extend Hook
 
+    def self.lock(*args, &block)
+      yield nil
+    end
+
     def self.is_s3?(uri)
       uri.start_with? 's3://'
     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,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.2 ruby lib
+# stub: scout-camp 0.1.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-camp".freeze
-  s.version = "0.1.2".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]
   s.authors = ["Miguel Vazquez".freeze]
-  s.date = "2025-03-19"
+  s.date = "2025-03-25"
   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,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

@@ -12,6 +12,8 @@ $ #{$0} [<options>] <name>
 
 -h--help Print this help
 -w--workflows* Workflows to provision
+-w--dependencies* Workflows to provision
+-b--bucket* Bucket to connect
 EOF
 if options[:help]
   if defined? scout_usage
@@ -29,19 +31,27 @@ 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'
+IndiferentHash.add_defaults options, workflows: '', dependencies: 'scout-gear,scout-camp', bucket: 'scout.var'
 
 workflows = options[:workflows].split(",")
 dependencies = options[:dependencies].split(",")
 
-code =<<-EOF
+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
 
-  wf = Workflow.require_workflow event["workflow"]
-  job = wf.job(event["task_name"], event["jobname"], event["inputs"])
-  id = job.short_path
-  id
+  job = wf.job(task_name, jobname, inputs)
+  job.run
 end
 EOF
 
@@ -71,8 +81,24 @@ lambda_package dependencies, workflows, code do |file|
   terraform = TerraformDSL.new
   filename = 'lambda_package.zip'
   Open.cp file, dir[filename]
-  terraform.add :aws, :lambda, function_name: "ScoutJob", filename: filename, environment_variables: {HOME: '.'}
-  terraform.config dir
-end
 
+  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
+end

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/bucket/main.tf

@@ -1,8 +1,4 @@
-provider "aws" {
-  region = "eu-west-2"  # Change to your preferred AWS region
-}
-
 resource "aws_s3_bucket" "this" {
-  bucket = var.name  # Change to a globally unique name
+  bucket = var.bucket_name  # Change to a globally unique name
 }
 

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

@@ -1,3 +1,3 @@
-output "bucket_name" {
-  value = aws_s3_bucket.my_bucket.id
+output "bucket_id" {
+  value = aws_s3_bucket.this.id
 }

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

@@ -1,4 +1,4 @@
-variable "name" {
+variable "bucket_name" {
   description = "Bucket name"
   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.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Miguel Vazquez
 bindir: bin
 cert_chain: []
-date: 2025-03-19 00:00:00.000000000 Z
+date: 2025-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scout-essentials
@@ -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