uffizzi-cli 0.12.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c27a1f65cd69d407dc2f086733a20baaf6e129b7433322ac61682f6b8a1fa54e
-  data.tar.gz: 61c6860dbc035009ee6197f353c05d0af95eda6d6f77b67d25f672ba954e114f
+  metadata.gz: 88f0a01cdfea0ed8e8d4ad54d776f517f84d74c424f2db15569fb788e7fe3868
+  data.tar.gz: e690fe7b2552ae4215687aac32420cb4b39e3cd2dd4b1d4fcf723538e49b213c
 SHA512:
-  metadata.gz: 709d000e6701f32d3dcaa3745c68d2eb63695dba2dd8ef939201569605bb121fdd3422d730d3bdc2687a33cc81810b97a3a4f4841187aac68547824293523173
-  data.tar.gz: 1b0ae241adab3fb770f25cca8709ae779b5c8de16056fa71e6242d470123550b6cacc920f1e2b9474951323b72d1d18160a840ed64c4814469eb89e138d0c3d5
+  metadata.gz: 77198a935bf13d106bd191e017094ecc431cc09e307608a4f23ccd3bbd5591b7d12def5f4c3eff77f0389acfe6384f2a80ad63389d7ce8b7f51b9768d8bd0d09
+  data.tar.gz: c945bf73973d7a55fae9e3cf9502a1cfacafc65671b292913333c61f644fe0ca9c5402e7ae7ce54ae88bd08de117e016614d72e9474634ff725581828ea288bb

data/lib/uffizzi/cli/connect.rb

@@ -10,7 +10,8 @@ module Uffizzi
     desc 'list-credentials', 'List existing credentials for an account'
     def list_credentials
       server = ConfigFile.read_option(:server)
-      response = fetch_credentials(server)
+      account_id = ConfigFile.read_option(:account_id)
+      response = fetch_credentials(server, account_id)
       if ResponseHelper.ok?(response)
         handle_list_credentials_success(response)
       else
@@ -37,11 +38,12 @@ module Uffizzi
         type: type,
       }
       server = ConfigFile.read_option(:server)
+      account_id = ConfigFile.read_option(:account_id)
 
       response = if credential_exists
-        update_credential(server, params, type)
+        update_credential(server, account_id, params, type)
       else
-        create_credential(server, params)
+        create_credential(server, account_id, params)
       end
 
       handle_result_for('Docker Hub', response)
@@ -68,11 +70,12 @@ module Uffizzi
         type: type,
       }
       server = ConfigFile.read_option(:server)
+      account_id = ConfigFile.read_option(:account_id)
 
       response = if credential_exists
-        update_credential(server, params, type)
+        update_credential(server, account_id, params, type)
       else
-        create_credential(server, params)
+        create_credential(server, account_id, params)
       end
 
       handle_result_for('Docker Registry', response)
@@ -99,11 +102,12 @@ module Uffizzi
         type: type,
       }
       server = ConfigFile.read_option(:server)
+      account_id = ConfigFile.read_option(:account_id)
 
       response = if credential_exists
-        update_credential(server, params, type)
+        update_credential(server, account_id, params, type)
       else
-        create_credential(server, params)
+        create_credential(server, account_id, params)
       end
 
       handle_result_for('ACR', response)
@@ -130,11 +134,12 @@ module Uffizzi
         type: type,
       }
       server = ConfigFile.read_option(:server)
+      account_id = ConfigFile.read_option(:account_id)
 
       response = if credential_exists
-        update_credential(server, params, type)
+        update_credential(server, account_id, params, type)
       else
-        create_credential(server, params)
+        create_credential(server, account_id, params)
       end
 
       handle_result_for('ECR', response)
@@ -156,11 +161,12 @@ module Uffizzi
         type: type,
       }
       server = ConfigFile.read_option(:server)
+      account_id = ConfigFile.read_option(:account_id)
 
       response = if credential_exists
-        update_credential(server, params, type)
+        update_credential(server, account_id, params, type)
       else
-        create_credential(server, params)
+        create_credential(server, account_id, params)
       end
 
       handle_result_for('GCR', response)
@@ -185,11 +191,12 @@ module Uffizzi
         type: type,
       }
       server = ConfigFile.read_option(:server)
+      account_id = ConfigFile.read_option(:account_id)
 
       response = if credential_exists
-        update_credential(server, params, type)
+        update_credential(server, account_id, params, type)
       else
-        create_credential(server, params)
+        create_credential(server, account_id, params)
       end
 
       handle_result_for('GHCR', response)
@@ -221,8 +228,15 @@ module Uffizzi
 
     def credential_exists?(type)
       server = ConfigFile.read_option(:server)
-      response = check_credential(server, type)
-      !ResponseHelper.ok?(response)
+      account_id = ConfigFile.read_option(:account_id)
+      response = check_credential(server, account_id, type)
+      return false if ResponseHelper.ok?(response)
+      return true if ResponseHelper.unprocessable_entity?(response)
+
+      if ResponseHelper.forbidden?(response)
+        Uffizzi.ui.say('Unauthorized. Skipping credentials action.')
+        exit(true)
+      end
     end
 
     def handle_existing_credential_options(credential_type_slug)

data/lib/uffizzi/cli/disconnect.rb

@@ -24,7 +24,7 @@ module Uffizzi
                           raise Uffizzi::Error.new('Unsupported credential type.')
       end
 
-      response = delete_credential(ConfigFile.read_option(:server), connection_type)
+      response = delete_credential(ConfigFile.read_option(:server), ConfigFile.read_option(:account_id), connection_type)
 
       if ResponseHelper.no_content?(response)
         Uffizzi.ui.say("Successfully disconnected from #{connection_name(credential_type)}.")

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)
@@ -61,6 +61,7 @@ module Uffizzi
     end
 
     def handle_succeed_response(response, server, username)
+      # TODO Choose a personal account
       account = response[:body][:user][:accounts].first
       return Uffizzi.ui.say('No account related to this email') unless account_valid?(account)
 
@@ -95,9 +96,11 @@ module Uffizzi
       end
       all_choices = choices + [{ name: 'Create a new project', value: nil }]
       answer = Uffizzi.prompt.select(question, all_choices)
-      return ConfigFile.write_option(:project, answer) if answer
+      return create_new_project(server) unless answer
 
-      create_new_project(server)
+      account_id = projects.detect { |project| project[:slug] == answer }[:account_id]
+      ConfigFile.write_option(:project, answer)
+      ConfigFile.write_option(:account_id, account_id)
     end
 
     def create_new_project(server)
@@ -116,7 +119,8 @@ module Uffizzi
         },
       }
 
-      response = create_project(server, params)
+      account_id = ConfigFile.read_option(:account_id)
+      response = create_project(server, account_id, params)
 
       if ResponseHelper.created?(response)
         handle_create_project_succeess(response)
@@ -139,6 +143,7 @@ module Uffizzi
       project = response[:body][:project]
 
       ConfigFile.write_option(:project, project[:slug])
+      ConfigFile.write_option(:account_id, project[:account_id])
 
       Uffizzi.ui.say("Project #{project[:name]} was successfully created")
     end

data/lib/uffizzi/cli/login_by_identity_token.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'uffizzi'
+require 'uffizzi/response_helper'
+require 'uffizzi/clients/api/api_client'
+
+module Uffizzi
+  class Cli::LoginByIdentityToken
+    include ApiClient
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      token = @options[:token]
+      server = @options[:server]
+      params = prepare_request_params(token)
+      response = create_ci_session(server, params)
+
+      if ResponseHelper.created?(response)
+        handle_succeed_response(response, server)
+      else
+        ResponseHelper.handle_failed_response(response)
+      end
+    end
+
+    private
+
+    def prepare_request_params(token)
+      {
+        user: {
+          token: token,
+        },
+      }
+    end
+
+    def handle_succeed_response(response, server)
+      ConfigFile.write_option(:server, server)
+      ConfigFile.write_option(:cookie, response[:headers])
+      ConfigFile.write_option(:account_id, response[:body][:account_id])
+      ConfigFile.write_option(:project, response[:body][:project_slug])
+
+      Uffizzi.ui.say('Successful Login by Identity Token')
+    end
+  end
+end

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', 'pretty-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,11 @@ 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 +107,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)
@@ -139,7 +146,8 @@ module Uffizzi
     end
 
     def handle_succeed_events_response(response)
-      Uffizzi.ui.pretty_say(response[:body][:events])
+      Uffizzi.ui.output_format = Uffizzi::UI::Shell::PRETTY_JSON
+      Uffizzi.ui.say(response[:body][:events])
     end
 
     def handle_delete_command(deployment_name, project_slug)
@@ -174,9 +182,12 @@ module Uffizzi
       deployments = response[:body][:deployments] || []
       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?
+        deployments = deployments.reduce('') do |acc, deployment|
+          "#{acc}deployment-#{deployment[:id]}\n"
+        end.strip
       end
+      Uffizzi.ui.say(deployments)
     end
 
     def handle_succeed_delete_response(deployment_id)
@@ -192,9 +203,8 @@ module Uffizzi
 
         container
       end
-      deployment.each_key do |key|
-        Uffizzi.ui.say("#{key}: #{deployment[key]}")
-      end
+      deployment_data = deployment.reduce('') { |acc, (key, value)| "#{acc}#{key}: #{value}\n" }.strip
+      Uffizzi.ui.say(deployment_data)
     end
 
     def hide_secrets(secret_variables)
@@ -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)
@@ -246,15 +240,83 @@ module Uffizzi
         Uffizzi.ui.say(preview_url) if success
       else
         deployment_data = build_deployment_data(deployment)
-        Uffizzi.ui.output(deployment_data)
+        Uffizzi.ui.enable_stdout
+        Uffizzi.ui.say(deployment_data)
       end
     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/cli/project.rb

@@ -102,12 +102,13 @@ module Uffizzi
       raise Uffizzi::Error.new('Slug must not content spaces or special characters') unless slug.match?(/^[a-zA-Z0-9\-_]+\Z/i)
 
       server = ConfigFile.read_option(:server)
+      account_id = ConfigFile.read_option(:account_id)
       params = {
         name: name,
         description: options[:description],
         slug: slug,
       }
-      response = create_project(server, params)
+      response = create_project(server, account_id, params)
 
       if ResponseHelper.created?(response)
         handle_create_success_response(response)
@@ -165,6 +166,7 @@ module Uffizzi
 
     def set_default_project(project)
       ConfigFile.write_option(:project, project[:slug])
+      ConfigFile.write_option(:account_id, project[:account_id])
     end
   end
 end

data/lib/uffizzi/cli.rb

@@ -24,6 +24,14 @@ module Uffizzi
       Login.new(options).run
     end
 
+    desc 'login_by_identity_token [OPTIONS]', 'Login or register to Uffizzi to view and manage your previews'
+    method_option :server, required: true, aliases: '-s'
+    method_option :token, required: true, aliases: '-t'
+    def login_by_identity_token
+      require_relative 'cli/login_by_identity_token'
+      LoginByIdentityToken.new(options).run
+    end
+
     desc 'logout', 'Log out of a Uffizzi user account'
     def logout
       require_relative 'cli/logout'

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

@@ -13,6 +13,13 @@ module ApiClient
     build_response(response)
   end
 
+  def create_ci_session(server, params = {})
+    uri = ci_session_uri(server)
+    response = http_client.make_post_request(uri, params)
+
+    build_response(response)
+  end
+
   def destroy_session(server)
     uri = session_uri(server)
     response = http_client.make_delete_request(uri)
@@ -27,16 +34,16 @@ module ApiClient
     build_response(response)
   end
 
-  def fetch_credentials(server)
-    uri = credentials_uri(server)
+  def fetch_credentials(server, account_id)
+    uri = credentials_uri(server, account_id)
 
     response = http_client.make_get_request(uri)
 
     build_response(response)
   end
 
-  def check_credential(server, type)
-    uri = check_credential_uri(server, type)
+  def check_credential(server, account_id, type)
+    uri = check_credential_uri(server, account_id, type)
     response = http_client.make_get_request(uri)
 
     build_response(response)
@@ -49,8 +56,8 @@ module ApiClient
     build_response(response)
   end
 
-  def create_project(server, params)
-    uri = projects_uri(server)
+  def create_project(server, account_id, params)
+    uri = create_projects_uri(server, account_id)
     response = http_client.make_post_request(uri, params)
 
     build_response(response)
@@ -63,15 +70,15 @@ module ApiClient
     build_response(response)
   end
 
-  def create_credential(server, params)
-    uri = credentials_uri(server)
+  def create_credential(server, account_id, params)
+    uri = credentials_uri(server, account_id)
     response = http_client.make_post_request(uri, params)
 
     build_response(response)
   end
 
-  def update_credential(server, params, type)
-    uri = credential_uri(server, type)
+  def update_credential(server, account_id, params, type)
+    uri = credential_uri(server, account_id, type)
     response = http_client.make_put_request(uri, params)
 
     build_response(response)
@@ -84,8 +91,8 @@ module ApiClient
     build_response(response)
   end
 
-  def delete_credential(server, credential_type)
-    uri = credential_uri(server, credential_type)
+  def delete_credential(server, account_id, credential_type)
+    uri = credential_uri(server, account_id, credential_type)
     response = http_client.make_delete_request(uri)
 
     build_response(response)
@@ -147,8 +154,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

@@ -15,6 +15,10 @@ module ApiRoutes
     "#{server}/api/cli/v1/projects"
   end
 
+  def create_projects_uri(server, account_id)
+    "#{server}/api/cli/v1/accounts/#{account_id}/projects"
+  end
+
   def secret_uri(server, project_slug, id)
     path_id = CGI.escape(id)
     "#{server}/api/cli/v1/projects/#{project_slug}/secrets/#{path_id}"
@@ -28,12 +32,18 @@ module ApiRoutes
     "#{server}/api/cli/v1/session"
   end
 
+  def ci_session_uri(server)
+    "#{server}/api/cli/v1/ci/session"
+  end
+
   def validate_compose_file_uri(server, project_slug)
     "#{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)
@@ -52,20 +62,20 @@ module ApiRoutes
     "#{server}/api/cli/v1/projects/#{project_slug}/deployments/#{deployment_id}/events"
   end
 
-  def check_credential_uri(server, type)
-    "#{server}/api/cli/v1/account/credentials/#{type}/check_credential"
+  def check_credential_uri(server, account_id, type)
+    "#{server}/api/cli/v1/accounts/#{account_id}/credentials/#{type}/check_credential"
   end
 
-  def credentials_uri(server)
-    "#{server}/api/cli/v1/account/credentials"
+  def credentials_uri(server, account_id)
+    "#{server}/api/cli/v1/accounts/#{account_id}/credentials"
   end
 
   def preview_services_uri(server, project_slug, deployment_id)
     "#{server}/api/cli/v1/projects/#{project_slug}/deployments/#{deployment_id}/containers"
   end
 
-  def credential_uri(server, credential_type)
-    "#{server}/api/cli/v1/account/credentials/#{credential_type}"
+  def credential_uri(server, account_id, credential_type)
+    "#{server}/api/cli/v1/accounts/#{account_id}/credentials/#{credential_type}"
   end
 
   def preview_service_logs_uri(server, project_slug, deployment_id, container_name)

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

data/lib/uffizzi/services/project_service.rb

@@ -24,6 +24,7 @@ class ProjectService
       Uffizzi.ui.say("Project name: #{project[:name]}")
       Uffizzi.ui.say("Project slug: #{project[:slug]}")
       Uffizzi.ui.say("Description: #{project[:description]}".strip)
+      Uffizzi.ui.say("Account name: #{project[:account][:name]}".strip)
       Uffizzi.ui.say("Created: #{project[:created_at]}")
       default_compose = project[:default_compose].nil? ? nil : project[:default_compose][:source]
       Uffizzi.ui.say("Default compose: #{default_compose}".strip)

data/lib/uffizzi/shell.rb

@@ -7,12 +7,26 @@ module Uffizzi
     class Shell
       attr_accessor :output_format
 
+      PRETTY_JSON = 'pretty-json'
+      REGULAR_JSON = 'json'
+      GITHUB_ACTION = 'github-action'
+
       def initialize
         @shell = Thor::Shell::Basic.new
       end
 
       def say(message)
-        @shell.say(message)
+        formatted_message = case output_format
+                            when PRETTY_JSON
+                              format_to_pretty_json(message)
+                            when REGULAR_JSON
+                              format_to_json(message)
+                            when GITHUB_ACTION
+                              format_to_github_action(message)
+                            else
+                              message
+        end
+        @shell.say(formatted_message)
       end
 
       def print_in_columns(messages)
@@ -34,33 +48,28 @@ module Uffizzi
         @shell.send(:stdout).string.strip
       end
 
-      def pretty_say(collection, index = true)
-        ap(collection, { index: index })
-      end
-
       def disable_stdout
         $stdout = StringIO.new
       end
 
-      def output(data)
+      def enable_stdout
         $stdout = IO.new(1, 'w')
-        json_format? ? output_in_json(data) : output_in_github_format(data)
       end
 
       private
 
-      def json_format?
-        output_format == 'json'
+      def format_to_json(data)
+        data.to_json
       end
 
-      def output_in_json(data)
-        say(data.to_json)
+      def format_to_pretty_json(data)
+        JSON.pretty_generate(data)
       end
 
-      def output_in_github_format(data)
-        data.each_key do |key|
-          say("::set-output name=#{key}::#{data[key]}")
-        end
+      def format_to_github_action(data)
+        return '' unless data.is_a?(Hash)
+
+        data.reduce('') { |acc, (key, value)| "#{acc}::set-output name=#{key}::#{value}\n" }
       end
     end
   end

data/lib/uffizzi/version.rb

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

data/man/uffizzi-login-by-identity-token

@@ -0,0 +1,29 @@
+.\" generated with Ronn-NG/v0.9.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.9.1
+.TH "UFFIZZI\-LOGIN\-BY\-IDENTITY\-TOKEN" "" "August 2022" ""
+.SH "NAME"
+\fBuffizzi\-login\-by\-identity\-token\fR \- login to Uffizzi using a OIDC token provided by a CI/CD pipeline
+.SH "SYNOPSIS"
+.nf
+uffizzi uffizzi\-login\-by\-identity\-token [UFFIZZI_WIDE_FLAG \|\.\|\.\|\.]
+.fi
+.SH "DESCRIPTION"
+.nf
+The uffizzi login command lets you authenticate with Uffizzi from a CI/CD pipeline\.
+If a user/account do not exist, Uffizzi will create them based on token payload\.
+
+For more information on authentication and credential types, see:
+https://github\.com/UffizziCloud/uffizzi_cli
+.fi
+.SH "UFFIZZI WIDE FLAGS"
+.nf
+These flags are available to all commands: \-\-project\. Run $ uffizzi
+help for details\.
+.fi
+.SH "EXAMPLES"
+.nf
+To login from the CI/CD pipeline, run:
+
+    $ uffizzi uffizzi\-login\-by\-identity\-token \-\-server=uffizzi\.example\.com \-\-token=[$CI_JOB_TOKEN]
+.fi
+

data/man/uffizzi-login-by-identity-token.html

@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv='content-type' content='text/html;charset=utf8'>
+  <meta name='generator' content='Ronn-NG/v0.9.1 (http://github.com/apjanke/ronn-ng/tree/0.9.1)'>
+  <title>login to Uffizzi using a OIDC token provided by a CI/CD pipeline</title>
+  <style type='text/css' media='all'>
+  /* style: man */
+  body#manpage {margin:0}
+  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
+  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
+  .mp h2 {margin:10px 0 0 0}
+  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
+  .mp h3 {margin:0 0 0 4ex}
+  .mp dt {margin:0;clear:left}
+  .mp dt.flush {float:left;width:8ex}
+  .mp dd {margin:0 0 0 9ex}
+  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
+  .mp pre {margin-bottom:20px}
+  .mp pre+h2,.mp pre+h3 {margin-top:22px}
+  .mp h2+pre,.mp h3+pre {margin-top:5px}
+  .mp img {display:block;margin:auto}
+  .mp h1.man-title {display:none}
+  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
+  .mp h2 {font-size:16px;line-height:1.25}
+  .mp h1 {font-size:20px;line-height:2}
+  .mp {text-align:justify;background:#fff}
+  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
+  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
+  .mp u {text-decoration:underline}
+  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
+  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
+  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
+  .mp b.man-ref {font-weight:normal;color:#434241}
+  .mp pre {padding:0 4ex}
+  .mp pre code {font-weight:normal;color:#434241}
+  .mp h2+pre,h3+pre {padding-left:0}
+  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
+  ol.man-decor {width:100%}
+  ol.man-decor li.tl {text-align:left}
+  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
+  ol.man-decor li.tr {text-align:right;float:right}
+  </style>
+</head>
+<!--
+  The following styles are deprecated and will be removed at some point:
+  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
+
+  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
+  .man-navigation should be used instead.
+-->
+<body id='manpage'>
+  <div class='mp' id='man'>
+
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#UFFIZZI-WIDE-FLAGS">UFFIZZI WIDE FLAGS</a>
+    <a href="#EXAMPLES">EXAMPLES</a>
+  </div>
+
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>uffizzi-login-by-identity-token</li>
+    <li class='tc'></li>
+    <li class='tr'>uffizzi-login-by-identity-token</li>
+  </ol>
+
+  
+
+<h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>uffizzi-login-by-identity-token</code> - <span class="man-whatis">login to Uffizzi using a OIDC token provided by a CI/CD pipeline</span>
+</p>
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
+<pre><code>uffizzi uffizzi-login-by-identity-token [UFFIZZI_WIDE_FLAG ...]
+</code></pre>
+
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+<pre><code>The uffizzi login command lets you authenticate with Uffizzi from a CI/CD pipeline.
+If a user/account do not exist, Uffizzi will create them based on token payload.
+
+For more information on authentication and credential types, see:
+https://github.com/UffizziCloud/uffizzi_cli
+</code></pre>
+
+<h2 id="UFFIZZI-WIDE-FLAGS">UFFIZZI WIDE FLAGS</h2>
+<pre><code>These flags are available to all commands: --project. Run $ uffizzi 
+help for details.
+</code></pre>
+
+<h2 id="EXAMPLES">EXAMPLES</h2>
+<pre><code>To login from the CI/CD pipeline, run:
+
+    $ uffizzi uffizzi-login-by-identity-token --server=uffizzi.example.com --token=[$CI_JOB_TOKEN]
+</code></pre>
+
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'></li>
+    <li class='tc'>August 2022</li>
+    <li class='tr'>uffizzi-login-by-identity-token</li>
+  </ol>
+
+  </div>
+</body>
+</html>

data/man/uffizzi-login-by-identity-token.ronn

@@ -0,0 +1,21 @@
+  uffizzi-login-by-identity-token - login to Uffizzi using a OIDC token provided by a CI/CD pipeline
+================================================================
+
+## SYNOPSIS
+    uffizzi uffizzi-login-by-identity-token [UFFIZZI_WIDE_FLAG ...]
+
+## DESCRIPTION
+    The uffizzi login command lets you authenticate with Uffizzi from a CI/CD pipeline.
+    If a user/account do not exist, Uffizzi will create them based on token payload.
+
+    For more information on authentication and credential types, see:
+    https://github.com/UffizziCloud/uffizzi_cli
+
+## UFFIZZI WIDE FLAGS
+    These flags are available to all commands: --project. Run $ uffizzi 
+    help for details.
+
+## EXAMPLES
+    To login from the CI/CD pipeline, run:
+
+        $ uffizzi uffizzi-login-by-identity-token --server=uffizzi.example.com --token=[$CI_JOB_TOKEN]

data/man/uffizzi-preview-create

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.9.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "UFFIZZI\-PREVIEW\-CREATE" "" "May 2022" ""
+.TH "UFFIZZI\-PREVIEW\-CREATE" "" "August 2022" ""
 .SH "NAME"
 \fBuffizzi\-preview\-create\fR \- create a preview
 .SH "SYNOPSIS"
@@ -32,6 +32,12 @@ https://github\.com/UffizziCloud/uffizzi_cli
     the previews they create: when the preview is deleted, the
     alternate compose is deleted by the Uffizzi API\.
 .fi
+.SH "FLAGS"
+.nf
+\-\-set\-labels=METADATA
+    Metadata of deployment that contains any information which can
+    be usefull for filtering deployments\.
+.fi
 .SH "UFFIZZI WIDE FLAGS"
 .nf
 These flags are available to all commands: \-\-project\. Run $ uffizzi
@@ -46,5 +52,14 @@ To create a preview with the project\'s default compose file, run:
 To create a preview with an alternate compose file, run:
 
     $ uffizzi preview create docker\-compose\.uffizzi\.alt\.yml
+
+To create a preview with single label, run:
+
+    $ uffizzi preview create \-\-set\-labels github\.repo=my_repo
+
+To create a preview with multiple labels, run:
+
+    $ uffizzi preview create \e
+    \-\-set\-labels="github\.repo=my_repo github\.pull_request\.number=23"
 .fi
 

data/man/uffizzi-preview-create.ronn

@@ -27,6 +27,11 @@ uffizzi-preview-create - create a preview
         the previews they create: when the preview is deleted, the 
         alternate compose is deleted by the Uffizzi API. 
 
+## FLAGS
+    --set-labels=METADATA
+        Metadata of deployment that contains any information which can
+        be usefull for filtering deployments.
+
 ## UFFIZZI WIDE FLAGS
     These flags are available to all commands: --project. Run $ uffizzi 
     help for details.
@@ -39,3 +44,12 @@ uffizzi-preview-create - create a preview
     To create a preview with an alternate compose file, run:
 
         $ uffizzi preview create docker-compose.uffizzi.alt.yml
+
+    To create a preview with single label, run:
+
+        $ uffizzi preview create --set-labels github.repo=my_repo
+
+    To create a preview with multiple labels, run:
+
+        $ uffizzi preview create \
+        --set-labels="github.repo=my_repo github.pull_request.number=23"

data/man/uffizzi-preview-list

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.9.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "UFFIZZI\-PREVIEW\-LIST" "" "May 2022" ""
+.TH "UFFIZZI\-PREVIEW\-LIST" "" "September 2022" ""
 .SH "NAME"
 \fBuffizzi\-preview\-list\fR \- list previews in a project
 .SH "SYNOPSIS"
@@ -15,6 +15,15 @@ deploying and failed previews\.
 For more information on Uffizzi previews, see:
 https://github\.com/UffizziCloud/uffizzi_cli
 .fi
+.SH "FLAGS"
+.nf
+\-\-filter=METADATA
+    Metadata to filtering list of deployments\.
+
+\-\-output=pretty\-json
+    Use this option for a more detailed description of listed
+    deployments\.
+.fi
 .SH "UFFIZZI WIDE FLAGS"
 .nf
 These flags are available to all commands: \-\-project\. Run $ uffizzi
@@ -29,5 +38,20 @@ To list all previews in the default project, run:
 To list all previews in a project with name my_project, run:
 
     $ uffizzi preview list \-\-project="my_project"
+
+To list all previews in json format, run:
+
+    $ uffizzi preview list \-\-output="pretty\-json"
+
+To list all previews filtered by metadata using single
+label, run:
+
+    $ uffizzi preview list \-\-filter github\.repo=my_repo
+
+To list all previews filtered by metadata using multiple
+labels, run:
+
+    $ uffizzi preview list \e
+    \-\-filter="github\.repo=my_repo github\.pull_request\.number=23"
 .fi
 

data/man/uffizzi-preview-list.ronn

@@ -11,6 +11,14 @@ uffizzi-preview-list - list previews in a project
     For more information on Uffizzi previews, see:
     https://github.com/UffizziCloud/uffizzi_cli
 
+## FLAGS
+    --filter=METADATA
+        Metadata to filtering list of deployments.
+
+    --output=pretty-json
+        Use this option for a more detailed description of listed
+        deployments.
+
 ## UFFIZZI WIDE FLAGS
     These flags are available to all commands: --project. Run $ uffizzi 
     help for details.
@@ -23,3 +31,18 @@ uffizzi-preview-list - list previews in a project
     To list all previews in a project with name my_project, run:
 
         $ uffizzi preview list --project="my_project"
+
+    To list all previews in json format, run:
+
+        $ uffizzi preview list --output="pretty-json"
+
+    To list all previews filtered by metadata using single
+    label, run:
+
+        $ uffizzi preview list --filter github.repo=my_repo
+
+    To list all previews filtered by metadata using multiple
+    labels, run:
+
+        $ uffizzi preview list \
+        --filter="github.repo=my_repo github.pull_request.number=23"

data/man/uffizzi-preview-update

@@ -1,8 +1,8 @@
 .\" generated with Ronn-NG/v0.9.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "UPDATE" "" "May 2022" ""
+.TH "UPDATE" "" "August 2022" ""
 .SH "NAME"
-\fBuffizzi preview update\fR \- update a preview
+\fBupdate\fR \- update a preview
 .SH "SYNOPSIS"
 .nf
 uffizzi preview update [PREVIEW_ID] [COMPOSE_FILE] [UFFIZZI_WIDE_FLAG \|\.\|\.\|\.]
@@ -27,6 +27,12 @@ https://github\.com/UffizziCloud/uffizzi_cli
 [COMPOSE_FILE]
     The new compose file you want to preview\.
 .fi
+.SH "FLAGS"
+.nf
+\-\-set\-labels=METADATA
+    Metadata of deployment that contains any information which can
+    be usefull for filtering deployments\.
+.fi
 .SH "UFFIZZI WIDE FLAGS"
 .nf
 These flags are available to all commands: \-\-project\. Run $ uffizzi
@@ -38,5 +44,17 @@ The following command updates a preview with ID deployment\-67 using
 compose file docker\-compose\.alt\.yml:
 
     $ uffizzi preview update deployment\-67 docker\-compose\.alt\.yml
+
+To update a preview with single label, run:
+
+    $ uffizzi preview update \e
+    deployment\-67 docker\-compose\.alt\.yml \e
+    \-\-set\-labels github\.repo=my_repo
+
+To update a preview with multiple labels, run:
+
+    $ uffizzi preview update \e
+    deployment\-67 docker\-compose\.alt\.yml \e
+    \-\-set\-labels="github\.repo=my_repo github\.pull_request\.number=23"
 .fi
 

data/man/uffizzi-preview-update.ronn

@@ -22,6 +22,11 @@ uffizzi preview update - update a preview
     [COMPOSE_FILE]
         The new compose file you want to preview.
 
+## FLAGS
+    --set-labels=METADATA
+        Metadata of deployment that contains any information which can
+        be usefull for filtering deployments.
+
 ## UFFIZZI WIDE FLAGS
     These flags are available to all commands: --project. Run $ uffizzi 
     help for details.
@@ -31,3 +36,15 @@ uffizzi preview update - update a preview
     compose file docker-compose.alt.yml:
 
         $ uffizzi preview update deployment-67 docker-compose.alt.yml
+
+    To update a preview with single label, run:
+
+        $ uffizzi preview update \
+        deployment-67 docker-compose.alt.yml \
+        --set-labels github.repo=my_repo
+
+    To update a preview with multiple labels, run:
+
+        $ uffizzi preview update \
+        deployment-67 docker-compose.alt.yml \
+        --set-labels="github.repo=my_repo github.pull_request.number=23"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -325,6 +325,7 @@ files:
 - lib/uffizzi/cli/connect.rb
 - lib/uffizzi/cli/disconnect.rb
 - lib/uffizzi/cli/login.rb
+- lib/uffizzi/cli/login_by_identity_token.rb
 - lib/uffizzi/cli/logout.rb
 - lib/uffizzi/cli/preview.rb
 - lib/uffizzi/cli/preview/service.rb
@@ -368,6 +369,9 @@ files:
 - man/uffizzi-disconnect
 - man/uffizzi-disconnect.ronn
 - man/uffizzi-login
+- man/uffizzi-login-by-identity-token
+- man/uffizzi-login-by-identity-token.html
+- man/uffizzi-login-by-identity-token.ronn
 - man/uffizzi-login.ronn
 - man/uffizzi-logout
 - man/uffizzi-logout.ronn