cpl 0.6.0 → 1.0.0

data/lib/core/config.rb

@@ -15,24 +15,15 @@ class Config
     @app = options[:app]
 
     load_app_config
-
-    @apps = config[:apps]
-
-    pick_current_config if app
-    warn_deprecated_options if current
+    load_apps
   end
 
   def [](key)
     ensure_current_config!
 
-    old_key = old_option_keys[key]
-    if current.key?(key)
-      current.fetch(key)
-    elsif old_key && current.key?(old_key)
-      current.fetch(old_key)
-    else
-      raise "Can't find option '#{key}' for app '#{app}' in 'controlplane.yml'."
-    end
+    raise "Can't find option '#{key}' for app '#{app}' in 'controlplane.yml'." unless current.key?(key)
+
+    current.fetch(key)
   end
 
   def script_path
@@ -49,8 +40,8 @@ class Config
     raise "Can't find current config, please specify an app." unless current
   end
 
-  def ensure_current_config_app!(app)
-    raise "Can't find app '#{app}' in 'controlplane.yml'." unless current
+  def ensure_current_config_app!(app_name)
+    raise "Can't find app '#{app_name}' in 'controlplane.yml'." unless current
   end
 
   def ensure_config!
@@ -61,20 +52,36 @@ class Config
     raise "Can't find key 'apps' in 'controlplane.yml'." unless config[:apps]
   end
 
-  def ensure_config_app!(app, options)
-    raise "App '#{app}' is empty in 'controlplane.yml'." unless options
+  def ensure_config_app!(app_name, app_options)
+    raise "App '#{app_name}' is empty in 'controlplane.yml'." unless app_options
+  end
+
+  def app_matches_current?(app_name, app_options)
+    app && (app_name.to_s == app || (app_options[:match_if_app_name_starts_with] && app.start_with?(app_name.to_s)))
   end
 
-  def pick_current_config
-    config[:apps].each do |c_app, c_data|
-      ensure_config_app!(c_app, c_data)
-      next unless c_app.to_s == app || (c_data[:match_if_app_name_starts_with] && app.start_with?(c_app.to_s))
+  def pick_current_config(app_name, app_options)
+    @current = app_options
+    @org = self[:cpln_org]
+    ensure_current_config_app!(app_name)
+  end
+
+  def load_apps # rubocop:disable Metrics/MethodLength
+    @apps = config[:apps].to_h do |app_name, app_options|
+      ensure_config_app!(app_name, app_options)
+
+      app_options_with_new_keys = app_options.to_h do |key, value|
+        new_key = new_option_keys[key]
+        new_key ? [new_key, value] : [key, value]
+      end
+
+      if app_matches_current?(app_name, app_options_with_new_keys)
+        pick_current_config(app_name, app_options_with_new_keys)
+        warn_deprecated_options(app_options)
+      end
 
-      @current = c_data
-      @org = self[:cpln_org]
-      break
+      [app_name, app_options_with_new_keys]
     end
-    ensure_current_config_app!(app)
   end
 
   def load_app_config
@@ -100,19 +107,19 @@ class Config
     end
   end
 
-  def old_option_keys
+  def new_option_keys
     {
-      cpln_org: :org,
-      default_location: :location,
-      match_if_app_name_starts_with: :prefix
+      org: :cpln_org,
+      location: :default_location,
+      prefix: :match_if_app_name_starts_with
     }
   end
 
-  def warn_deprecated_options
-    deprecated_option_keys = old_option_keys.filter { |_new_key, old_key| current.key?(old_key) }
+  def warn_deprecated_options(app_options)
+    deprecated_option_keys = new_option_keys.filter { |old_key| app_options.key?(old_key) }
     return if deprecated_option_keys.empty?
 
-    deprecated_option_keys.each do |new_key, old_key|
+    deprecated_option_keys.each do |old_key, new_key|
       Shell.warn_deprecated("Option '#{old_key}' is deprecated, " \
                             "please use '#{new_key}' instead (in 'controlplane.yml').")
     end

data/lib/core/controlplane.rb

@@ -35,10 +35,13 @@ class Controlplane # rubocop:disable Metrics/ClassLength
 
   # image
 
-  def image_build(image, dockerfile:, push: true)
-    cmd = "cpln image build --org #{org} --name #{image} --dir #{config.app_dir} --dockerfile #{dockerfile}"
-    cmd += " --push" if push
+  def image_build(image, dockerfile:, build_args: [], push: true)
+    cmd = "docker build -t #{image} -f #{dockerfile}"
+    build_args.each { |build_arg| cmd += " --build-arg #{build_arg}" }
+    cmd += " #{config.app_dir}"
     perform!(cmd)
+
+    image_push(image) if push
   end
 
   def image_query(app_name = config.app, org_name = config.org)
@@ -97,7 +100,7 @@ class Controlplane # rubocop:disable Metrics/ClassLength
     gvc_data = fetch_gvc(a_gvc)
     return gvc_data if gvc_data
 
-    raise "Can't find GVC '#{gvc}', please create it with 'cpl setup gvc -a #{config.app}'."
+    raise "Can't find app '#{gvc}', please create it with 'cpl setup-app -a #{config.app}'."
   end
 
   def gvc_delete(a_gvc = gvc)
@@ -122,7 +125,13 @@ class Controlplane # rubocop:disable Metrics/ClassLength
     workload_data = fetch_workload(workload)
     return workload_data if workload_data
 
-    raise "Can't find workload '#{workload}', please create it with 'cpl setup #{workload} -a #{config.app}'."
+    raise "Can't find workload '#{workload}', please create it with 'cpl apply-template #{workload} -a #{config.app}'."
+  end
+
+  def query_workloads(workload, partial_match: false)
+    op = partial_match ? "~" : "="
+
+    api.query_workloads(org: org, gvc: gvc, workload: workload, op_type: op)
   end
 
   def workload_get_replicas(workload, location:)
@@ -136,6 +145,10 @@ class Controlplane # rubocop:disable Metrics/ClassLength
     $CHILD_STATUS.success? ? YAML.safe_load(result) : nil
   end
 
+  def fetch_workload_deployments(workload)
+    api.workload_deployments(workload: workload, gvc: gvc, org: org)
+  end
+
   def workload_set_image_ref(workload, container:, image:)
     cmd = "cpln workload update #{workload} #{gvc_org}"
     cmd += " --set spec.containers.#{container}.image=/org/#{config.org}/image/#{image}"
@@ -143,10 +156,26 @@ class Controlplane # rubocop:disable Metrics/ClassLength
     perform!(cmd)
   end
 
-  def workload_set_suspend(workload, value)
+  def set_workload_env_var(workload, container:, name:, value:)
+    data = fetch_workload!(workload)
+    data["spec"]["containers"].each do |container_data|
+      next unless container_data["name"] == container
+
+      container_data["env"].each do |env_data|
+        next unless env_data["name"] == name
+
+        env_data["value"] = value
+      end
+    end
+
+    api.update_workload(org: org, gvc: gvc, workload: workload, data: data)
+  end
+
+  def set_workload_suspend(workload, value)
     data = fetch_workload!(workload)
     data["spec"]["defaultOptions"]["suspend"] = value
-    apply(data)
+
+    api.update_workload(org: org, gvc: gvc, workload: workload, data: data)
   end
 
   def workload_force_redeployment(workload)
@@ -155,15 +184,8 @@ class Controlplane # rubocop:disable Metrics/ClassLength
     perform!(cmd)
   end
 
-  def workload_delete(workload)
-    cmd = "cpln workload delete #{workload} #{gvc_org}"
-    cmd += " 2> /dev/null"
-    perform(cmd)
-  end
-
-  def workload_delete!(workload)
-    cmd = "cpln workload delete #{workload} #{gvc_org}"
-    perform!(cmd)
+  def delete_workload(workload)
+    api.delete_workload(org: org, gvc: gvc, workload: workload)
   end
 
   def workload_connect(workload, location:, container: nil, shell: nil)
@@ -180,6 +202,40 @@ class Controlplane # rubocop:disable Metrics/ClassLength
     perform!(cmd)
   end
 
+  # domain
+
+  def find_domain_route(data)
+    port = data["spec"]["ports"].find { |current_port| current_port["number"] == 80 || current_port["number"] == 443 }
+    return nil if port.nil? || port["routes"].nil?
+
+    route = port["routes"].find { |current_route| current_route["prefix"] == "/" }
+    return nil if route.nil?
+
+    route
+  end
+
+  def find_domain_for(workloads)
+    domains = api.list_domains(org: org)["items"]
+    domains.find do |domain_data|
+      route = find_domain_route(domain_data)
+      next false if route.nil?
+
+      workloads.any? { |workload| route["workloadLink"].split("/").last == workload }
+    end
+  end
+
+  def get_domain_workload(data)
+    route = find_domain_route(data)
+    route["workloadLink"].split("/").last
+  end
+
+  def set_domain_workload(data, workload)
+    route = find_domain_route(data)
+    route["workloadLink"] = "/org/#{org}/gvc/#{gvc}/workload/#{workload}"
+
+    api.update_domain(org: org, domain: data["name"], data: data)
+  end
+
   # logs
 
   def logs(workload:)

data/lib/core/controlplane_api.rb

@@ -33,6 +33,29 @@ class ControlplaneApi
     api_json_direct("/logs/org/#{org}/loki/api/v1/query_range?#{params}", method: :get, host: :logs)
   end
 
+  def query_workloads(org:, gvc:, workload:, op_type:) # rubocop:disable Metrics/MethodLength
+    body = {
+      kind: "string",
+      spec: {
+        match: "all",
+        terms: [
+          {
+            rel: "gvc",
+            op: "=",
+            value: gvc
+          },
+          {
+            property: "name",
+            op: op_type,
+            value: workload
+          }
+        ]
+      }
+    }
+
+    api_json("/org/#{org}/workload/-query", method: :post, body: body)
+  end
+
   def workload_list(org:, gvc:)
     api_json("/org/#{org}/gvc/#{gvc}/workload", method: :get)
   end
@@ -45,10 +68,26 @@ class ControlplaneApi
     api_json("/org/#{org}/gvc/#{gvc}/workload/#{workload}", method: :get)
   end
 
+  def update_workload(org:, gvc:, workload:, data:)
+    api_json("/org/#{org}/gvc/#{gvc}/workload/#{workload}", method: :patch, body: data)
+  end
+
   def workload_deployments(org:, gvc:, workload:)
     api_json("/org/#{org}/gvc/#{gvc}/workload/#{workload}/deployment", method: :get)
   end
 
+  def delete_workload(org:, gvc:, workload:)
+    api_json("/org/#{org}/gvc/#{gvc}/workload/#{workload}", method: :delete)
+  end
+
+  def list_domains(org:)
+    api_json("/org/#{org}/domain", method: :get)
+  end
+
+  def update_domain(org:, domain:, data:)
+    api_json("/org/#{org}/domain/#{domain}", method: :patch, body: data)
+  end
+
   private
 
   # switch between cpln rest and api

data/lib/core/controlplane_api_direct.rb

@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 
 class ControlplaneApiDirect
-  API_METHODS = { get: Net::HTTP::Get, post: Net::HTTP::Post, put: Net::HTTP::Put, delete: Net::HTTP::Delete }.freeze
+  API_METHODS = {
+    get: Net::HTTP::Get,
+    patch: Net::HTTP::Patch,
+    post: Net::HTTP::Post,
+    put: Net::HTTP::Put,
+    delete: Net::HTTP::Delete
+  }.freeze
   API_HOSTS = { api: "https://api.cpln.io", logs: "https://logs.cpln.io" }.freeze
 
   # API_TOKEN_REGEX = Regexp.union(
@@ -11,11 +17,12 @@ class ControlplaneApiDirect
 
   API_TOKEN_REGEX = /^[\w\-._]+$/.freeze
 
-  def call(url, method:, host: :api) # rubocop:disable Metrics/MethodLength
+  def call(url, method:, host: :api, body: nil) # rubocop:disable Metrics/MethodLength
     uri = URI("#{API_HOSTS[host]}#{url}")
     request = API_METHODS[method].new(uri)
     request["Content-Type"] = "application/json"
     request["Authorization"] = api_token
+    request.body = body.to_json if body
 
     response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) { |http| http.request(request) }
 
@@ -31,13 +38,16 @@ class ControlplaneApiDirect
     end
   end
 
+  # rubocop:disable Style/ClassVars
   def api_token
     return @@api_token if defined?(@@api_token)
 
-    @@api_token = ENV.fetch("CPLN_TOKEN", `cpln profile token`.chomp) # rubocop:disable Style/ClassVars
+    @@api_token = ENV.fetch("CPLN_TOKEN", nil)
+    @@api_token = `cpln profile token`.chomp if @@api_token.nil?
     return @@api_token if @@api_token.match?(API_TOKEN_REGEX)
 
     raise "Unknown API token format. " \
           "Please re-run 'cpln profile login' or set the correct CPLN_TOKEN env variable."
   end
+  # rubocop:enable Style/ClassVars
 end

data/lib/core/scripts.rb

@@ -10,7 +10,7 @@ module Scripts
         -H "Authorization: ${CONTROLPLANE_TOKEN}" -s | grep -o '"replicas":[0-9]*' | grep -o '[0-9]*')
 
       if [ "$REPLICAS_QTY" -gt 0 ]; then
-        echo "-- MULTIPLE REPLICAS ATTEMPT !!!! replicas: $REPLICAS_QTY"
+        echo "-- MULTIPLE REPLICAS ATTEMPT: $REPLICAS_QTY --"
         exit -1
       fi
     SHELL
@@ -24,7 +24,7 @@ module Scripts
 
   # NOTE: please escape all '/' as '//' (as it is ruby interpolation here as well)
   def http_dummy_server_ruby
-    'require "socket";s=TCPServer.new(ENV["PORT"]);' \
+    'require "socket";s=TCPServer.new(ENV["PORT"] || 80);' \
       'loop do c=s.accept;c.puts("HTTP/1.1 200 OK\\nContent-Length: 2\\n\\nOk");c.close end'
   end
 

data/lib/cpl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cpl
-  VERSION = "0.6.0"
+  VERSION = "1.0.0"
 end

data/script/check_command_docs

@@ -0,0 +1,3 @@
+#!/bin/sh
+bundle exec rake update_command_docs
+git diff --exit-code || exit 1

data/templates/daily-task.yml

@@ -0,0 +1,30 @@
+kind: workload
+name: daily-task
+spec:
+  # https://docs.controlplane.com/reference/workload#cron-configuration
+  type: cron
+  job:
+    # Run daily job at 2am, see cron docs
+    schedule: 0  2  *  *  *
+    # Never or OnFailure
+    restartPolicy: Never
+  containers:
+    - name: daily-task
+      args:
+        - bundle
+        - exec
+        - rails
+        - db:prepare
+      cpu: 50m
+      inheritEnv: true
+      image: '/org/APP_ORG/image/APP_IMAGE'
+      memory: 256Mi
+  defaultOptions:
+    autoscaling:
+      maxScale: 1
+    capacityAI: false
+  firewallConfig:
+    external:
+      outboundAllowCIDR:
+        - 0.0.0.0/0
+  identityLink: /org/APP_ORG/gvc/APP_GVC/identity/APP_GVC-identity

data/templates/maintenance.yml

@@ -0,0 +1,24 @@
+kind: workload
+name: maintenance
+spec:
+  type: standard
+  containers:
+    - name: maintenance
+      env:
+        - name: PORT
+          value: '3000'
+        - name: PAGE_URL
+          value: ''
+      image: 'shakacode/maintenance-mode'
+      ports:
+        - number: 3000
+          protocol: http
+  defaultOptions:
+    autoscaling:
+      maxScale: 1
+    capacityAI: false
+    timeoutSeconds: 60
+  firewallConfig:
+    external:
+      inboundAllowCIDR:
+        - 0.0.0.0/0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpl
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Justin Gordon
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2023-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -151,6 +151,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.22.0
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.18.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.18.1
 description: CLI for providing Heroku-like platform-as-a-service on Control Plane
 email:
 - justin@shakacode.com
@@ -160,6 +202,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/command_docs.yml"
 - ".github/workflows/rspec.yml"
 - ".github/workflows/rubocop.yml"
 - ".gitignore"
@@ -197,6 +240,10 @@ files:
 - lib/command/info.rb
 - lib/command/latest_image.rb
 - lib/command/logs.rb
+- lib/command/maintenance.rb
+- lib/command/maintenance_off.rb
+- lib/command/maintenance_on.rb
+- lib/command/maintenance_set_page.rb
 - lib/command/no_command.rb
 - lib/command/open.rb
 - lib/command/promote_app_from_upstream.rb
@@ -205,6 +252,7 @@ files:
 - lib/command/ps_start.rb
 - lib/command/ps_stop.rb
 - lib/command/run.rb
+- lib/command/run_cleanup.rb
 - lib/command/run_detached.rb
 - lib/command/setup_app.rb
 - lib/command/test.rb
@@ -222,10 +270,13 @@ files:
 - lib/main.rb
 - rakelib/create_release.rake
 - script/add_command
-- script/generate_commands_docs
+- script/check_command_docs
 - script/rename_command
+- script/update_command_docs
+- templates/daily-task.yml
 - templates/gvc.yml
 - templates/identity.yml
+- templates/maintenance.yml
 - templates/memcached.yml
 - templates/postgres.yml
 - templates/rails.yml