uffizzi-cli 0.2.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2edd95fc4165e75f533b8925b92031b83baa0db249e78234df4afff63ac1f509
-  data.tar.gz: 856ce13ac1dbf34a84f8304456c3226286825a2626661e69ded2953e12fa6438
+  metadata.gz: 6fc16d251381e8a47bfe848848cb61b39216ac90ec0d5ccf0a7ff509c2003dab
+  data.tar.gz: 3f08d714a939b22f151d4ac47f79d9b24ee0ec3092aec39b12211a6629dd9946
 SHA512:
-  metadata.gz: 8ac95ad20cef50b6a72c0cc67c7faaf92135f054e32dd5f5aaa7436b4545459d057a7a93e12d720cec2b455ceac5c9603414034f496dc3bd4fc9e9b5a190ab4e
-  data.tar.gz: 457220d0efead268142c44dcb4a9b6fe92b4f26428191618212ae133a46aad57087649061077341befcdf71d8025dd9ef99b48f228b7e4c0032eba2ba4a048e6
+  metadata.gz: 988b8c95ebb79d0e12387b0507a38187d9fb30eb44248c0e71730956d6cf79db101e68107a1d86217fd7345e226326d3dbd30406e83f503f9c17bf2ed456fec1
+  data.tar.gz: c725fb1fc3ddb65472a67496bf5cb0b9ac572bf60c737a021d28b06f179e02a41b94993459a3c2904ce0a5eea99dbb81d69b27ae86901cc55cd72e012b46ec58

data/.dockerignore

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

data/Dockerfile

@@ -1,8 +1,17 @@
-FROM ruby:3.0.2-alpine3.14
+FROM ruby:3.0.3-alpine AS builder
 
-RUN apk update && apk upgrade
-RUN apk add bash
-RUN apk add curl-dev ruby-dev build-base git curl ruby-json openssl groff mandoc man-pages
+RUN apk --update add --no-cache \
+  curl-dev \
+  ruby-dev \
+  build-base \
+  git \
+  curl \
+  ruby-json \
+  openssl \
+  groff \
+  mandoc \
+  man-pages \
+  bash
 
 RUN mkdir -p /gem
 WORKDIR /gem
@@ -10,14 +19,28 @@ WORKDIR /gem
 ENV GEM_HOME="/usr/local/bundle"
 ENV PATH $GEM_HOME/bin:$GEM_HOME/gems/bin:$PATH
 
-RUN gem install uffizzi-cli
-RUN gem install bundler -v 2.3.8
+RUN gem install bundler -v 2.3.9
 
-COPY lib/uffizzi/version.rb /gem/lib/uffizzi/
-COPY uffizzi.gemspec /gem/
-COPY Gemfile* /gem/
+COPY lib/uffizzi/version.rb ./lib/uffizzi/
+COPY uffizzi.gemspec .
+COPY Gemfile* .
 RUN bundle install --jobs 4
 
-COPY . /gem
+COPY . .
 
-CMD ["uffizzi"]
+RUN bundle exec rake install
+
+# M-M-M-M-MULTISTAGE!!!
+FROM ruby:3.0.3-alpine
+
+RUN apk --update add --no-cache mandoc
+
+WORKDIR /root/
+
+COPY docker-entrypoint.sh .
+RUN chmod +x docker-entrypoint.sh
+
+COPY --from=builder /gem/pkg/uffizzi-cli* .
+RUN gem install ./uffizzi-cli*
+
+ENTRYPOINT ["/root/docker-entrypoint.sh"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uffizzi-cli (0.2.2)
+    uffizzi-cli (0.3.4)
       thor
 
 GEM
@@ -16,6 +16,7 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
+    bump (0.10.0)
     byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
@@ -23,6 +24,8 @@ GEM
       rexml
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
+    faker (2.20.0)
+      i18n (>= 1.8.11, < 2)
     hashdiff (1.0.1)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
@@ -95,9 +98,11 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
+  bump
   bundler (~> 2.2)
   byebug
   factory_bot
+  faker
   minitest
   minitest-power_assert
   mocha

data/Makefile

@@ -0,0 +1,32 @@
+.PHONY: release release_patch release_minor release_major
+
+NEXT_PATCH=$(shell docker-compose run --rm gem bash -c "bundle exec bump show-next patch")
+NEXT_MINOR=$(shell docker-compose run --rm gem bash -c "bundle exec bump show-next minor")
+NEXT_MAJOR=$(shell docker-compose run --rm gem bash -c "bundle exec bump show-next major")
+
+release_patch: export VERSION=${NEXT_PATCH}
+release_patch:
+	make release
+
+release_minor: export VERSION=${NEXT_MINOR}
+release_minor:
+	make release
+
+release_major: export VERSION=${NEXT_MAJOR}
+release_major:
+	make release
+
+release:
+	git checkout develop
+	git pull origin --rebase develop
+	@echo 'Set a new version'
+	docker-compose run --rm gem bash -c "bundle exec bump set ${VERSION}"
+	@echo 'Update remote origin'
+	git push origin develop
+	git checkout main
+	git pull origin --rebase main
+	git merge --no-ff --no-edit develop
+	git push origin main
+	@echo 'Create a new tag'
+	git tag v${VERSION}
+	git push origin v${VERSION}

data/README.md

@@ -29,10 +29,10 @@ To host Uffizzi yourself, you will also need the following external dependencies
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your application's `Gemfile`:
 
 ```ruby
-gem 'uffizzi'
+gem 'uffizzi-cli'
 ```
 
 And then execute:
@@ -41,7 +41,23 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install uffizzi
+    $ gem install uffizzi-cli
+
+### Docker image
+
+We also provide an image on Docker Hub:
+
+```bash
+docker run -it --rm uffizzi/cli project list
+```
+
+If you specify the following environment variables, the Docker image's
+entrypoint script can log you into Uffizzi before executing your command.
+
+- `UFFIZZI_USER`
+- `UFFIZZI_HOSTNAME`
+- `UFFIZZI_PASSWORD`
+- `UFFIZZI_PROJECT` (optional)
 
 ## Development
 
@@ -52,12 +68,23 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 Run rubocop:
 `bundle exec rubocop -A`
 
+## Testing
+
+Run tests:
+`bundle exec rake test`
+
+Run tests from a file:
+`bundle exec rake test TEST=test/uffizzi/cli/preview_test.rb`
+
+Run single test
+`bundle exec rake test TEST=test/uffizzi/cli/preview_test.rb TESTOPTS="--name=test_name"`
+
 ## Commands
 
 ### login
 
 ```
-$ uffizzi login -u your@email.com --hostname localhost:8080
+$ uffizzi login --user your@email.com --hostname localhost:8080
 ```
 
 Logging you into the app which you set in the hostname option.
@@ -167,7 +194,7 @@ git checkout -b feature/short_issue_description (e.g. feature/add_domain_setting
 ```
 git add .
 git commit -m 'short commit description' (e.g. git commit -m 'added domain settings')
-git push origin FEATURE_NAME
+git push origin BRANCH_NAME
 ```
 
 4. You already can create PR with develop branch as a target. Once the feature is ready let us know in the channel - we will review
@@ -176,7 +203,7 @@ git push origin FEATURE_NAME
 ```
 git checkout qa
 git pull --rebase qa
-git merge --no-ff FEATURE_NAME
+git merge --no-ff BRANCH_NAME
 git push origin qa
 ```
 

data/config/uffizzi.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'ostruct'
+
 module Uffizzi
   def self.configuration
     @configuration ||= OpenStruct.new
@@ -12,5 +13,11 @@ module Uffizzi
 
   configure do |config|
     config.hostname = 'http://web:7000'
+    config.credential_types = {
+      dockerhub: 'UffizziCore::Credential::DockerHub',
+      azure: 'UffizziCore::Credential::Azure',
+      google: 'UffizziCore::Credential::Google',
+      amazon: 'UffizziCore::Credential::Amazon',
+    }
   end
 end

data/docker-compose.yml

@@ -2,7 +2,9 @@ version: "3.9"
 
 services:
   gem:
-    build: .
+    build:
+      context: .
+      target: builder
     volumes:
       - ./:/gem:cached
       - ~/.ssh:/root/.ssh

data/docker-entrypoint.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e # Exit immediately if anything below exits with non-zero status.
+
+if
+	[ $UFFIZZI_USER ] &&
+	[ $UFFIZZI_HOSTNAME ] &&
+	[ $UFFIZZI_PASSWORD ]
+then
+	uffizzi login --username "${UFFIZZI_USER}" --hostname "${UFFIZZI_HOSTNAME}"
+	if [ $UFFIZZI_PROJECT ]
+	then
+		uffizzi config set project "${UFFIZZI_PROJECT}"
+	fi
+else
+	echo "Specify environment variables to login before executing Uffizzi CLI."
+	echo "UFFIZZI_USER, UFFIZZI_HOSTNAME, UFFIZZI_PASSWORD, and optionally UFFIZZI_PROJECT"
+fi
+
+exec uffizzi "$@"

data/lib/uffizzi/cli/config.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'io/console'
 require 'uffizzi'
 require 'uffizzi/clients/api/api_client'
 

data/lib/uffizzi/cli/connect.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+require 'uffizzi'
+
+module Uffizzi
+  class CLI::Connect
+    include ApiClient
+
+    def run(credential_type, credential_file_path)
+      case credential_type
+      when 'docker-hub'
+        handle_docker_hub
+      when 'acr'
+        handle_azure
+      when 'ecr'
+        handle_amazon
+      when 'gcr'
+        handle_google(credential_file_path)
+      else
+        Uffizzi.ui.say('Unsupported credential type.')
+      end
+    end
+
+    private
+
+    def handle_docker_hub
+      username = Uffizzi.ui.ask('Username: ')
+      password = Uffizzi.ui.ask('Password: ', echo: false)
+
+      params = {
+        username: username,
+        password: password,
+        type: Uffizzi.configuration.credential_types[:dockerhub],
+      }
+
+      hostname = ConfigFile.read_option(:hostname)
+      response = create_credential(hostname, params)
+
+      if ResponseHelper.created?(response)
+        print_success_message('DockerHub')
+      else
+        ResponseHelper.handle_failed_response(response)
+      end
+    end
+
+    def handle_azure
+      registry_url = prepare_registry_url(Uffizzi.ui.ask('Registry Domain: '))
+      username = Uffizzi.ui.ask('Docker ID: ')
+      password = Uffizzi.ui.ask('Password/Access Token: ', echo: false)
+
+      params = {
+        username: username,
+        password: password,
+        registry_url: registry_url,
+        type: Uffizzi.configuration.credential_types[:azure],
+      }
+
+      hostname = ConfigFile.read_option(:hostname)
+      response = create_credential(hostname, params)
+
+      if ResponseHelper.created?(response)
+        print_success_message('ACR')
+      else
+        ResponseHelper.handle_failed_response(response)
+      end
+    end
+
+    def handle_amazon
+      registry_url = prepare_registry_url(Uffizzi.ui.ask('Registry Domain: '))
+      username = Uffizzi.ui.ask('Access key ID: ')
+      password = Uffizzi.ui.ask('Secret access key: ', echo: false)
+
+      params = {
+        username: username,
+        password: password,
+        registry_url: registry_url,
+        type: Uffizzi.configuration.credential_types[:amazon],
+      }
+
+      hostname = ConfigFile.read_option(:hostname)
+      response = create_credential(hostname, params)
+
+      if ResponseHelper.created?(response)
+        print_success_message('ECR')
+      else
+        ResponseHelper.handle_failed_response(response)
+      end
+    end
+
+    def handle_google(credential_file_path)
+      return Uffizzi.ui.say('Path to google service account key file wasn\'t specified.') if credential_file_path.nil?
+
+      begin
+        credential_content = File.read(credential_file_path)
+      rescue Errno::ENOENT => e
+        return Uffizzi.ui.say(e)
+      end
+
+      params = {
+        password: credential_content,
+        type: Uffizzi.configuration.credential_types[:google],
+      }
+
+      hostname = ConfigFile.read_option(:hostname)
+      response = create_credential(hostname, params)
+
+      if ResponseHelper.created?(response)
+        print_success_message('GCR')
+      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}")
+    end
+  end
+end

data/lib/uffizzi/cli/login.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'io/console'
 require 'uffizzi'
 require 'uffizzi/response_helper'
 require 'uffizzi/clients/api/api_client'
@@ -14,7 +13,8 @@ module Uffizzi
     end
 
     def run
-      password = IO::console.getpass('Enter Password: ')
+      password = ENV['UFFIZZI_PASSWORD'] || IO::console.getpass('Enter Password: ')
+
       params = prepare_request_params(password)
       response = create_session(@options[:hostname], params)
 

data/lib/uffizzi/cli/logout.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'io/console'
 require 'uffizzi'
 require 'uffizzi/auth_helper'
 

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'uffizzi'
+require 'uffizzi/auth_helper'
+require 'uffizzi/response_helper'
+require 'uffizzi/services/preview_service'
+
+module Uffizzi
+  class CLI::Preview::Service < Thor
+    include ApiClient
+
+    desc 'list', '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?
+
+      project_slug = ConfigFile.read_option(:project)
+      hostname = ConfigFile.read_option(:hostname)
+      deployment_id = PreviewService.read_deployment_id(deployment_name)
+      response = fetch_deployment_services(hostname, project_slug, deployment_id)
+
+      if ResponseHelper.ok?(response)
+        handle_succeed_response(response, deployment_name)
+      else
+        ResponseHelper.handle_failed_response(response)
+      end
+    end
+
+    private
+
+    def handle_succeed_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?
+
+      services.each do |service|
+        Uffizzi.ui.say(service)
+      end
+    end
+  end
+end

data/lib/uffizzi/cli/preview.rb

@@ -3,6 +3,7 @@
 require 'uffizzi'
 require 'tty-spinner'
 require 'uffizzi/auth_helper'
+require 'uffizzi/services/preview_service'
 
 module Uffizzi
   class CLI::Preview < Thor
@@ -16,37 +17,48 @@ module Uffizzi
       end
     end
 
+    desc 'service', 'service'
+    require_relative 'preview/service'
+    subcommand 'service', Uffizzi::CLI::Preview::Service
+
     desc 'list', 'list'
     def list
       return Cli::Common.show_manual(:list) if options[:help]
 
-      run(options, 'list', nil, nil)
+      run(options, 'list')
     end
 
     desc 'create', 'create'
     def create(file_path = nil)
       return Cli::Common.show_manual(:create) if options[:help]
 
-      run(options, 'create', file_path, nil)
+      run(options, 'create', file_path: file_path)
     end
 
     desc 'delete', 'delete'
-    def delete(deployment)
+    def delete(deployment_name)
       return Cli::Common.show_manual(:delete) if options[:help]
 
-      run(options, 'delete', nil, deployment)
+      run(options, 'delete', deployment_name: deployment_name)
     end
 
     desc 'describe', 'describe'
-    def describe(deployment)
+    def describe(deployment_name)
       return Cli::Common.show_manual(:describe) if options[:help]
 
-      run(options, 'describe', nil, deployment)
+      run(options, 'describe', deployment_name: deployment_name)
+    end
+
+    desc 'events', 'events'
+    def events(deployment_name)
+      return Cli::Common.show_manual(:events) if options[:help]
+
+      run(options, 'events', deployment_name: deployment_name)
     end
 
     private
 
-    def run(options, command, file_path, deployment)
+    def run(options, command, file_path: nil, deployment_name: nil)
       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?
 
@@ -58,15 +70,16 @@ module Uffizzi
       when 'create'
         handle_create_command(file_path, project_slug)
       when 'delete'
-        handle_delete_command(deployment, project_slug)
+        handle_delete_command(deployment_name, project_slug)
       when 'describe'
-        handle_describe_command(deployment, project_slug)
+        handle_describe_command(deployment_name, project_slug)
+      when 'events'
+        handle_events_command(deployment_name, project_slug)
       end
     end
 
     def handle_list_command(project_slug)
-      hostname = ConfigFile.read_option(:hostname)
-      response = fetch_deployments(hostname, project_slug)
+      response = fetch_deployments(ConfigFile.read_option(:hostname), project_slug)
 
       if ResponseHelper.ok?(response)
         handle_succeed_list_response(response)
@@ -76,33 +89,50 @@ module Uffizzi
     end
 
     def handle_create_command(file_path, project_slug)
-      hostname = ConfigFile.read_option(:hostname)
       params = file_path.nil? ? {} : prepare_params(file_path)
-      response = create_deployment(hostname, project_slug, params)
+      response = create_deployment(ConfigFile.read_option(:hostname), project_slug, params)
 
       if ResponseHelper.created?(response)
-        handle_succeed_create_response(hostname, project_slug, response)
+        handle_succeed_create_response(project_slug, response)
+      else
+        ResponseHelper.handle_failed_response(response)
+      end
+    end
+
+    def handle_events_command(deployment_name, project_slug)
+      deployment_id = PreviewService.read_deployment_id(deployment_name)
+
+      return Uffizzi.ui.say("Preview should be specified in 'deployment-PREVIEW_ID' format") if deployment_id.nil?
+
+      response = fetch_events(ConfigFile.read_option(:hostname), project_slug, deployment_id)
+
+      if ResponseHelper.ok?(response)
+        handle_succeed_events_response(response)
       else
         ResponseHelper.handle_failed_response(response)
       end
     end
 
-    def handle_succeed_create_response(hostname, project_slug, response)
+    def handle_succeed_events_response(response)
+      Uffizzi.ui.print_in_columns(response[:body][:events])
+    end
+
+    def handle_succeed_create_response(project_slug, response)
       deployment = response[:body][:deployment]
       deployment_id = deployment[:id]
       params = { id: deployment_id }
 
-      response = deploy_containers(hostname, project_slug, deployment_id, params)
+      response = deploy_containers(ConfigFile.read_option(:hostname), project_slug, deployment_id, params)
 
       if ResponseHelper.no_content?(response)
         Uffizzi.ui.say("Preview created with name deployment-#{deployment_id}")
-        print_deployment_progress(hostname, deployment, project_slug)
+        print_deployment_progress(deployment, project_slug)
       else
         ResponseHelper.handle_failed_response(response)
       end
     end
 
-    def print_deployment_progress(hostname, deployment, project_slug)
+    def print_deployment_progress(deployment, project_slug)
       deployment_id = deployment[:id]
 
       @spinner = TTY::Spinner.new('[:spinner] Creating containers...', format: :dots)
@@ -111,7 +141,7 @@ module Uffizzi
       activity_items = []
 
       loop do
-        response = get_activity_items(hostname, project_slug, deployment_id)
+        response = get_activity_items(ConfigFile.read_option(:hostname), project_slug, deployment_id)
         handle_activity_items_response(response)
         return unless @spinner.spinning?
 
@@ -133,7 +163,7 @@ module Uffizzi
       containers_spinners = create_containers_spinners(activity_items)
 
       loop do
-        response = get_activity_items(hostname, project_slug, deployment_id)
+        response = get_activity_items(ConfigFile.read_option(:hostname), project_slug, deployment_id)
         handle_activity_items_response(response)
         return if @spinner.done?
 
@@ -176,13 +206,12 @@ module Uffizzi
       end
     end
 
-    def handle_delete_command(deployment, project_slug)
-      return Uffizzi.ui.say("Preview should be specified in 'deployment-PREVIEW_ID' format") unless deployment_name_valid?(deployment)
+    def handle_delete_command(deployment_name, project_slug)
+      deployment_id = PreviewService.read_deployment_id(deployment_name)
 
-      hostname = ConfigFile.read_option(:hostname)
-      deployment_id = deployment.split('-').last
+      return Uffizzi.ui.say("Preview should be specified in 'deployment-PREVIEW_ID' format") if deployment_id.nil?
 
-      response = delete_deployment(hostname, project_slug, deployment_id)
+      response = delete_deployment(ConfigFile.read_option(:hostname), project_slug, deployment_id)
 
       if ResponseHelper.no_content?(response)
         handle_succeed_delete_response(deployment_id)
@@ -191,13 +220,12 @@ module Uffizzi
       end
     end
 
-    def handle_describe_command(deployment, project_slug)
-      return Uffizzi.ui.say("Preview should be specified in 'deployment-PREVIEW_ID' format") unless deployment_name_valid?(deployment)
+    def handle_describe_command(deployment_name, project_slug)
+      deployment_id = PreviewService.read_deployment_id(deployment_name)
 
-      hostname = ConfigFile.read_option(:hostname)
-      deployment_id = deployment.split('-').last
+      return Uffizzi.ui.say("Preview should be specified in 'deployment-PREVIEW_ID' format") if deployment_id.nil?
 
-      response = describe_deployment(hostname, project_slug, deployment_id)
+      response = describe_deployment(ConfigFile.read_option(:hostname), project_slug, deployment_id)
 
       if ResponseHelper.ok?(response)
         handle_succeed_describe_response(response)
@@ -255,13 +283,5 @@ module Uffizzi
         dependencies: dependencies,
       }
     end
-
-    def deployment_name_valid?(deployment)
-      return false unless deployment.start_with?('deployment-')
-      return false unless deployment.split('-').size == 2
-
-      deployment_id = deployment.split('-').last
-      deployment_id.to_i.to_s == deployment_id
-    end
   end
 end

data/lib/uffizzi/cli/project/compose.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require 'io/console'
 require 'uffizzi'
 require 'uffizzi/auth_helper'
 require 'uffizzi/response_helper'
 require 'uffizzi/services/compose_file_service'
 require 'uffizzi/services/env_variables_service'
-require 'thor'
 
 module Uffizzi
   class CLI::Project::Compose < Thor

data/lib/uffizzi/cli/project/secret.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'uffizzi'
+require 'uffizzi/auth_helper'
+require 'uffizzi/response_helper'
+require 'uffizzi/shell'
+
+module Uffizzi
+  class CLI::Project::Secret < Thor
+    include ApiClient
+
+    desc 'list', 'List Secrets'
+    def list
+      run('list')
+    end
+
+    desc 'create', 'Create secrets'
+    def create(id)
+      run('create', id)
+    end
+
+    desc 'delete', 'Delete a secret'
+    def delete(id)
+      run('delete', id)
+    end
+
+    private
+
+    def run(command, args = {})
+      return Uffizzi.ui.say('You are not logged in') unless AuthHelper.signed_in?
+
+      project_slug = ConfigFile.read_option(:project)
+      return Uffizzi.ui.say('Please use the --project option to specify the project name') if project_slug.nil?
+
+      case command
+      when 'list'
+        handle_list_command(project_slug)
+      when 'create'
+        handle_create_command(project_slug, args)
+      when 'delete'
+        handle_delete_command(project_slug, args)
+      else
+        error_message = "The subcommand #{command} does not exist, please run 'uffizzi project secret help' \
+        to get the list of available subcommands"
+        Uffizzi.ui.say(error_message)
+      end
+    end
+
+    def handle_list_command(project_slug)
+      hostname = ConfigFile.read_option(:hostname)
+      response = fetch_secrets(hostname, project_slug)
+      secrets = response[:body][:secrets].map { |secret| [secret[:name]] }
+      return Uffizzi.ui.say('There are no secrets for the project') if secrets.empty?
+
+      table_header = 'NAME'
+      table_data = [[table_header], *secrets]
+      return Uffizzi.ui.print_table(table_data) if ResponseHelper.ok?(response)
+
+      ResponseHelper.handle_failed_response(response)
+    end
+
+    def handle_create_command(project_slug, id)
+      hostname = ConfigFile.read_option(:hostname)
+      secret_value = $stdin.read
+      return Uffizzi.ui.say('Please provide the secret value') if secret_value.nil?
+
+      params = { secrets: [{ name: id, value: secret_value }] }
+      response = bulk_create_secrets(hostname, project_slug, params)
+      return Uffizzi.ui.say('The secret was successfully created') if ResponseHelper.created?(response)
+
+      ResponseHelper.handle_failed_response(response)
+    end
+
+    def handle_delete_command(project_slug, id)
+      hostname = ConfigFile.read_option(:hostname)
+      response = delete_secret(hostname, project_slug, id)
+
+      if ResponseHelper.no_content?(response)
+        Uffizzi.ui.say('The secret was successfully deleted')
+      else
+        ResponseHelper.handle_failed_response(response)
+      end
+    end
+  end
+end

data/lib/uffizzi/cli/project.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require 'io/console'
 require 'uffizzi'
 require 'uffizzi/auth_helper'
 require 'uffizzi/response_helper'
-require 'thor'
 
 module Uffizzi
   class CLI::Project < Thor
@@ -15,6 +13,10 @@ module Uffizzi
     require_relative 'project/compose'
     subcommand 'compose', Uffizzi::CLI::Project::Compose
 
+    desc 'secret', 'Secrets Actions'
+    require_relative 'project/secret'
+    subcommand 'secret', Uffizzi::CLI::Project::Secret
+
     desc 'list', 'list'
     def list
       run('list')

data/lib/uffizzi/cli.rb

@@ -30,6 +30,12 @@ module Uffizzi
       Logout.new.run
     end
 
+    desc 'projects', 'projects'
+    def projects
+      require_relative 'cli/projects'
+      Projects.new.run
+    end
+
     desc 'project', 'project'
     require_relative 'cli/project'
     subcommand 'project', CLI::Project
@@ -42,5 +48,11 @@ module Uffizzi
     method_option :project, required: false
     require_relative 'cli/preview'
     subcommand 'preview', CLI::Preview
+
+    desc 'connect CREDENTIAL_TYPE', 'Connect credentials into Uffizzi'
+    def connect(credential_type, credential_file_path = nil)
+      require_relative 'cli/connect'
+      Connect.new.run(credential_type, credential_file_path)
+    end
   end
 end

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

@@ -5,6 +5,7 @@ require_relative 'http_client'
 
 module ApiClient
   include ApiRoutes
+
   def create_session(hostname, params = {})
     uri = session_uri(hostname)
     response = Uffizzi::HttpClient.make_post_request(uri, params, false)
@@ -26,6 +27,20 @@ module ApiClient
     build_response(response)
   end
 
+  def create_credential(hostname, params)
+    uri = credentials_uri(hostname)
+    response = Uffizzi::HttpClient.make_post_request(uri, params)
+
+    build_response(response)
+  end
+
+  def fetch_deployment_services(hostname, project_slug, deployment_id)
+    uri = preview_services_uri(hostname, project_slug, deployment_id)
+    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)
@@ -35,7 +50,28 @@ module ApiClient
 
   def unset_compose_file(hostname, project_slug)
     uri = compose_file_uri(hostname, project_slug)
-    response = Uffizzi::HttpClient.make_delete_request(uri, true)
+    response = Uffizzi::HttpClient.make_delete_request(uri)
+
+    build_response(response)
+  end
+
+  def fetch_secrets(hostname, project_slug)
+    uri = secrets_uri(hostname, project_slug)
+    response = Uffizzi::HttpClient.make_get_request(uri)
+
+    build_response(response)
+  end
+
+  def bulk_create_secrets(hostname, project_slug, params)
+    uri = "#{secrets_uri(hostname, project_slug)}/bulk_create"
+    response = Uffizzi::HttpClient.make_post_request(uri, params)
+
+    build_response(response)
+  end
+
+  def delete_secret(hostname, project_slug, id)
+    uri = secret_uri(hostname, project_slug, id)
+    response = Uffizzi::HttpClient.make_delete_request(uri)
 
     build_response(response)
   end
@@ -70,7 +106,7 @@ module ApiClient
 
   def delete_deployment(hostname, project_slug, deployment_id)
     uri = deployment_uri(hostname, project_slug, deployment_id)
-    response = Uffizzi::HttpClient.make_delete_request(uri, true)
+    response = Uffizzi::HttpClient.make_delete_request(uri)
 
     build_response(response)
   end
@@ -82,6 +118,13 @@ module ApiClient
     build_response(response)
   end
 
+  def fetch_events(hostname, project_slug, deployment_id)
+    uri = events_uri(hostname, project_slug, deployment_id)
+    response = Uffizzi::HttpClient.make_get_request(uri)
+
+    build_response(response)
+  end
+
   def get_activity_items(hostname, project_slug, deployment_id)
     uri = activity_items_uri(hostname, project_slug, deployment_id)
     response = Uffizzi::HttpClient.make_get_request(uri)

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

@@ -1,16 +1,27 @@
 # frozen_string_literal: true
 
+require 'cgi'
+
 module ApiRoutes
-  def session_uri(hostname)
-    "#{hostname}/api/cli/v1/session"
+  def compose_file_uri(hostname, project_slug)
+    "#{hostname}/api/cli/v1/projects/#{project_slug}/compose_file"
   end
 
   def projects_uri(hostname)
     "#{hostname}/api/cli/v1/projects"
   end
 
-  def compose_file_uri(hostname, project_slug)
-    "#{hostname}/api/cli/v1/projects/#{project_slug}/compose_file"
+  def secret_uri(hostname, project_slug, id)
+    path_id = CGI.escape(id)
+    "#{hostname}/api/cli/v1/projects/#{project_slug}/secrets/#{path_id}"
+  end
+
+  def secrets_uri(hostname, project_slug)
+    "#{hostname}/api/cli/v1/projects/#{project_slug}/secrets"
+  end
+
+  def session_uri(hostname)
+    "#{hostname}/api/cli/v1/session"
   end
 
   def validate_compose_file_uri(hostname, project_slug)
@@ -32,4 +43,16 @@ module ApiRoutes
   def deploy_containers_uri(hostname, project_slug, deployment_id)
     "#{hostname}/api/cli/v1/projects/#{project_slug}/deployments/#{deployment_id}/deploy_containers"
   end
+
+  def events_uri(hostname, project_slug, deployment_id)
+    "#{hostname}/api/cli/v1/projects/#{project_slug}/deployments/#{deployment_id}/events"
+  end
+
+  def credentials_uri(hostname)
+    "#{hostname}/api/cli/v1/account/credentials"
+  end
+
+  def preview_services_uri(hostname, project_slug, deployment_id)
+    "#{hostname}/api/cli/v1/projects/#{project_slug}/deployments/#{deployment_id}/containers"
+  end
 end

data/lib/uffizzi/services/preview_service.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class PreviewService
+  class << self
+    def read_deployment_id(deployment_name)
+      return nil unless deployment_name.start_with?('deployment-')
+      return nil unless deployment_name.split('-').size == 2
+
+      deployment_id = deployment_name.split('-').last
+      return nil if deployment_id.to_i.to_s != deployment_id
+
+      deployment_id
+    end
+  end
+end

data/lib/uffizzi/shell.rb

@@ -9,8 +9,16 @@ module Uffizzi
         @shell = Thor::Shell::Basic.new
       end
 
-      def say(msg)
-        @shell.say(msg)
+      def say(message)
+        @shell.say(message)
+      end
+
+      def print_in_columns(messages)
+        @shell.print_in_columns(messages)
+      end
+
+      def print_table(table_data)
+        @shell.print_table(table_data)
       end
 
       def last_message

data/lib/uffizzi/version.rb

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

data/lib/uffizzi.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
+require 'io/console'
+
 require 'uffizzi/shell'
 require 'uffizzi/version'
 require 'uffizzi/clients/api/api_client'
 require 'uffizzi/clients/api/api_routes'
 require 'uffizzi/config_file'
+require_relative '../config/uffizzi'
 
 module Uffizzi
   class Error < StandardError; end

data/man/uffizzi-events

@@ -0,0 +1,30 @@
+.\" generated with Ronn-NG/v0.9.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.9.1
+.TH "UFFIZZI\-EVENTS" "" "March 2022" ""
+.SH "NAME"
+\fBuffizzi preview events \- show the deployment event logs for a preview\fR
+.P
+.SH SYNOPSIS
+uffizzi preview events [PREVIEW_ID] [UFFIZZI_WIDE_FLAG \|\.\|\.\|\.]
+.P
+.SH DESCRIPTION
+Shows the deployment event logs for a given preview\.
+
+This command can fail for the following reasons:
+    \- There is no preview with the given PREVIEW_ID
+
+For more information on event logs, see:
+https://docs\.uffizzi\.com/cli
+
+.SH POSITIONAL ARGUMENTS
+[PREVIEW_ID]
+    The ID of the preview that you want to see events for\.
+.P
+.SH UFFIZZI WIDE FLAGS
+These flags are available to all commands: \-\-project\. Run $ uffizzi help for details\.
+.P
+.SH EXAMPLES
+The following command shows deployment events for the preview with ID deployment\-67:
+.P
+    $ uffizzi preview events deployment\-67
+

data/man/uffizzi-events.ronn

@@ -0,0 +1,29 @@
+NAME
+    uffizzi preview events - show the deployment event logs for a 
+    preview 
+
+SYNOPSIS
+    uffizzi preview events [PREVIEW_ID] [UFFIZZI_WIDE_FLAG ...] 
+
+DESCRIPTION
+    Shows the deployment event logs for a given preview.
+
+    This command can fail for the following reasons: 
+        - There is no preview with the given PREVIEW_ID
+
+    For more information on event logs, see:
+    https://docs.uffizzi.com/cli
+
+POSITIONAL ARGUMENTS
+    [PREVIEW_ID]
+        The ID of the preview that you want to see events for.
+
+UFFIZZI WIDE FLAGS
+    These flags are available to all commands: --project. Run $ uffizzi 
+    help for details.
+
+EXAMPLES
+    The following command shows deployment events for the preview with 
+    ID deployment-67:
+
+        $ uffizzi preview events deployment-67

data/uffizzi.gemspec

@@ -27,9 +27,11 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_development_dependency 'bump'
   spec.add_development_dependency 'bundler', '~> 2.2'
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'factory_bot'
+  spec.add_development_dependency 'faker'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-power_assert'
   spec.add_development_dependency 'mocha'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bump
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faker
+  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: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -257,6 +285,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
 - ".rubocop.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -264,24 +293,28 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
+- Makefile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
-- config/config.rb
 - config/uffizzi.rb
 - docker-compose.yml
+- docker-entrypoint.sh
 - exe/uffizzi
 - lib/uffizzi.rb
 - lib/uffizzi/auth_helper.rb
 - lib/uffizzi/cli.rb
 - lib/uffizzi/cli/common.rb
 - lib/uffizzi/cli/config.rb
+- lib/uffizzi/cli/connect.rb
 - lib/uffizzi/cli/login.rb
 - lib/uffizzi/cli/logout.rb
 - lib/uffizzi/cli/preview.rb
+- lib/uffizzi/cli/preview/service.rb
 - lib/uffizzi/cli/project.rb
 - lib/uffizzi/cli/project/compose.rb
+- lib/uffizzi/cli/project/secret.rb
 - lib/uffizzi/clients/api/api_client.rb
 - lib/uffizzi/clients/api/api_routes.rb
 - lib/uffizzi/clients/api/http_client.rb
@@ -289,6 +322,7 @@ files:
 - 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
@@ -297,6 +331,8 @@ files:
 - 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

data/config/config.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'ostruct'
-
-module Uffizzi
-  def self.configuration
-    @configuration ||= OpenStruct.new
-  end
-
-  def self.configure
-    yield(configuration)
-  end
-
-  configure do |config|
-    config.hostname = 'http://web:7000'
-  end
-end