Merge branch 'develop'

UffizziCloud · Jul 11, 2023 · 0c1a456 · 0c1a456
2 parents 512623a + b6e99ca
commit 0c1a456
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 62 deletions.
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -0,0 +1,41 @@
+on:
+  workflow_call:
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0.2
+          bundler-cache: true
+      - name: Run rubocop
+        run: bundle exec rubocop
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0.2
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake test
+  test-installation:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0.2
+          bundler-cache: false
+      - name: Build Image
+        uses: docker/build-push-action@v2
+        with:
+          tags: uffizzi/cli:test-install
+          platforms: linux/amd64
+      - name: Display uffizzi-cli version
+        run: docker run --rm uffizzi/cli:test-install version
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,56 +4,18 @@ on:
     branches:
       - qa
       - develop
-      - main
   pull_request:
     types: [opened,synchronize,reopened]
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0.2
-          bundler-cache: true
-      - name: Run rubocop
-        run: bundle exec rubocop
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0.2
-          bundler-cache: true
-      - name: Run tests
-        run: bundle exec rake test
-  test-installation:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0.2
-          bundler-cache: false
-      - name: Build Image
-        uses: docker/build-push-action@v2
-        with:
-          tags: uffizzi/cli:test-install
-          platforms: linux/amd64
-      - name: Display uffizzi-cli version
-        run: docker run --rm uffizzi/cli:test-install version
+  code-quality:
+    name: Test and Lint
+    uses: ./.github/workflows/code-quality.yml
   build-and-push-some-branches:
     runs-on: ubuntu-latest
     needs:
-      - lint
-      - test
-      - test-installation
-    if: ${{ github.ref_name == 'main' || github.ref_name == 'qa' || github.ref_name == 'develop' || github.event_name == 'pull_request' }}
+      - code-quality
+    if: ${{ github.ref_name == 'qa' || github.event_name == 'pull_request' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -93,17 +55,8 @@ jobs:
           repository: uffizzi/cli
   notify:
     needs:
-      - lint
-      - test
+      - code-quality
       - build-and-push-some-branches
     if: ${{ always() }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: technote-space/workflow-conclusion-action@v2
-      - uses: 8398a7/action-slack@v3
-        with:
-          status: ${{ env.WORKFLOW_CONCLUSION }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-        if: ${{ (github.ref_name == 'main' && env.WORKFLOW_CONCLUSION == 'success') || ((github.ref_name == 'main' || github.ref_name == 'qa' || github.ref_name == 'develop') && env.WORKFLOW_CONCLUSION == 'failure') }}
+    uses: ./.github/workflows/notify.yml
+    secrets: inherit
diff --git a/.github/workflows/notify.yml b/.github/workflows/notify.yml
@@ -0,0 +1,14 @@
+on:
+  workflow_call:
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: technote-space/workflow-conclusion-action@v2
+      - uses: 8398a7/action-slack@v3
+        with:
+          status: ${{ env.WORKFLOW_CONCLUSION }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        if: ${{ (github.ref_name == 'main' && env.WORKFLOW_CONCLUSION == 'success') || ((github.ref_name == 'main' || github.ref_name == 'qa' || github.ref_name == 'develop') && env.WORKFLOW_CONCLUSION == 'failure') }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,11 +1,16 @@
 name: Uffizzi CLI Release
 on:
-  push:
-    tags:
-      - 'v*.*.*'
+  release:
+    types: [created, published]
+
 jobs:
+  code-quality:
+    name: Test and Lint
+    uses: ./.github/workflows/code-quality.yml
   release:
     runs-on: ubuntu-latest
+    needs:
+      - code-quality
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -29,3 +34,10 @@ jobs:
         with:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
+  notify:
+    needs:
+      - code-quality
+      - build-and-push-some-branches
+    if: ${{ always() }}
+    uses: ./.github/workflows/notify.yml
+    secrets: inherit
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uffizzi-cli (2.0.0)
+    uffizzi-cli (2.0.1)
       activesupport
       awesome_print
       faker
@@ -36,7 +36,7 @@ GEM
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
     fakefs (1.8.0)
-    faker (2.20.0)
+    faker (3.2.0)
       i18n (>= 1.8.11, < 2)
     hashdiff (1.0.1)
     i18n (1.8.11)
@@ -99,7 +99,7 @@ GEM
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
-    securerandom (0.1.0)
+    securerandom (0.2.2)
     sentry-ruby (5.9.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
     thor (1.2.2)

diff --git a/lib/uffizzi/cli/cluster.rb b/lib/uffizzi/cli/cluster.rb
@@ -107,12 +107,16 @@ def handle_create_command(project_slug)
 
       return ResponseHelper.handle_failed_response(response) unless ResponseHelper.created?(response)
 
+      spinner = TTY::Spinner.new("[:spinner] Creating cluster #{cluster_name}...", format: :dots)
+      spinner.auto_spin
       cluster_data = ClusterService.wait_cluster_deploy(project_slug, cluster_name)
 
       if ClusterService.failed?(cluster_data[:state])
+        spinner.error
         Uffizzi.ui.say_error_and_exit("Cluster with name: #{cluster_name} failed to be created.")
       end
 
+      spinner.success
       handle_succeed_create_response(cluster_data, options[:kubeconfig])
     rescue SystemExit, Interrupt, SocketError
       handle_interruption(cluster_data, ConfigFile.read_option(:server), project_slug)

diff --git a/lib/uffizzi/services/cluster_service.rb b/lib/uffizzi/services/cluster_service.rb
@@ -30,6 +30,7 @@ def wait_cluster_deploy(project_slug, cluster_name)
         return Uffizzi::ResponseHelper.handle_failed_response(response) unless Uffizzi::ResponseHelper.ok?(response)
 
         cluster_data = response.dig(:body, :cluster)
+
         return cluster_data unless deploying?(cluster_data[:state])
 
         sleep(5)

diff --git a/lib/uffizzi/version.rb b/lib/uffizzi/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uffizzi
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end