putpaws 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbb1de2cdc7c119427ca5dfa073f5e8d07f504ff73f93a464f2912a8ef5168ed
-  data.tar.gz: 042f6202ae3cb0396b0ab7210b2d299504f7e099e8a0cf43d9c6314f0b6384ba
+  metadata.gz: d38b16d5a4fc24915b8bde117f9fda98d0fb6418989eebf98385e86ad724dd32
+  data.tar.gz: c3ee3c20989376d82da51e970aa23ab2995af32c39b0e37524c7fa915cf9a8f9
 SHA512:
-  metadata.gz: 12b7e736fe78e9a49569627fd296e9f5540cbea849f8b78a7edbb56c8652de73b82d1b2ac92fef279a682f64e4e83e061ba20e2c3afe1b3c99dce7fd35526fe1
-  data.tar.gz: efad6347afdc46833694e48070afd0330fe42f8bb0bc16638b6b88a7d5b6d1a091ce50f5ce1ddec4f92cc07e54796f42cc9802c2b5aa07ed4af1d96ba5ebd171
+  metadata.gz: e2d00b74e706f5c9192a455bd7919845c4afeb06d2c3db9cd17c2030689cdc2858cc439efb6dd360cc8b9d4eb3fe6fceb6e9a62fb361de1ff0b8d30be4be10c2
+  data.tar.gz: 49fbf55b6659a02a563792d4ab406bbe1f583e84abf82eee10c5c52b12bbcb3da42d539fb1346dc10dd4a4a6ba70df427b8ddc5f1b5edf7c07e775c4b314fb72

data/README.md

@@ -61,6 +61,14 @@ SSM parameters (Ex: `/{service_name}/RAILS_MASTER_KEY`) and putpaws never touche
 A scheduler role is always created too, and the `target` entry of infra.json carries it,
 so `scheduler:deploy` works any time by just writing `.putpaws/schedule.json`.
 
+The CPU architecture is declared once as `cpu_architecture` (`ARM64` / `X86_64`) in the preset
+defaults (overridable per service via `overrides`), and applied consistently to both
+task definitions (`runtimePlatform`) and CodeBuild (environment type and image).
+The bundled preset defaults to `ARM64`; projects whose copied preset predates this setting
+fall back to `X86_64` so nothing changes silently. When switching an existing service to ARM,
+run the CI build right after `up` so an ARM image exists before tasks roll
+(`devops.environment_type` / `environment_image` can override the derivation for staged migration).
+
 CodeBuild is created as CI: builds run inside the VPC with the same subnets and
 security group as the service, so `db:migrate` against RDS works from the build.
 Note that the private subnets need a NAT gateway (or VPC endpoints) so that
@@ -147,6 +155,10 @@ bundle exec putpaws awesome-api-staging ecs:run cmd='bundle exec rake db:migrate
 
 # Pass wait=true to wait until the task stops and check the exit code
 bundle exec putpaws awesome-api-staging ecs:run cmd='bundle exec rake db:migrate' wait=true
+
+# Override the task size for this launch only (must be a valid Fargate combination).
+# Also available on ecs:shell.
+bundle exec putpaws awesome-api-staging ecs:run cmd='bundle exec rake heavy:job' cpu=1024 memory=2048 wait=true
 ```
 
 Launch a temporary task for operation and attach to it (like SSH-ing into the environment).
@@ -170,6 +182,15 @@ so you can identify them on the AWS console and on the task list of `ecs:attach`
 `ecs:run` and `ecs:shell` require `network` and `target` in `.putpaws/application.json`,
 which refer to the `network` / `target` sections of `.putpaws/infra.json` (the same ones used by scheduler).
 
+### CodeBuild
+
+Start the CI build. By default it is fire-and-forget; pass `wait=true` to wait
+until the build completes (phases are printed) and exit non-zero on failure.
+
+```
+bundle exec putpaws awesome-api-staging code_build:build branch=main wait=true
+```
+
 ### CloudWatch Logs
 
 `tail -f`

data/lib/putpaws/code_build/project_command.rb

@@ -41,6 +41,23 @@ module Putpaws::CodeBuild
       codebuild_client.start_build(**params)
     end
 
+    def wait_until_build_complete(build_id, timeout: 3600, interval: 10)
+      deadline = Time.now + timeout
+      last_phase = nil
+      loop do
+        res = codebuild_client.batch_get_builds(ids: [build_id])
+        build = res.builds.first
+        raise "Build not found: #{build_id}" unless build
+        if build.current_phase != last_phase
+          last_phase = build.current_phase
+          puts "  phase: #{last_phase}"
+        end
+        return build if build.build_status != 'IN_PROGRESS'
+        raise "Timed out waiting for build to complete: #{build_id}" if Time.now > deadline
+        sleep interval
+      end
+    end
+
     def build_source_version(type:, version:)
       type = type.to_sym
       if type == :branch

data/lib/putpaws/code_build/tasks/build_task.rake

@@ -15,7 +15,7 @@ namespace :code_build do
     set :codebuild_project, codebuild_project
   end
 
-  desc "Start build."
+  desc "Start build. Pass wait=true to wait until the build completes and fail on error. (Ex) branch=main wait=true"
   task build: :set_project do
     aws = Putpaws::CodeBuild::ProjectCommand.config(fetch(:app))
 
@@ -30,10 +30,22 @@ namespace :code_build do
     end
     codebuild_project = fetch(:codebuild_project)
     aws.codebuild_project = codebuild_project
-    aws.start_build_with_specific_version(
-      source_version: source_version, 
-      environment_variables: ENV['env'] ? JSON.parse(ENV['env']) : {}, 
+    res = aws.start_build_with_specific_version(
+      source_version: source_version,
+      environment_variables: ENV['env'] ? JSON.parse(ENV['env']) : {},
       buildspec_override: ENV['buildspec']
     )
+    build = res.build
+    puts "Build started: #{build.id}"
+
+    if ENV['wait']
+      puts "Waiting for the build to complete..."
+      build = aws.wait_until_build_complete(build.id)
+      if build.build_status == 'SUCCEEDED'
+        puts "Build succeeded: #{build.id}"
+      else
+        raise "Build #{build.build_status.downcase}: #{build.id}"
+      end
+    end
   end
 end

data/lib/putpaws/ecs/run_command.rb

@@ -50,7 +50,20 @@ module Putpaws::Ecs
     # Launch a temporary task whose main process is overridden with the given
     # command, so that the task terminates itself when the command finishes.
     # started_by and group are set so that temporary tasks are identifiable.
-    def run_ecs_task(command:, started_by:, group:, container: nil)
+    # cpu/memory override the task-level size for this launch only
+    # (must be a valid Fargate combination).
+    def run_ecs_task(command:, started_by:, group:, container: nil, cpu: nil, memory: nil)
+      overrides = {
+        container_overrides: [
+          {
+            name: container || container_name,
+            command: ['/bin/sh', '-c', command],
+          }
+        ]
+      }
+      overrides[:cpu] = cpu.to_s unless cpu.to_s.strip.empty?
+      overrides[:memory] = memory.to_s unless memory.to_s.strip.empty?
+
       res = ecs_client.run_task({
         cluster: target.cluster,
         task_definition: target.task_definition,
@@ -66,14 +79,7 @@ module Putpaws::Ecs
             assign_public_ip: network.assign_public_ip,
           }
         },
-        overrides: {
-          container_overrides: [
-            {
-              name: container || container_name,
-              command: ['/bin/sh', '-c', command],
-            }
-          ]
-        },
+        overrides: overrides,
       })
       failure = res.failures.first
       raise "Failed to run task: #{failure.reason} #{failure.detail}" if failure

data/lib/putpaws/ecs/tasks/ecs_task.rake

@@ -56,7 +56,7 @@ namespace :ecs do
     system(*cmd)
   end
 
-  desc "Run a command on a temporary ECS task. The task terminates itself when the command finishes. (Ex) cmd='bundle exec rake db:migrate' wait=true"
+  desc "Run a command on a temporary ECS task. The task terminates itself when the command finishes. (Ex) cmd='bundle exec rake db:migrate' wait=true cpu=1024 memory=2048"
   task :run do
     runner = Putpaws::Ecs::RunCommand.config(fetch(:app))
     command = ENV['cmd']
@@ -68,7 +68,9 @@ namespace :ecs do
       command: command,
       started_by: 'putpaws-run',
       group: 'putpaws-run',
-      container: ENV['container']
+      container: ENV['container'],
+      cpu: ENV['cpu'],
+      memory: ENV['memory']
     )
     task_id = ecs_task.task_arn.split('/').last
     puts "Task started: #{task_id} [putpaws-run]"
@@ -119,7 +121,7 @@ namespace :ecs do
     end
   end
 
-  desc "Launch a temporary ECS task for operation and attach to it. The task terminates itself when ttl passes (default 30m). (Ex) ttl=45m keep=true"
+  desc "Launch a temporary ECS task for operation and attach to it. The task terminates itself when ttl passes (default 30m). (Ex) ttl=45m keep=true cpu=256 memory=512"
   task :shell do
     runner = Putpaws::Ecs::RunCommand.config(fetch(:app))
     ttl = Putpaws::Ecs::RunCommand.parse_ttl(ENV['ttl'])
@@ -128,7 +130,9 @@ namespace :ecs do
     ecs_task = runner.run_ecs_task(
       command: "sleep #{ttl}",
       started_by: 'putpaws-shell',
-      group: 'putpaws-shell'
+      group: 'putpaws-shell',
+      cpu: ENV['cpu'],
+      memory: ENV['memory']
     )
     task_id = ecs_task.task_arn.split('/').last
     puts "Task started: #{task_id} [putpaws-shell]"

data/lib/putpaws/iam/grant_command.rb

@@ -65,7 +65,7 @@ module Putpaws
           version_id: policy.default_version_id
         )
         JSON.parse(URI.decode_www_form_component(ver.policy_version.document))
-      rescue Aws::IAM::Errors::NoSuchEntityException
+      rescue Aws::IAM::Errors::NoSuchEntity, Aws::IAM::Errors::NoSuchEntityException
         nil
       end
 

data/lib/putpaws/provision/presets/rails-nginx/preset.json

@@ -1,5 +1,6 @@
 {
   "defaults": {
+    "cpu_architecture": "ARM64",
     "cpu": "256",
     "memory": "512",
     "desired_count": 1,
@@ -24,7 +25,10 @@
   "service_task_definition": "app",
   "devops_defaults": {
     "source_type": "GITHUB",
-    "environment_image": "aws/codebuild/standard:7.0",
+    "environment_images": {
+      "ARM64": "aws/codebuild/amazonlinux-aarch64-standard:3.0",
+      "X86_64": "aws/codebuild/standard:7.0"
+    },
     "compute_type": "BUILD_GENERAL1_SMALL",
     "privileged_mode": true,
     "buildspec": "buildspec.yml"

data/lib/putpaws/provision/presets/rails-nginx/templates/taskdef-app.json.erb

@@ -2,6 +2,10 @@
   "family": "<%= service_name %>-app",
   "requiresCompatibilities": ["FARGATE"],
   "networkMode": "awsvpc",
+  "runtimePlatform": {
+    "cpuArchitecture": "<%= cpu_architecture %>",
+    "operatingSystemFamily": "LINUX"
+  },
   "cpu": "<%= cpu %>",
   "memory": "<%= memory %>",
   "executionRoleArn": "<%= execution_role_arn %>",

data/lib/putpaws/provision/presets/rails-nginx/templates/taskdef-web.json.erb

@@ -2,6 +2,10 @@
   "family": "<%= service_name %>-web",
   "requiresCompatibilities": ["FARGATE"],
   "networkMode": "awsvpc",
+  "runtimePlatform": {
+    "cpuArchitecture": "<%= cpu_architecture %>",
+    "operatingSystemFamily": "LINUX"
+  },
   "cpu": "<%= cpu %>",
   "memory": "<%= memory %>",
   "executionRoleArn": "<%= execution_role_arn %>",

data/lib/putpaws/provision/provision_config.rb

@@ -92,6 +92,20 @@ module Putpaws
         preset.devops_defaults.merge(devops.reject{|_, v| v.nil?})
       end
 
+      CPU_ARCHITECTURES = %w[X86_64 ARM64]
+
+      # Single source of truth for the CPU architecture, applied to both
+      # task definitions (runtimePlatform) and CodeBuild (environment type/image).
+      # Falls back to X86_64 when unspecified so that existing projects
+      # (whose copied presets/templates predate this setting) keep working.
+      def cpu_architecture
+        arch = (settings[:cpu_architecture] || 'X86_64').to_s
+        unless CPU_ARCHITECTURES.include?(arch)
+          raise "Invalid cpu_architecture: #{arch} (available: #{CPU_ARCHITECTURES.join(', ')})"
+        end
+        arch
+      end
+
       def account_id
         Util.arn_account_id(base[:ecr_repository_arn])
       end

data/lib/putpaws/provision/resources/codebuild_project.rb

@@ -5,6 +5,17 @@ module Putpaws
   module Provision
     module Resources
       class CodebuildProject < Base
+        # Derived from cpu_architecture; devops.environment_type / environment_image
+        # override the derivation (useful for staged arch migration).
+        ENVIRONMENT_TYPES = {
+          'ARM64' => 'ARM_CONTAINER',
+          'X86_64' => 'LINUX_CONTAINER',
+        }
+        DEFAULT_IMAGES = {
+          'ARM64' => 'aws/codebuild/amazonlinux-aarch64-standard:3.0',
+          'X86_64' => 'aws/codebuild/standard:7.0',
+        }
+
         def name
           config.build_project_name
         end
@@ -13,6 +24,16 @@ module Putpaws
           config.devops_settings
         end
 
+        def environment_type
+          devops[:environment_type] || ENVIRONMENT_TYPES.fetch(config.cpu_architecture)
+        end
+
+        def environment_image
+          devops[:environment_image] ||
+            (devops[:environment_images] || {})[config.cpu_architecture.to_sym] ||
+            DEFAULT_IMAGES.fetch(config.cpu_architecture)
+        end
+
         def security_group_ids
           ids = state.resources[:security_group_ids]
           raise "security_group_ids not found in state. Run the service step first." if ids.nil? || ids.empty?
@@ -30,8 +51,8 @@ module Putpaws
             },
             artifacts: {type: 'NO_ARTIFACTS'},
             environment: {
-              type: 'LINUX_CONTAINER',
-              image: devops[:environment_image] || 'aws/codebuild/standard:7.0',
+              type: environment_type,
+              image: environment_image,
               compute_type: devops[:compute_type] || 'BUILD_GENERAL1_SMALL',
               privileged_mode: devops.fetch(:privileged_mode, true),
             },
@@ -60,6 +81,7 @@ module Putpaws
             current.source&.location != desired_params[:source][:location] ||
             current.source&.buildspec != desired_params[:source][:buildspec] ||
             current.service_role != desired_params[:service_role] ||
+            current.environment&.type != desired_params[:environment][:type] ||
             current.environment&.image != desired_params[:environment][:image] ||
             current.environment&.compute_type != desired_params[:environment][:compute_type] ||
             current.vpc_config&.subnets.to_a.sort != desired_params[:vpc_config][:subnets].sort ||

data/lib/putpaws/provision/resources/iam_role.rb

@@ -43,7 +43,7 @@ module Putpaws
 
         def current
           clients.iam.get_role(role_name: name).role
-        rescue Aws::IAM::Errors::NoSuchEntityException
+        rescue Aws::IAM::Errors::NoSuchEntity, Aws::IAM::Errors::NoSuchEntityException
           nil
         end
 

data/lib/putpaws/provision/resources/service.rb

@@ -25,6 +25,9 @@ module Putpaws
         def current
           res = clients.ecs.describe_services(cluster: config.cluster_name, services: [name])
           res.services.detect{|s| s.status == 'ACTIVE'}
+        rescue Aws::ECS::Errors::ClusterNotFoundException
+          # cluster not created yet (Ex: `ahead` on a fresh setup) -> no service either
+          nil
         end
 
         def changed?(current)

data/lib/putpaws/provision/resources/task_definition.rb

@@ -11,7 +11,8 @@ module Putpaws
         # Variables exposed to taskdef ERB templates.
         class TemplateContext
           attr_reader :service_name, :region, :account_id,
-            :cpu, :memory, :container_port, :image, :nginx_image,
+            :cpu, :memory, :container_port, :cpu_architecture,
+            :image, :nginx_image,
             :log_group, :execution_role_arn, :task_role_arn,
             :env_json, :secrets_json
 
@@ -23,6 +24,7 @@ module Putpaws
             @cpu = settings[:cpu].to_s
             @memory = settings[:memory].to_s
             @container_port = (settings[:container_port] || 3000).to_i
+            @cpu_architecture = config.cpu_architecture
             @image = config.ecr_image_uri
             @nginx_image = settings[:nginx_image] || 'public.ecr.aws/nginx/nginx:stable'
             @log_group = config.log_group

data/lib/putpaws/version.rb

@@ -1,3 +1,3 @@
 module Putpaws
-  VERSION = "0.1.0"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: putpaws
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - metheglin
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -209,7 +208,6 @@ homepage: https://rubygems.org/gems/putpaws
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -224,8 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Put your paws up!!
 test_files: []