Add services urls

Author: coorasse

README.md

@@ -79,6 +79,12 @@ PROJECTS
 BUILDS
   deploio builds                  List all builds
   deploio builds -a APP           List builds for a specific app
+
+SERVICES
+  deploio services                            List all services
+  deploio services -p PROJECT                 List services in a specific project
+  deploio services -p PROJECT --url List services with connection URLs (requires -p)
+
 LOGS
   deploio logs -a APP             Show recent logs
   deploio logs -a APP --tail      Stream logs continuously

lib/deploio/cli.rb

@@ -6,6 +6,7 @@
 require_relative "commands/builds"
 require_relative "commands/orgs"
 require_relative "commands/projects"
+require_relative "commands/services"
 require_relative "completion_generator"
 
 module Deploio
@@ -45,6 +46,9 @@ def completion
     desc "projects COMMAND", "Project management commands"
     subcommand "projects", Commands::Projects
 
+    desc "services COMMAND", "Service management commands"
+    subcommand "services", Commands::Services
+
     desc "builds COMMAND", "Build management commands"
     subcommand "builds", Commands::Builds
 

lib/deploio/commands/services.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+module Deploio
+  module Commands
+    class Services < Thor
+      include SharedOptions
+
+      namespace "services"
+
+      class_option :json, type: :boolean, default: false, desc: "Output as JSON"
+
+      default_task :list
+
+      desc "list", "List services (all or filtered by project)"
+      method_option :project, aliases: "-p", type: :string,
+        desc: "Filter by project name"
+      method_option :url, aliases: "-u", type: :boolean, default: false,
+        desc: "Show connection URL for each service (requires --project)"
+      def list
+        setup_options
+
+        if merged_options[:url] && !merged_options[:project]
+          Output.error("The --url option requires --project to be specified")
+          Output.info("Fetching URLs for all services is too slow. Please filter by project first.")
+          Output.info("Example: deploio services -p myproject --url")
+          exit 1
+        end
+
+        project = merged_options[:project] ? resolve_project(merged_options[:project]) : nil
+        all_services = @nctl.get_all_services(project: project)
+
+        if options[:json]
+          puts JSON.pretty_generate(all_services)
+          return
+        end
+
+        if all_services.empty?
+          msg = project ? "No services found in project #{merged_options[:project]}" : "No services found"
+          Output.warning(msg) unless merged_options[:dry_run]
+          return
+        end
+
+        show_url = merged_options[:url]
+        current_org = @nctl.current_org
+        rows = all_services.map do |service|
+          metadata = service["metadata"] || {}
+          status = service["status"] || {}
+          conditions = status["conditions"] || []
+          ready_condition = conditions.find { |c| c["type"] == "Ready" }
+
+          namespace = metadata["namespace"] || ""
+          name = metadata["name"] || ""
+          type = service["_type"] || "-"
+
+          row = [
+            short_service_name(namespace, name, current_org),
+            project_from_namespace(namespace, current_org),
+            type,
+            presence(ready_condition&.dig("status"))
+          ]
+
+          if show_url
+            url = @nctl.get_service_connection_string(type, name, project: namespace)
+            row << presence(url)
+          end
+
+          row
+        end
+
+        headers = %w[SERVICE PROJECT TYPE READY]
+        headers << "URL" if show_url
+        Output.table(rows, headers: headers)
+      end
+
+      private
+
+      def resolve_project(project)
+        current_org = @nctl.current_org
+        # Don't prepend org if:
+        # - No org context
+        # - Project already contains a hyphen (already qualified)
+        # - Project equals the org name (special case for default project)
+        if current_org && !project.include?("-") && project != current_org
+          "#{current_org}-#{project}"
+        else
+          project
+        end
+      end
+
+      def presence(value, default: "-")
+        return default if value.nil? || value.to_s.empty?
+
+        value.to_s
+      end
+
+      def short_service_name(namespace, name, current_org)
+        project = project_from_namespace(namespace, current_org)
+        "#{project}-#{name}"
+      end
+
+      def project_from_namespace(namespace, current_org)
+        if current_org && namespace.start_with?("#{current_org}-")
+          namespace.delete_prefix("#{current_org}-")
+        else
+          namespace
+        end
+      end
+    end
+  end
+end

lib/deploio/completion_generator.rb

@@ -52,6 +52,7 @@ def default_option_completers
       {
         "app" => "app:_#{program_name}_apps_list",
         "size" => "size:(micro mini standard)"
+        "project" => "project:_#{program_name}_projects_list",
       }
     end
 

lib/deploio/nctl_client.rb

@@ -55,12 +55,6 @@ def get_app(app_ref)
       {}
     end
 
-    def get_app_stats(app_ref)
-      capture("get", "app", app_ref.app_name,
-        "--project", app_ref.project_name,
-        "-o", "stats")
-    end
-
     def get_all_builds
       output = capture("get", "builds", "-A", "-o", "json")
       return [] if output.nil? || output.empty?
@@ -89,26 +83,61 @@ def get_builds(app_ref)
       []
     end
 
-    def edit_app(app_ref)
-      exec_passthrough("edit", "app", app_ref.app_name,
-        "--project", app_ref.project_name)
+    def get_all_services(project: nil)
+      service_types = %w[keyvaluestore postgres mysql opensearch]
+      all_services = []
+
+      service_types.each do |type|
+        services = get_services_by_type(type, project: project)
+        services.each { |s| s["_type"] = type }
+        all_services.concat(services)
+      end
+
+      all_services
     end
 
-    def create_app(project, app_name, git_url:, git_revision:, size: "mini")
-      run("create", "app", app_name,
-        "--project", project,
-        "--git-url", git_url,
-        "--git-revision", git_revision,
-        "--size", size)
+    def get_services_by_type(type, project: nil)
+      args = ["get", type]
+      if project
+        args += ["--project", project]
+      else
+        args << "-A"
+      end
+      args += ["-o", "json"]
+
+      output = capture(*args)
+      return [] if output.nil? || output.empty?
+
+      data = JSON.parse(output)
+      data.is_a?(Array) ? data : (data["items"] || [])
+    rescue JSON::ParserError
+      []
+    rescue Deploio::NctlError
+      []
     end
 
-    def delete_app(app_ref)
-      run("delete", "app", app_ref.app_name,
-        "--project", app_ref.project_name)
+    def get_service(type, name, project:)
+      output = capture("get", type, name, "--project", project, "-o", "json")
+      return nil if output.nil? || output.empty?
+
+      JSON.parse(output)
+    rescue JSON::ParserError
+      nil
+    rescue Deploio::NctlError
+      nil
     end
 
-    def create_project(project_name)
-      run("create", "project", project_name)
+    def get_service_connection_string(type, name, project:)
+      case type
+      when "postgres", "mysql"
+        capture("get", type, name, "--project", project, "--print-connection-string").strip
+      when "keyvaluestore"
+        build_keyvaluestore_connection_string(name, project)
+      when "opensearch"
+        build_opensearch_connection_string(name, project)
+      end
+    rescue Deploio::NctlError
+      nil
     end
 
     def get_projects
@@ -269,5 +298,31 @@ def check_nctl_version
       raise Deploio::NctlError,
         "nctl version #{version} is too old. Need #{REQUIRED_VERSION}+. Run: brew upgrade nctl"
     end
+
+    def build_keyvaluestore_connection_string(name, project)
+      data = get_service("keyvaluestore", name, project: project)
+      return nil unless data
+
+      at_provider = data.dig("status", "atProvider") || {}
+      fqdn = at_provider["fqdn"]
+      return nil if fqdn.nil? || fqdn.empty?
+
+      token = capture("get", "keyvaluestore", name, "--project", project, "--print-token").strip
+      "rediss://:#{token}@#{fqdn}:6379"
+    end
+
+    def build_opensearch_connection_string(name, project)
+      data = get_service("opensearch", name, project: project)
+      return nil unless data
+
+      at_provider = data.dig("status", "atProvider") || {}
+      hosts = at_provider["hosts"] || []
+      return nil if hosts.empty?
+
+      user = capture("get", "opensearch", name, "--project", project, "--print-user").strip
+      password = capture("get", "opensearch", name, "--project", project, "--print-password").strip
+      host = hosts.first
+      "https://#{user}:#{password}@#{host}"
+    end
   end
 end

lib/deploio/templates/completion.zsh.erb

@@ -23,6 +23,32 @@ _<%= program_name %>_orgs_list() {
   fi
 }
 
+# Dynamic completion for services
+_<%= program_name %>_services_list() {
+  local -a services
+  services=(${(f)"$(<%= program_name %> services --json 2>/dev/null | ruby -rjson -e '
+    data = JSON.parse(STDIN.read) rescue []
+    orgs_json = `<%= program_name %> orgs --json 2>/dev/null` rescue "[]"
+    orgs = JSON.parse(orgs_json) rescue []
+    current_org = orgs.find { |o| o["current"] }&.fetch("name", nil)
+
+    data.each do |s|
+      ns = s.dig("metadata", "namespace") || ""
+      name = s.dig("metadata", "name") || ""
+      type = s["_type"] || "unknown"
+      project = current_org && ns.start_with?("#{current_org}-") ? ns.delete_prefix("#{current_org}-") : ns
+      short_name = "#{project}-#{name}"
+      puts "#{short_name}:#{name} (#{type})"
+    end
+  ' 2>/dev/null)"})
+
+  if [[ ${#services[@]} -gt 0 ]]; then
+    _describe -t services 'available services' services
+  else
+    _message 'service (format: project-servicename)'
+  fi
+}
+
 # Dynamic completion for projects
 _<%= program_name %>_projects_list() {
   local -a projects

test/deploio/cli_services_test.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "stringio"
+
+class CLIServicesTest < Minitest::Test
+  def test_services_list_queries_all_service_types
+    out, = capture_io do
+      Deploio::Commands::Services.start(["list", "--dry-run"])
+    end
+
+    # Should query all service types
+    assert_match(/nctl get keyvaluestore -A -o json/, out)
+    assert_match(/nctl get postgres -A -o json/, out)
+    assert_match(/nctl get mysql -A -o json/, out)
+    assert_match(/nctl get opensearch -A -o json/, out)
+  end
+
+  def test_services_default_task_is_list
+    out, = capture_io do
+      Deploio::Commands::Services.start(["--dry-run"])
+    end
+
+    # Default task should query all service types
+    assert_match(/nctl get keyvaluestore -A -o json/, out)
+  end
+
+  def test_services_via_main_cli_default_task
+    out, = capture_io do
+      Deploio::CLI.start(["services", "--dry-run"])
+    end
+
+    assert_match(/nctl get keyvaluestore -A -o json/, out)
+  end
+
+  def test_services_list_with_project_filter
+    out, = capture_io do
+      Deploio::Commands::Services.start(["list", "--project", "myproject", "--dry-run"])
+    end
+
+    # Should query with project filter instead of -A
+    assert_match(/nctl get keyvaluestore --project.*myproject -o json/, out)
+    assert_match(/nctl get postgres --project.*myproject -o json/, out)
+    assert_match(/nctl get mysql --project.*myproject -o json/, out)
+    assert_match(/nctl get opensearch --project.*myproject -o json/, out)
+  end
+
+  def test_services_list_with_project_filter_via_main_cli
+    out, = capture_io do
+      Deploio::CLI.start(["services", "-p", "myproject", "--dry-run"])
+    end
+
+    assert_match(/nctl get keyvaluestore --project.*myproject -o json/, out)
+  end
+end