uffizzi-cli 0.11.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e92bf221528510c670cb020826d6449a4c200dcdacb6b6c42cea9344f1aac12b
-  data.tar.gz: d95b2e8069051b7450d099add663104da159756913ca977d303f673805d8d0cb
+  metadata.gz: a7a27f279e964f07491f920557722194d65c8a9259487a5a717707f6075d164b
+  data.tar.gz: d9825fe3425b0dde3dbe1e4528686100c6ca22f30aed4aa7a332cf991bbb6480
 SHA512:
-  metadata.gz: a3da65fe42dd24ddca4c3c5fb7b15349e1daeef00689c421b0556d1d58eb34169de7c8bb4474ff1594fc5e526a1a5d8bd89124b649fb2606f10172440236613d
-  data.tar.gz: f68cba8bbbf8591dfb5310606f7322b312171d1110587fd80969453fccaa82d2f31aab560731d962122e82524f7a4ac20283e5f2d2b8965b0e027bae370e3746
+  metadata.gz: 179a75d66bd89efc1ad9b3decf5ebc6c5526b2fe0fdd02e616940b4f12544505c956874a0649a99a2c5d1e14fce6e1dcda305a9028e08d8e9c2b8b5f63955fb5
+  data.tar.gz: a8d2637bef4250c33bb1cc8725556a2758384c9115938865e8acd70b92fce515ccd94b691913341c6b6f64a29f6d9ff34e99148fd62cacf8d6551d72a1222508

data/config/uffizzi.rb

@@ -19,6 +19,7 @@ module Uffizzi
       google: 'UffizziCore::Credential::Google',
       amazon: 'UffizziCore::Credential::Amazon',
       github_registry: 'UffizziCore::Credential::GithubContainerRegistry',
+      docker_registry: 'UffizziCore::Credential::DockerRegistry',
     }
     config.default_server = 'app.uffizzi.com'
   end

data/lib/uffizzi/cli/connect.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'uffizzi'
+require 'uffizzi/helpers/connect_helper'
 
 module Uffizzi
   class Cli::Connect < Thor
@@ -20,39 +21,76 @@ module Uffizzi
     desc 'docker-hub', 'Connect to Docker Hub (hub.docker.com)'
     method_option :skip_raise_existence_error, type: :boolean, default: false,
                                                desc: 'Skip raising an error within check the credential'
+    method_option :update_credential_if_exists, type: :boolean, default: false
+    method_option :username, type: :string, aliases: :u
+    method_option :password, type: :string, aliases: :p
     def docker_hub
       type = Uffizzi.configuration.credential_types[:dockerhub]
-      check_credential_existence(type, 'docker-hub')
+      credential_exists = credential_exists?(type)
+      handle_existing_credential_options('docker-hub') if credential_exists
 
-      username = ENV['DOCKERHUB_USERNAME'] || Uffizzi.ui.ask('Username: ')
-      password = ENV['DOCKERHUB_PASSWORD'] || Uffizzi.ui.ask('Password: ', echo: false)
+      username, password = Uffizzi::ConnectHelper.get_docker_hub_data(options)
 
       params = {
         username: username,
         password: password,
-        type: Uffizzi.configuration.credential_types[:dockerhub],
+        type: type,
       }
+      server = ConfigFile.read_option(:server)
+
+      response = if credential_exists
+        update_credential(server, params, type)
+      else
+        create_credential(server, params)
+      end
 
+      handle_result_for('Docker Hub', response)
+    end
+
+    desc 'docker-registry', 'Connect to any registry implementing the Docker Registry HTTP API protocol'
+    method_option :skip_raise_existence_error, type: :boolean, default: false,
+                                               desc: 'Skip raising an error within check the credential'
+    method_option :update_credential_if_exists, type: :boolean, default: false
+    method_option :registry, type: :string, aliases: :r
+    method_option :username, type: :string, aliases: :u
+    method_option :password, type: :string, aliases: :p
+    def docker_registry
+      type = Uffizzi.configuration.credential_types[:docker_registry]
+      credential_exists = credential_exists?(type)
+      handle_existing_credential_options('docker-registry') if credential_exists
+
+      registry_url, username, password = Uffizzi::ConnectHelper.get_docker_registry_data(options)
+
+      params = {
+        registry_url: prepare_registry_url(registry_url),
+        username: username,
+        password: password,
+        type: type,
+      }
       server = ConfigFile.read_option(:server)
-      response = create_credential(server, params)
 
-      if ResponseHelper.created?(response)
-        print_success_message('DockerHub')
+      response = if credential_exists
+        update_credential(server, params, type)
       else
-        ResponseHelper.handle_failed_response(response)
+        create_credential(server, params)
       end
+
+      handle_result_for('Docker Registry', response)
     end
 
     desc 'acr', 'Connect to Azure Container Registry (azurecr.io)'
     method_option :skip_raise_existence_error, type: :boolean, default: false,
                                                desc: 'Skip raising an error within check the credential'
+    method_option :update_credential_if_exists, type: :boolean, default: false
+    method_option :registry, type: :string, aliases: :r
+    method_option :username, type: :string, aliases: :u
+    method_option :password, type: :string, aliases: :p
     def acr
       type = Uffizzi.configuration.credential_types[:azure]
-      check_credential_existence(type, 'acr')
+      credential_exists = credential_exists?(type)
+      handle_existing_credential_options('acr') if credential_exists
 
-      registry_url = ENV['ACR_REGISTRY_URL'] || Uffizzi.ui.ask('Registry Domain: ')
-      username = ENV['ACR_USERNAME'] || Uffizzi.ui.ask('Docker ID: ')
-      password = ENV['ACR_PASSWORD'] || Uffizzi.ui.ask('Password/Access Token: ', echo: false)
+      registry_url, username, password = Uffizzi::ConnectHelper.get_acr_data(options)
 
       params = {
         username: username,
@@ -60,51 +98,56 @@ module Uffizzi
         registry_url: prepare_registry_url(registry_url),
         type: type,
       }
-
       server = ConfigFile.read_option(:server)
-      response = create_credential(server, params)
 
-      if ResponseHelper.created?(response)
-        print_success_message('ACR')
+      response = if credential_exists
+        update_credential(server, params, type)
       else
-        ResponseHelper.handle_failed_response(response)
+        create_credential(server, params)
       end
+
+      handle_result_for('ACR', response)
     end
 
     desc 'ecr', 'Connect to Amazon Elastic Container Registry'
     method_option :skip_raise_existence_error, type: :boolean, default: false,
                                                desc: 'Skip raising an error within check the credential'
+    method_option :update_credential_if_exists, type: :boolean, default: false
+    method_option :registry, type: :string, aliases: :r
+    method_option :id, type: :string
+    method_option :secret, type: :string, aliases: :s
     def ecr
       type = Uffizzi.configuration.credential_types[:amazon]
-      check_credential_existence(type, 'ecr')
+      credential_exists = credential_exists?(type)
+      handle_existing_credential_options('ecr') if credential_exists
 
-      registry_url = ENV['AWS_REGISTRY_URL'] || Uffizzi.ui.ask('Registry Domain: ')
-      access_key = ENV['AWS_ACCESS_KEY_ID'] || Uffizzi.ui.ask('Access key ID: ')
-      secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || Uffizzi.ui.ask('Secret access key: ', echo: false)
+      registry_url, access_key_id, secret_access_key = Uffizzi::ConnectHelper.get_ecr_data(options)
 
       params = {
-        username: access_key,
+        username: access_key_id,
         password: secret_access_key,
         registry_url: prepare_registry_url(registry_url),
         type: type,
       }
-
       server = ConfigFile.read_option(:server)
-      response = create_credential(server, params)
 
-      if ResponseHelper.created?(response)
-        print_success_message('ECR')
+      response = if credential_exists
+        update_credential(server, params, type)
       else
-        ResponseHelper.handle_failed_response(response)
+        create_credential(server, params)
       end
+
+      handle_result_for('ECR', response)
     end
 
     desc 'gcr', 'Connect to Google Container Registry (gcr.io)'
     method_option :skip_raise_existence_error, type: :boolean, default: false,
                                                desc: 'Skip raising an error within check the credential'
+    method_option :update_credential_if_exists, type: :boolean, default: false
     def gcr(credential_file_path = nil)
       type = Uffizzi.configuration.credential_types[:google]
-      check_credential_existence(type, 'gcr')
+      credential_exists = credential_exists?(type)
+      handle_existing_credential_options('gcr') if credential_exists
 
       credential_content = google_service_account_content(credential_file_path)
 
@@ -112,71 +155,88 @@ module Uffizzi
         password: credential_content,
         type: type,
       }
-
       server = ConfigFile.read_option(:server)
-      response = create_credential(server, params)
 
-      if ResponseHelper.created?(response)
-        print_success_message('GCR')
+      response = if credential_exists
+        update_credential(server, params, type)
       else
-        ResponseHelper.handle_failed_response(response)
+        create_credential(server, params)
       end
+
+      handle_result_for('GCR', response)
     end
 
     desc 'ghcr', 'Connect to GitHub Container Registry (ghcr.io)'
     method_option :skip_raise_existence_error, type: :boolean, default: false,
                                                desc: 'Skip raising an error within check the credential'
+    method_option :update_credential_if_exists, type: :boolean, default: false
     method_option :username, type: :string, aliases: :u
     method_option :token, type: :string, aliases: :t
     def ghcr
       type = Uffizzi.configuration.credential_types[:github_registry]
-      check_credential_existence(type, 'ghcr')
+      credential_exists = credential_exists?(type)
+      handle_existing_credential_options('ghcr') if credential_exists
 
-      username = options[:username] || ENV['GITHUB_USERNAME'] || Uffizzi.ui.ask('Github Username:')
-      password = options[:token] || ENV['GITHUB_ACCESS_TOKEN'] || Uffizzi.ui.ask('Access Token:', echo: false)
+      username, password = Uffizzi::ConnectHelper.get_ghcr_data(options)
 
       params = {
         username: username,
         password: password,
         type: type,
       }
-
       server = ConfigFile.read_option(:server)
-      response = create_credential(server, params)
 
-      if ResponseHelper.created?(response)
-        print_success_message('GHCR')
+      response = if credential_exists
+        update_credential(server, params, type)
       else
-        ResponseHelper.handle_failed_response(response)
+        create_credential(server, params)
       end
+
+      handle_result_for('GHCR', response)
     end
 
     map 'list-credentials' => 'list_credentials'
     map 'docker-hub' => 'docker_hub'
+    map 'docker-registry' => 'docker_registry'
 
     private
 
+    def handle_result_for(credential_type, response)
+      if ResponseHelper.created?(response) || ResponseHelper.ok?(response)
+        print_success_message(credential_type)
+      else
+        ResponseHelper.handle_failed_response(response)
+      end
+    end
+
     def prepare_registry_url(registry_url)
       return registry_url if registry_url.match?(/^(?:http(s)?:\/\/)/)
 
       "https://#{registry_url}"
     end
 
-    def print_success_message(connection_name)
-      Uffizzi.ui.say("Successfully connected to #{connection_name}")
+    def print_success_message(credential_type)
+      Uffizzi.ui.say("Successfully connected to #{credential_type}.")
     end
 
-    def check_credential_existence(type, connection_name)
+    def credential_exists?(type)
       server = ConfigFile.read_option(:server)
       response = check_credential(server, type)
-      return if ResponseHelper.ok?(response)
+      !ResponseHelper.ok?(response)
+    end
+
+    def handle_existing_credential_options(credential_type_slug)
+      if options.update_credential_if_exists?
+        Uffizzi.ui.say('Updating existing credential.')
+        return
+      end
 
       if options.skip_raise_existence_error?
-        Uffizzi.ui.say("Credentials of type #{connection_name} already exist for this account.")
+        Uffizzi.ui.say("Credential of type #{credential_type_slug} already exists for this account.")
         exit(true)
       else
-        message = "Credentials of type #{connection_name} already exist for this account. " \
-        "To remove them, run $ uffizzi disconnect #{connection_name}."
+        message = "Credential of type #{credential_type_slug} already exists for this account.\n" \
+        "To remove them, run uffizzi disconnect #{credential_type_slug}."
         raise Uffizzi::Error.new(message)
       end
     end
@@ -204,7 +264,7 @@ module Uffizzi
     def google_service_account_content(credential_file_path = nil)
       return ENV['GCLOUD_SERVICE_KEY'] if ENV['GCLOUD_SERVICE_KEY']
 
-      return Uffizzi.ui.say('Path to google service account key file wasn\'t specified.') if credential_file_path.nil?
+      raise Uffizzi::Error.new("Path to a google service account key file wasn't specified.") if credential_file_path.nil?
 
       begin
         credential_content = File.read(credential_file_path)

data/lib/uffizzi/cli/disconnect.rb

@@ -10,6 +10,8 @@ module Uffizzi
       connection_type = case credential_type
                         when 'docker-hub'
                           Uffizzi.configuration.credential_types[:dockerhub]
+                        when 'docker-registry'
+                          Uffizzi.configuration.credential_types[:docker_registry]
                         when 'acr'
                           Uffizzi.configuration.credential_types[:azure]
                         when 'ecr'
@@ -25,7 +27,7 @@ module Uffizzi
       response = delete_credential(ConfigFile.read_option(:server), connection_type)
 
       if ResponseHelper.no_content?(response)
-        Uffizzi.ui.say("Successfully disconnected #{connection_name(credential_type)} connection")
+        Uffizzi.ui.say("Successfully disconnected from #{connection_name(credential_type)}.")
       else
         ResponseHelper.handle_failed_response(response)
       end
@@ -36,6 +38,7 @@ module Uffizzi
     def connection_name(credential_type)
       {
         'docker-hub' => 'DockerHub',
+        'docker-registry' => 'Docker Registry',
         'acr' => 'ACR',
         'ecr' => 'ECR',
         'gcr' => 'GCR',

data/lib/uffizzi/cli/login.rb

@@ -34,17 +34,17 @@ module Uffizzi
 
     def set_server
       config_server = ConfigFile.exists? ? read_option_from_config(:server) : nil
-      server_address = @options[:server] || config_server || Uffizzi.ui.ask('Server: ')
+      server_address = (@options[:server] || config_server || Uffizzi.ui.ask('Server:')).sub(/\/+$/, '')
       server_address.start_with?('http:', 'https:') ? server_address : "https://#{server_address}"
     end
 
     def set_username
       config_username = ConfigFile.exists? ? read_option_from_config(:username) : nil
-      @options[:username] || config_username || Uffizzi.ui.ask('Username: ')
+      @options[:username] || config_username || Uffizzi.ui.ask('Username:')
     end
 
     def set_password
-      ENV['UFFIZZI_PASSWORD'] || Uffizzi.ui.ask('Password: ', echo: false)
+      ENV['UFFIZZI_PASSWORD'] || Uffizzi.ui.ask('Password:', echo: false)
     end
 
     def read_option_from_config(option)

data/lib/uffizzi/cli/preview.rb

@@ -12,19 +12,24 @@ module Uffizzi
     desc 'service', 'Show the preview services info'
     require_relative 'preview/service'
     subcommand 'service', Uffizzi::Cli::Preview::Service
+
     desc 'list', 'List all previews'
+    method_option :filter, required: false, type: :string, aliases: '-f'
+    method_option :output, required: false, type: :string, aliases: '-o', enum: ['json']
     def list
       run('list')
     end
 
     desc 'create [COMPOSE_FILE]', 'Create a preview'
     method_option :output, required: false, type: :string, aliases: '-o', enum: ['json', 'github-action']
+    method_option :"set-labels", required: false, type: :string, aliases: '-s'
     def create(file_path = nil)
       run('create', file_path: file_path)
     end
 
     desc 'uffizzi preview update [DEPLOYMENT_ID] [COMPOSE_FILE]', 'Update a preview'
     method_option :output, required: false, type: :string, aliases: '-o', enum: ['json', 'github-action']
+    method_option :"set-labels", required: false, type: :string, aliases: '-s'
     def update(deployment_name, file_path)
       run('update', deployment_name: deployment_name, file_path: file_path)
     end
@@ -47,10 +52,7 @@ module Uffizzi
     private
 
     def run(command, file_path: nil, deployment_name: nil)
-      unless options[:output].nil?
-        Uffizzi.ui.output_format = options[:output]
-        Uffizzi.ui.disable_stdout
-      end
+      Uffizzi.ui.output_format = options[:output]
       raise Uffizzi::Error.new('You are not logged in.') unless Uffizzi::AuthHelper.signed_in?
       raise Uffizzi::Error.new('This command needs project to be set in config file') unless CommandService.project_set?(options)
 
@@ -58,11 +60,11 @@ module Uffizzi
 
       case command
       when 'list'
-        handle_list_command(project_slug)
+        handle_list_command(project_slug, options[:filter])
       when 'create'
-        handle_create_command(file_path, project_slug)
+        handle_create_command(file_path, project_slug, options[:"set-labels"])
       when 'update'
-        handle_update_command(deployment_name, file_path, project_slug)
+        handle_update_command(deployment_name, file_path, project_slug, options[:"set-labels"])
       when 'delete'
         handle_delete_command(deployment_name, project_slug)
       when 'describe'
@@ -72,8 +74,9 @@ module Uffizzi
       end
     end
 
-    def handle_list_command(project_slug)
-      response = fetch_deployments(ConfigFile.read_option(:server), project_slug)
+    def handle_list_command(project_slug, filter)
+      parsed_filter = filter.nil? ? {} : build_filter_params(filter)
+      response = fetch_deployments(ConfigFile.read_option(:server), project_slug, parsed_filter)
 
       if ResponseHelper.ok?(response)
         handle_succeed_list_response(response)
@@ -82,8 +85,10 @@ module Uffizzi
       end
     end
 
-    def handle_create_command(file_path, project_slug)
-      params = file_path.nil? ? {} : prepare_params(file_path)
+    def handle_create_command(file_path, project_slug, labels)
+      Uffizzi.ui.disable_stdout unless options[:output].nil?
+      params = prepare_params(file_path, labels)
+
       response = create_deployment(ConfigFile.read_option(:server), project_slug, params)
 
       if !ResponseHelper.created?(response)
@@ -101,12 +106,13 @@ module Uffizzi
       handle_preview_interruption(deployment_id, ConfigFile.read_option(:server), project_slug)
     end
 
-    def handle_update_command(deployment_name, file_path, project_slug)
+    def handle_update_command(deployment_name, file_path, project_slug, labels)
+      Uffizzi.ui.disable_stdout unless options[:output].nil?
       deployment_id = PreviewService.read_deployment_id(deployment_name)
 
       raise Uffizzi::Error.new("Preview should be specified in 'deployment-PREVIEW_ID' format") if deployment_id.nil?
 
-      params = prepare_params(file_path)
+      params = prepare_params(file_path, labels)
       response = update_deployment(ConfigFile.read_option(:server), project_slug, deployment_id, params)
 
       if !ResponseHelper.ok?(response)
@@ -175,7 +181,11 @@ module Uffizzi
       raise Uffizzi::Error.new('The project has no active deployments') if deployments.empty?
 
       deployments.each do |deployment|
-        Uffizzi.ui.say("deployment-#{deployment[:id]}")
+        if Uffizzi.ui.output_format.nil?
+          Uffizzi.ui.say("deployment-#{deployment[:id]}")
+        else
+          Uffizzi.ui.pretty_say(deployment)
+        end
       end
     end
 
@@ -205,26 +215,10 @@ module Uffizzi
       end
     end
 
-    def prepare_params(file_path)
-      begin
-        compose_file_data = EnvVariablesService.substitute_env_variables(File.read(file_path))
-      rescue Errno::ENOENT => e
-        raise Uffizzi::Error.new(e.message)
-      end
-
-      compose_file_dir = File.dirname(file_path)
-      dependencies = ComposeFileService.parse(compose_file_data, compose_file_dir)
-      absolute_path = File.absolute_path(file_path)
-      compose_file_params = {
-        path: absolute_path,
-        content: Base64.encode64(compose_file_data),
-        source: absolute_path,
-      }
-
-      {
-        compose_file: compose_file_params,
-        dependencies: dependencies,
-      }
+    def prepare_params(file_path, labels)
+      compose_file_params = file_path.nil? ? {} : build_compose_file_params(file_path)
+      metadata_params = labels.nil? ? {} : build_metadata_params(labels)
+      compose_file_params.merge(metadata_params)
     end
 
     def handle_preview_interruption(deployment_id, server, project_slug)
@@ -251,10 +245,77 @@ module Uffizzi
     end
 
     def build_deployment_data(deployment)
+      url_server = ConfigFile.read_option(:server)
+
       {
         id: "deployment-#{deployment[:id]}",
         url: "https://#{deployment[:preview_url]}",
+        containers_uri: "#{url_server}/projects/#{deployment[:project_id]}/deployments/#{deployment[:id]}/containers",
       }
     end
+
+    def build_compose_file_params(file_path)
+      begin
+        compose_file_data = EnvVariablesService.substitute_env_variables(File.read(file_path))
+      rescue Errno::ENOENT => e
+        raise Uffizzi::Error.new(e.message)
+      end
+
+      compose_file_dir = File.dirname(file_path)
+      dependencies = ComposeFileService.parse(compose_file_data, compose_file_dir)
+      absolute_path = File.absolute_path(file_path)
+      compose_file_params = {
+        path: absolute_path,
+        content: Base64.encode64(compose_file_data),
+        source: absolute_path,
+      }
+
+      {
+        compose_file: compose_file_params,
+        dependencies: dependencies,
+      }
+    end
+
+    def build_metadata_params(labels)
+      {
+        metadata: {
+          'labels' => parse_params(labels, 'Labels'),
+        },
+      }
+    end
+
+    def build_filter_params(filter_params)
+      {
+        'labels' => parse_params(filter_params, 'Filtering parameters'),
+      }
+    end
+
+    def parse_params(params, params_type)
+      validate_params(params, params_type)
+      params.split(' ').reduce({}) do |acc, param|
+        stringified_keys, value = param.split('=', 2)
+        keys = stringified_keys.split('.', -1)
+        inner_pair = { keys.pop => value }
+        prepared_param = keys.reverse.reduce(inner_pair) { |res, key| { key => res } }
+        merge_params(acc, prepared_param)
+      end
+    end
+
+    def validate_params(params, params_type)
+      params.split(' ').each do |param|
+        stringified_keys, value = param.split('=', 2)
+        raise Uffizzi::Error.new("#{params_type} were set in incorrect format.") if value.nil? || stringified_keys.nil? || value.empty?
+
+        keys = stringified_keys.split('.', -1)
+        raise Uffizzi::Error.new("#{params_type} were set in incorrect format.") if keys.empty? || keys.any?(&:empty?)
+      end
+    end
+
+    def merge_params(result, param)
+      key = param.keys.first
+      return result.merge(param) unless result.has_key?(key)
+
+      { key => result[key].merge(merge_params(result[key], param[key])) }
+    end
   end
 end

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

@@ -70,6 +70,13 @@ module ApiClient
     build_response(response)
   end
 
+  def update_credential(server, params, type)
+    uri = credential_uri(server, type)
+    response = http_client.make_put_request(uri, params)
+
+    build_response(response)
+  end
+
   def fetch_deployment_services(server, project_slug, deployment_id)
     uri = preview_services_uri(server, project_slug, deployment_id)
     response = http_client.make_get_request(uri)
@@ -78,7 +85,7 @@ module ApiClient
   end
 
   def delete_credential(server, credential_type)
-    uri = delete_credential_uri(server, credential_type)
+    uri = credential_uri(server, credential_type)
     response = http_client.make_delete_request(uri)
 
     build_response(response)
@@ -140,8 +147,8 @@ module ApiClient
     build_response(response)
   end
 
-  def fetch_deployments(server, project_slug)
-    uri = deployments_uri(server, project_slug)
+  def fetch_deployments(server, project_slug, filter)
+    uri = deployments_uri(server, project_slug, filter)
     response = http_client.make_get_request(uri)
 
     build_response(response)

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

@@ -32,8 +32,10 @@ module ApiRoutes
     "#{compose_files_uri(server, project_slug)}/validate"
   end
 
-  def deployments_uri(server, project_slug)
-    "#{server}/api/cli/v1/projects/#{project_slug}/deployments"
+  def deployments_uri(server, project_slug, filter = nil)
+    return "#{server}/api/cli/v1/projects/#{project_slug}/deployments" if filter.nil?
+
+    "#{server}/api/cli/v1/projects/#{project_slug}/deployments?q=#{filter.to_json}"
   end
 
   def deployment_uri(server, project_slug, deployment_id)
@@ -64,7 +66,7 @@ module ApiRoutes
     "#{server}/api/cli/v1/projects/#{project_slug}/deployments/#{deployment_id}/containers"
   end
 
-  def delete_credential_uri(server, credential_type)
+  def credential_uri(server, credential_type)
     "#{server}/api/cli/v1/account/credentials/#{credential_type}"
   end
 

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

@@ -50,13 +50,13 @@ module Uffizzi
       headers = { 'Content-Type' => 'application/json' }
       request = case method
                 when :get
-                  Net::HTTP::Get.new(uri.path, headers)
+                  Net::HTTP::Get.new(uri.request_uri, headers)
                 when :post
-                  Net::HTTP::Post.new(uri.path, headers)
+                  Net::HTTP::Post.new(uri.request_uri, headers)
                 when :delete
-                  Net::HTTP::Delete.new(uri.path, headers)
+                  Net::HTTP::Delete.new(uri.request_uri, headers)
                 when :put
-                  Net::HTTP::Put.new(uri.path, headers)
+                  Net::HTTP::Put.new(uri.request_uri, headers)
       end
       if request.instance_of?(Net::HTTP::Post) || request.instance_of?(Net::HTTP::Put)
         request.body = params.to_json