uffizzi-cli 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08414382a904ff9a676cf23591fbbb909122d8c5d234ce5f6eb54d0ebc5bdc3a'
-  data.tar.gz: d2b438a98fc5c7b068c51d6f5c64607a102d90a9d06f939e2af722764af3676a
+  metadata.gz: f517c288807e4cb2a7480303b9c04b2856fe76885c79abc3bfb39f77dee24abc
+  data.tar.gz: be93d597d0a6892854974706d2bd629c5b323cffc6ee682f2623884d61d013ba
 SHA512:
-  metadata.gz: 4bd85b8e4b9dc97d01235521b32d08d54df974e37d8b23aac86bdaf2ee2d072fdbb185ac7d87829e716b393d36de0e8bb85a3ed9eb208836b0ee932d85cb1d3c
-  data.tar.gz: 71324d98bcfa5c49c693684555e22c5ab7711d95b3ffd74e683013cb24bf9b358aa6a1ff7bd1193560cad8ebe10b2915419b33642ab836dbd0019d551b8daff9
+  metadata.gz: 54df68a43dddc1827a83dfa0f172c57d68b12f6ac52064990b02cd69ccb6a27bced898db4420f146fdd55dcefc017317142b7c587213114af2135dd0a4cc2444
+  data.tar.gz: ff40d04955d46452f0823788c1e62b6de2267fc4623cf4cdd0448e107d78610a1d021051346cd7db55f1b5c1ff18b27da9c81328490fb98c3bb19bf4e0a406aa

data/README.md

@@ -176,6 +176,16 @@ $ uffizzi config delete OPTION
 
 Deletes specified option.
 
+### disconnect ###
+
+```
+$ uffizzi disconnect CREDENTIAL_TYPE
+```
+
+Deletes credential of specified type
+
+Supported credential types - `docker-hub`, `acr`, `ecr`, `gcr`
+
 ## Git workflow for the app:
 
 1. Clone the repository and checkout to `develop` branch

data/lib/uffizzi/cli/disconnect.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'uffizzi'
+
+module Uffizzi
+  class CLI::Disconnect
+    include ApiClient
+
+    def run(credential_type)
+      connection_type = case credential_type
+                        when 'docker-hub'
+                          Uffizzi.configuration.credential_types[:dockerhub]
+                        when 'acr'
+                          Uffizzi.configuration.credential_types[:azure]
+                        when 'ecr'
+                          Uffizzi.configuration.credential_types[:amazon]
+                        when 'gcr'
+                          Uffizzi.configuration.credential_types[:google]
+                        else
+                          raise Uffizzi::Error.new('Unsupported credential type.')
+      end
+
+      response = delete_credential(ConfigFile.read_option(:hostname), connection_type)
+
+      if ResponseHelper.no_content?(response)
+        Uffizzi.ui.say("Successfully disconnected #{connection_name(credential_type)} connection")
+      else
+        ResponseHelper.handle_failed_response(response)
+      end
+    end
+
+    private
+
+    def connection_name(credential_type)
+      {
+        'docker-hub' => 'DockerHub',
+        'acr' => 'ACR',
+        'ecr' => 'ECR',
+        'gcr' => 'GCR',
+      }[credential_type]
+    end
+  end
+end

data/lib/uffizzi/cli/preview/service.rb

@@ -9,7 +9,23 @@ module Uffizzi
   class CLI::Preview::Service < Thor
     include ApiClient
 
-    desc 'list', 'list'
+    desc 'uffizzi preview service logs [LOGS_TYPE] [DEPLOYMENT_ID] [CONTAINER_NAME]', 'logs'
+    def logs(logs_type, deployment_name, container_name = args)
+      return Uffizzi.ui.say('You are not logged in.') unless Uffizzi::AuthHelper.signed_in?
+      return Uffizzi.ui.say('This command needs project to be set in config file') unless Uffizzi::AuthHelper.project_set?
+
+      deployment_id = PreviewService.read_deployment_id(deployment_name)
+      response = service_logs_response(logs_type, deployment_id, container_name)
+      return Uffizzi.ui.say(response[:errors]) if response[:errors]
+
+      if ResponseHelper.ok?(response)
+        handle_succeed_logs_response(response, container_name)
+      else
+        ResponseHelper.handle_failed_response(response)
+      end
+    end
+
+    desc 'uffizzi preview service logs [DEPLOYMENT_ID]', 'list'
     def list(deployment_name)
       return Uffizzi.ui.say('You are not logged in.') unless Uffizzi::AuthHelper.signed_in?
       return Uffizzi.ui.say('This command needs project to be set in config file') unless Uffizzi::AuthHelper.project_set?
@@ -20,7 +36,7 @@ module Uffizzi
       response = fetch_deployment_services(hostname, project_slug, deployment_id)
 
       if ResponseHelper.ok?(response)
-        handle_succeed_response(response, deployment_name)
+        handle_succeed_list_response(response, deployment_name)
       else
         ResponseHelper.handle_failed_response(response)
       end
@@ -28,7 +44,19 @@ module Uffizzi
 
     private
 
-    def handle_succeed_response(response, deployment_name)
+    def service_logs_response(logs_type, deployment_id, container_name)
+      project_slug = ConfigFile.read_option(:project)
+      hostname = ConfigFile.read_option(:hostname)
+
+      case logs_type
+      when 'container'
+        fetch_deployment_service_logs(hostname, project_slug, deployment_id, container_name)
+      else
+        raise Uffizzi::Error.new('Unknown log type')
+      end
+    end
+
+    def handle_succeed_list_response(response, deployment_name)
       services = response[:body][:containers] || []
       return Uffizzi.ui.say("There are no services associated with the preview #{deployment_name}") if services.empty?
 
@@ -36,5 +64,14 @@ module Uffizzi
         Uffizzi.ui.say(service)
       end
     end
+
+    def handle_succeed_logs_response(response, container_name)
+      logs = response[:body][:logs] || []
+      return Uffizzi.ui.say("The service #{container_name} has no logs") if logs.empty?
+
+      logs.each do |log|
+        Uffizzi.ui.say(log)
+      end
+    end
   end
 end

data/lib/uffizzi/cli/preview.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'uffizzi'
-require 'tty-spinner'
 require 'uffizzi/auth_helper'
 require 'uffizzi/services/preview_service'
 

data/lib/uffizzi/cli.rb

@@ -8,6 +8,10 @@ module Uffizzi
     require_relative 'cli/common'
     class_option :help, type: :boolean, aliases: ['-h', 'help']
 
+    def self.exit_on_failure?
+      true
+    end
+
     desc 'version', 'show version'
     def version
       require_relative 'version'
@@ -54,5 +58,11 @@ module Uffizzi
       require_relative 'cli/connect'
       Connect.new.run(credential_type, credential_file_path)
     end
+
+    desc 'disconect CREDENTIAL_TYPE', 'Disonnect credentials from Uffizzi'
+    def disconnect(credential_type)
+      require_relative 'cli/disconnect'
+      Disconnect.new.run(credential_type)
+    end
   end
 end

data/lib/uffizzi/clients/api/api_client.rb

@@ -41,6 +41,20 @@ module ApiClient
     build_response(response)
   end
 
+  def delete_credential(hostname, credential_type)
+    uri = delete_credential_uri(hostname, credential_type)
+    response = Uffizzi::HttpClient.make_delete_request(uri)
+
+    build_response(response)
+  end
+
+  def fetch_deployment_service_logs(hostname, project_slug, deployment_id, container_name)
+    uri = preview_service_logs_uri(hostname, project_slug, deployment_id, container_name)
+    response = Uffizzi::HttpClient.make_get_request(uri)
+
+    build_response(response)
+  end
+
   def set_compose_file(hostname, params, project_slug)
     uri = compose_file_uri(hostname, project_slug)
     response = Uffizzi::HttpClient.make_post_request(uri, params)

data/lib/uffizzi/clients/api/api_routes.rb

@@ -55,4 +55,12 @@ module ApiRoutes
   def preview_services_uri(hostname, project_slug, deployment_id)
     "#{hostname}/api/cli/v1/projects/#{project_slug}/deployments/#{deployment_id}/containers"
   end
+
+  def delete_credential_uri(hostname, credential_type)
+    "#{hostname}/api/cli/v1/account/credentials/#{credential_type}"
+  end
+
+  def preview_service_logs_uri(hostname, project_slug, deployment_id, container_name)
+    "#{hostname}/api/cli/v1/projects/#{project_slug}/deployments/#{deployment_id}/containers/#{container_name}/logs"
+  end
 end

data/lib/uffizzi/error.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Uffizzi
+  class Error < Thor::Error; end
+end

data/lib/uffizzi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uffizzi
-  VERSION = '0.3.6'
+  VERSION = '0.4.0'
 end

data/lib/uffizzi.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 require 'io/console'
+require 'tty-spinner'
 
+require 'thor'
+require 'uffizzi/error'
 require 'uffizzi/shell'
 require 'uffizzi/version'
 require 'uffizzi/clients/api/api_client'
@@ -10,8 +13,6 @@ require 'uffizzi/config_file'
 require_relative '../config/uffizzi'
 
 module Uffizzi
-  class Error < StandardError; end
-
   class << self
     def ui
       @ui ||= Uffizzi::UI::Shell.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,8 +9,36 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -235,20 +263,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: tty-spinner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -263,20 +277,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: uffizzi-cli
 email:
 - info@uffizzi.com
@@ -285,22 +285,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".dockerignore"
-- ".rubocop.yml"
-- CHANGELOG.md
-- CONTRIBUTING.md
-- Dockerfile
-- Gemfile
-- Gemfile.lock
 - LICENSE
-- Makefile
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
 - config/uffizzi.rb
-- docker-compose.yml
-- docker-entrypoint.sh
 - exe/uffizzi
 - lib/uffizzi.rb
 - lib/uffizzi/auth_helper.rb
@@ -308,6 +295,7 @@ files:
 - lib/uffizzi/cli/common.rb
 - lib/uffizzi/cli/config.rb
 - lib/uffizzi/cli/connect.rb
+- lib/uffizzi/cli/disconnect.rb
 - lib/uffizzi/cli/login.rb
 - lib/uffizzi/cli/logout.rb
 - lib/uffizzi/cli/preview.rb
@@ -319,27 +307,13 @@ files:
 - lib/uffizzi/clients/api/api_routes.rb
 - lib/uffizzi/clients/api/http_client.rb
 - lib/uffizzi/config_file.rb
+- lib/uffizzi/error.rb
 - lib/uffizzi/response_helper.rb
 - lib/uffizzi/services/compose_file_service.rb
 - lib/uffizzi/services/env_variables_service.rb
 - lib/uffizzi/services/preview_service.rb
 - lib/uffizzi/shell.rb
 - lib/uffizzi/version.rb
-- man/uffizzi-create
-- man/uffizzi-create.ronn
-- man/uffizzi-delete
-- man/uffizzi-delete.ronn
-- man/uffizzi-describe
-- man/uffizzi-describe.ronn
-- man/uffizzi-events
-- man/uffizzi-events.ronn
-- man/uffizzi-list
-- man/uffizzi-list.ronn
-- man/uffizzi-logout
-- man/uffizzi-logout.ronn
-- man/uffizzi-preview
-- man/uffizzi-preview.ronn
-- uffizzi.gemspec
 homepage: https://uffizzi.com
 licenses:
 - Apache-2.0

data/.dockerignore

@@ -1,9 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-.byebug_history