fly.io-rails 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd72efc17bf3e1b7826d569f0e72dcb500fb1b49a116b2c2f84805b3d9c05ecc
-  data.tar.gz: 7154bc14b25e0267d34c461359577bd8a25d9ed5c70cf329b0533d32100e2116
+  metadata.gz: a9adb2bd6c53c8d27b9ade8898e4a5fb4621f5711781e35b8a273535e66996ec
+  data.tar.gz: 749a208099b67b3bad53c1b729ef873bb911ae7e69368f7b04863aa65519fee8
 SHA512:
-  metadata.gz: 345f8065e2fcf7515b27022965ee4669d6d03eb38c713114a77da92806b4063c2860fd35eb3208ad55eb53852797043a05f3dc0fd711c5ac8263e603ada1c8ab
-  data.tar.gz: 4ce36e49a13734dbedc5c5e4663d9fdb616f44aab70bdf7c63e0ca342b536bdaac820680636fd3bb80ea0c94d648f0fe52b5c58f8669ee938c7d482552b952cb
+  metadata.gz: 60db97b7cf7f75b5c5485ca6395c2d6398b54148a8e5fb1547483c272366c052f2d6810a3882fe65eda906627e936555269dc71b1208404ab1d772d29082c640
+  data.tar.gz: 0fd8e2988a4ece554272b0a61e63994243bfa23ad421f2ffdd9f0fd7f5beb446ef09cad99acfbdd7c787ed21b398a597ada26f74d203310dd444667aad7a82a2

data/README.md

@@ -10,6 +10,25 @@ For usage instructions, see the following guides:
   * [Lite FS](https://fly.io/docs/rails/advanced-guides/litefs/)
   * [Terraform](https://fly.io/docs/rails/advanced-guides/terraform/)
 
+## Generator options
+
+  * `--name` name of the application.  If a name is not provided, one will be generated for you.
+  * `--org` the organization to operate on.  Defaults to `personal`.
+  * `--region` region to launch the application in.  Accepts multiple values, and can be specified multiple times.
+  * `--nomad` generates a nomad application instead of a machines application.
+  * `--litefs` adds support for replicated sqlite3 databases via [litefs](https://fly.io/blog/introducing-litefs/).  Only works on nomad machines currently.
+  * `--passenger` run your Rails application with [nginx](https://www.nginx.com/) and [Phusion Passenger](https://www.phusionpassenger.com/).
+  * `--serverless` configures your application to exit after 5 minutes of inactivity.  Machines will automatically restart when next accessed.  Only works with passenger currently.
+
+## Automatically detected features
+
+  * _ruby_: the deployed application will use the same version of ruby and bundler as your development environment.
+  * _node_: if the use of node is detected, node, yarn, and your npm packages will be installed.
+  * _sqlite3_: if the production database is sqlite3 a volume will be allocated and the database will be put there.
+  * _postgres_: if the production database is postgres a postgres machine will be allocated
+  * _redis_: if redis is used for action cable, caching, or sidekiq your redis database will be added to this application.  If you don't currently have a redis database, one will be allocated.  If redis is used for caching, eviction will be turned on.
+  * _sidekiq_: if sidekiq is used it will be launched along side of your rails application.
+
 ## Key files
 
   * Entrypoints: [lib/tasks/fly.rake](./lib/tasks/fly.rake), [lib/generators/app_generator.rb](./lib/generators/app_generator.rb), [lib/generators/terraform_generator.rb](.lib/generators/terraform_generator.rb) contain the deploy task, fly:app generator and

data/lib/fly.io-rails/actions.rb

@@ -204,7 +204,7 @@ module Fly
       start = Fly::Machines.create_and_start_machine(app, config: config)
       machine = start[:id]
 
-      if !machine
+      if not machine
         STDERR.puts 'Error starting release machine'
         PP.pp start, STDERR
         exit 1
@@ -214,24 +214,27 @@ module Fly
         timeout: 60, state: 'started'
 
       # wait for release to copmlete
-      status = nil
       5.times do
         status = Fly::Machines.wait_for_machine app, machine,
-          timeout: 60, state: 'stopped'
-        return machine if status[:ok]
+          instance_id: start[:instance_id], timeout: 60, state: 'stopped'
+        break if status[:ok]
       end
 
-      # wait for release to copmlete
-      event = nil
-      90.times do
-        sleep 1
-        status = Fly::Machines.get_a_machine app, machine
-        event = status[:events]&.first
-        return machine if event && event[:type] == 'exit'
-      end
+      if status and status[:ok]
+        event = nil
+        300.times do
+          status = Fly::Machines.get_a_machine app, start[:id]
+          event = status[:events]&.first
+          break if event[:type] == 'exit'
+          sleep 0.2
+        end
 
-      STDERR.puts event.to_json
-      exit 1
+        exit_code = event&.dig(:request, :exit_event, :exit_code)
+        Fly::Machines.delete_machine app, machine if machine
+        return event, exit_code, machine
+      else
+        return status, nil, nil
+      end
     end
 
     def launch(app)
@@ -313,8 +316,14 @@ module Fly
 
         # perform release
         say_status :fly, release_config[:env]['SERVER_COMMAND']
-        machine = release(app, release_config)
-        Fly::Machines.delete_machine app, machine if machine
+        event, exit_code, machine = release(app, release_config)
+
+        if exit_code != 0
+          STDERR.puts 'Error performing release'
+          STDERR.puts (exit_code ? {exit_code: exit_code} : event).inspect
+          STDERR.puts "run 'flyctl logs --instance #{machine}' for more information"
+          exit 1
+        end
 
         # start proxy, if necessary
         endpoint = Fly::Machines::fly_api_hostname!
@@ -374,18 +383,17 @@ module Fly
     end
 
     def terraform(app, image) 
-      # update main.tf with the image name
-      tf = IO.read('main.tf')
-      tf[/^\s*image\s*=\s*"(.*?)"/, 1] = image.strip
-      IO.write 'main.tf', tf
-
-      # find first machine in terraform config file
-      machines = Fly::HCL.parse(IO.read('main.tf')).find {|block|
-        block.keys.first == :resource and
-        block.values.first.keys.first == 'fly_machine'}
+      # find first machine using the image ref in terraform config file
+      machine = Fly::HCL.parse(IO.read('main.tf')).
+        map {|block| block.dig(:resource, 'fly_machine')}.compact.
+        find {|machine| machine.values.first[:image] == 'var.image_ref'}
+      if not machine
+        STDERR.puts 'unable to find fly_machine with image = var.image_ref in main.rf'
+        exit 1
+      end
 
       # extract HCL configuration for the machine
-      config = machines.values.first.values.first.values.first
+      config = machine.values.first
 
       # delete HCL specific configuration items
       %i(services for_each region app name depends_on).each do |key|
@@ -407,40 +415,25 @@ module Fly
       config[:env] ||= {}
       config[:env]['SERVER_COMMAND'] = 'bin/rails fly:release'
 
+      # fill in image
+      config[:image] = image
+
       # start proxy, if necessary
       endpoint = Fly::Machines::fly_api_hostname!
 
-      # start release machine
-      STDERR.puts "--> #{config[:env]['SERVER_COMMAND']}"
-      start = Fly::Machines.create_and_start_machine(app, config: config)
-      machine = start[:id]
-
-      if !machine
-        STDERR.puts 'Error starting release machine'
-        PP.pp start, STDERR
-        exit 1
-      end
-
-      # wait for release to copmlete
-      event = nil
-      90.times do
-        sleep 1
-        status = Fly::Machines.get_a_machine app, machine
-        event = status[:events]&.first
-        break if event && event[:type] == 'exit'
+      # perform release, if necessary
+      if (IO.read('lib/tasks/fly.rake') rescue '') =~ /^\s*task[ \t]*+:?release"?[ \t]*\S/
+        say_status :fly, config[:env]['SERVER_COMMAND']
+        event, exit_code, machine = release(app, config)
+      else
+        exit_code = 0
       end
 
-      # extract exit code
-      exit_code = event.dig(:request, :exit_event, :exit_code)
-               
       if exit_code == 0
-        # delete release machine
-        Fly::Machines.delete_machine app, machine
-
         # use terraform apply to deploy
         ENV['FLY_API_TOKEN'] = `flyctl auth token`.chomp
         ENV['FLY_HTTP_ENDPOINT'] = endpoint if endpoint
-        system 'terraform apply -auto-approve'
+        system "terraform apply -auto-approve -var=\"image_ref=#{image}\""
       else
         STDERR.puts 'Error performing release'
         STDERR.puts (exit_code ? {exit_code: exit_code} : event).inspect

data/lib/fly.io-rails/version.rb

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/lib/generators/fly/terraform_generator.rb

@@ -9,6 +9,8 @@ class TerraformGenerator < Rails::Generators::Base
   class_option :region, type: :array, repeatable: true, default: []
 
   class_option :litefs, type: :boolean, default: false
+  class_option :passenger, type: :boolean, default: false
+  class_option :serverless, type: :boolean, default: false
 
   def terraform
     source_paths.push File.expand_path('../templates', __dir__)
@@ -20,6 +22,7 @@ class TerraformGenerator < Rails::Generators::Base
     action.generate_toml
     action.generate_dockerfile
     action.generate_dockerignore
+    action.generate_nginx_conf
     action.generate_terraform
     action.generate_raketask
     action.generate_procfile

data/lib/generators/templates/main.tf.erb

@@ -2,11 +2,16 @@ terraform {
   required_providers {
     fly = {
       source = "fly-apps/fly"
-      version = "0.0.18"
+      version = "0.0.20"
     }
   }
 }
 
+variable "image_ref" {
+  type        = string
+  description = "docker images containing the application"
+}
+
 /* uncomment if you want an internal tunnel
 provider "fly" {
   useinternaltunnel    = true
@@ -49,7 +54,7 @@ resource "fly_machine" "<%= @appName %>Machine" {
 
   app    = <%= @app.inspect %>
   name   = "<%= @app %>-${each.value}"
-  image  = "quay.io/evl.ms/fullstaq-ruby:<%= @ruby_version %>-jemalloc-slim"
+  image  = var.image_ref
 
   # Scale application resources
   cpus     = 1

data/lib/tasks/fly.rake

@@ -37,6 +37,18 @@ namespace :fly do
       action.generate_ipv6 if @app
       action.deploy(app, image)
     end
+
+    JSON.parse(`fly apps list --json`).each do |info|
+      if info['Name'] == app
+        60.times do
+          response = Net::HTTP.get_response(URI::HTTPS.build(host: info['Hostname']))
+          puts "Server status: #{response.code} #{response.message}"
+          break
+        rescue Errno::ECONNRESET
+          sleep 0.5
+        end
+      end
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -73,11 +73,11 @@ files:
 - lib/generators/templates/nginx.conf.erb
 - lib/generators/templates/patches/action_cable.rb
 - lib/tasks/fly.rake
-homepage: https://github.com/rubys/fly-io.rails
+homepage: https://github.com/rubys/fly.io-rails
 licenses:
 - Apache-2.0
 metadata:
-  homepage_uri: https://github.com/rubys/fly-io.rails
+  homepage_uri: https://github.com/rubys/fly.io-rails
 post_install_message:
 rdoc_options: []
 require_paths: