vgs_api_client 0.0.1.alpha202204202050 → 0.0.1.alpha202204202333

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea5ae2b81f01e7a257eb7e77d823f3a13d0410b63927ca5b10326d928956229d
-  data.tar.gz: 65d050c821ea2f36a41ef71aeed4a29933652394292dd3298568116a189c20a6
+  metadata.gz: 360f96c20c7b52f4ecfc02edbf96ae3f325042fd405d6b582add9c44c384218d
+  data.tar.gz: dd66ec08fb4312f85dd6f8be59a4a2e4c74bfd602a9c26f65eb651d96a82b22b
 SHA512:
-  metadata.gz: 445e7523e2b402a632fbc39f163fbf70e219ad3e4997c2ab7ac15eebb477c6db38f78f1955a462c8b0da7309a1b2022d7727471d9f018077e1e7948c32b19548
-  data.tar.gz: 10400c3b929979c05752401ae727448c727112d35f674bc00de7a0a8adec0375229790294353d3bb2d25cd3f13960872babb2690365767ad80e4bb5c40726fa1
+  metadata.gz: ac8e05354c73403674221533838ba997b12a4984f31ae712064a18492d7b51cdc825b07c0dd5f33a813e0258355b93e0ee7d125544856b654a3386a832729270
+  data.tar.gz: 061a859f4529226ce93e6bf7786533683e6ed8cb58f1f4e91483719b8812f9b70ae85e80bfe61a24d3677f0ec86cc036dbd71c4f2eb23b4015cb07d98fdb5041

data/docker-compose.yaml

@@ -28,5 +28,13 @@ services:
       VAULT_API_BASE_URI: https://api.sandbox.verygoodvault.com
       VAULT_API_VAULT_ID: tntkxfmsefj
       LIB_VERSION: ${LIB_VERSION}
-    volumes:
-      - ./:/vgs-api-client/
+  test-e2e:
+    build:
+      context: .
+      dockerfile: scripts/test-e2e/Dockerfile
+    environment:
+      VAULT_API_USERNAME: US7oyrzRGmaKqi3ET8eSsECS
+      VAULT_API_PASSWORD: c06cf6d1-a35e-439d-91d1-8bd04e5fd9e5
+      VAULT_API_BASE_URI: https://api.sandbox.verygoodvault.com
+      VAULT_API_VAULT_ID: tntkxfmsefj
+      LIB_VERSION: ${LIB_VERSION}

data/lib/vgs_api_client/api_client.rb

@@ -31,7 +31,7 @@ module VgsApiClient
     # @option config [Configuration] Configuration for initializing the object, default to Configuration.default
     def initialize(config = Configuration.default)
       @config = config
-      @user_agent = "vgs-api-client/0.0.1.alpha202204202050/ruby"
+      @user_agent = "vgs-api-client/0.0.1.alpha202204202333/ruby"
       @default_headers = {
         'Content-Type' => 'application/json',
         'User-Agent' => @user_agent

data/lib/vgs_api_client/version.rb

@@ -11,5 +11,5 @@ OpenAPI Generator version: 5.4.0
 =end
 
 module VgsApiClient
-  VERSION = '0.0.1.alpha202204202050'
+  VERSION = '0.0.1.alpha202204202333'
 end

data/scripts/assemble/run.sh

@@ -3,7 +3,7 @@
 LIB_VERSION=${LIB_VERSION:-0.0.1.alpha$(date "+%Y%m%d%H%M")}
 
 # fix version
-grep -rl 0.0.1.alpha202204202050 . | xargs sed -i "s/0.0.1.alpha202204202050/${LIB_VERSION}/g"
+grep -rl 0.0.1.alpha202204202333 . | xargs sed -i "s/0.0.1.alpha202204202333/${LIB_VERSION}/g"
 
 # build
 gem build vgs_api_client.gemspec

data/scripts/run-tests-e2e.sh

@@ -4,5 +4,5 @@ set -e
 
 export LIB_VERSION=${LIB_VERSION:-0.0.1.alpha$(date "+%Y%m%d%H%M")}
 
-docker-compose build && \
-docker-compose run test
+docker-compose build test-e2e && \
+docker-compose run test-e2e

data/scripts/run-tests.sh

@@ -2,5 +2,5 @@
 
 set -e
 
-docker-compose build && \
+docker-compose build test && \
 docker-compose run test

data/scripts/test/Dockerfile

@@ -7,6 +7,8 @@ RUN apk update && \
     gem install bundler && \
     gem install rspec-support
 
+ADD . /vgs-api-client
+
 WORKDIR /vgs-api-client/
 
 ENTRYPOINT ["bash", "./scripts/test/run.sh"]

data/scripts/test/run.sh

@@ -2,36 +2,12 @@
 
 set -e
 
-rm vgs_api_client-*.gem || true
+echo "Installing lib from local sources"
+# fix version
+VERSION=0.0.1.alpha$(date "+%Y%m%d%H%M")
+grep -rl 0.0.1.alpha202204202333 . | xargs sed -i "s/0.0.1.alpha202204202333/$VERSION/g"
 
-if [[ -n "${LIB_VERSION}" ]]; then
-  echo "Installing lib from rubygems.org ${LIB_VERSION} ..."
-
-  set +e
-  ATTEMPT=1
-  while [  $ATTEMPT -lt 60 ]; do
-    echo "Attempt ${ATTEMPT} ..."
-
-    bundle install --without production --binstubs
-    gem install vgs_api_client -v ${LIB_VERSION}
-
-    if [[ $? == 0 ]]; then
-      echo "Installed ${LIB_VERSION}"
-      break
-    fi
-
-    ATTEMPT=$((ATTEMPT+1))
-
-    sleep 5
-  done
-  set -e
-else
-  echo "Installing lib from local sources"
-  # fix version
-  VERSION=0.0.1.alpha$(date "+%Y%m%d%H%M")
-  grep -rl 0.0.1.alpha202204202050 . | xargs sed -i "s/0.0.1.alpha202204202050/$VERSION/g"
-
-  bundle install
-fi
+bundle install
 
+echo "Running tests"
 bundle exec rspec ./spec/*.rb

data/scripts/test-e2e/Dockerfile

@@ -0,0 +1,13 @@
+FROM ruby:3.1.2-alpine3.15
+
+RUN apk update && \
+    apk add bash && \
+    apk add build-base && \
+    apk add libcurl && \
+    gem install bundler && \
+    gem install rspec-support
+
+ADD ./scripts/test-e2e /scripts
+ADD ./spec /spec
+
+ENTRYPOINT ["bash", "./scripts/run.sh"]

data/scripts/test-e2e/run.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "Installing lib from rubygems.org ${LIB_VERSION} ..."
+
+set +e
+ATTEMPT=1
+while [  $ATTEMPT -lt 10 ]; do
+  echo "Attempt ${ATTEMPT} ..."
+
+  bundle install --without production --binstubs
+  gem install vgs_api_client -v ${LIB_VERSION}
+
+  if [[ $? == 0 ]]; then
+    echo "Installed ${LIB_VERSION}"
+    break
+  fi
+
+  ATTEMPT=$((ATTEMPT+1))
+
+  sleep 5
+done
+set -e
+
+echo "Running tests"
+bundle exec rspec ./spec/*.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vgs_api_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha202204202050
+  version: 0.0.1.alpha202204202333
 platform: ruby
 authors:
 - Very Good Security
@@ -90,6 +90,8 @@ files:
 - scripts/publish/run.sh
 - scripts/run-tests-e2e.sh
 - scripts/run-tests.sh
+- scripts/test-e2e/Dockerfile
+- scripts/test-e2e/run.sh
 - scripts/test/Dockerfile
 - scripts/test/run.sh
 - spec/api_client_spec.rb