vgs_api_client 0.0.1.alpha202204201454 → 0.0.1.alpha202204202226

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e0e2e69cd14cb53f4800053bf9f65bdd7e53f08fbafcb14c571a6020421d94c
-  data.tar.gz: 4e744fbc72af7622efacd8be019c04deea1e832f39c912ba6bf906fcddf606c2
+  metadata.gz: e3fec09563eaf1f434308d839001a287b70b773f8ebd33751d68ade7e703984b
+  data.tar.gz: 4f3b446c82be2710536be60af8c909ce3ec637dcf43313bdc9ecc8638264416b
 SHA512:
-  metadata.gz: 1b107343ffc307c64848fe7e0f3e40b3838f843a26a427772e848d878317ae8b9393eac1751cfa62d77335cd8c6682ee9f923f0f8e956125ce84fec57ff5176c
-  data.tar.gz: e30d8817ee6af2332f5eb776bba522d1f5c303335b0e174f137d4d8c4dd346db4ddd263d8d79b8b78a15ffa9557485e6df371cb1808e18dd077936c54f43ed75
+  metadata.gz: 96a3e00cccaf211a83abc4a09f21290e1d38eac9c12f2f04128e5b014848cd26a6cc235e7641cf3fb671a64242c7b592dc3cc35fe2650a723702a5a0f1c288e7
+  data.tar.gz: 060c2c46aa7f9413373b958ae0b1d818e85039ddb7171e2b9c76a3507f20c71e06141253968ce1511872b44f0b7c665662859cbb2aa3765573aed0a5d57dc0ea

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/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.alpha202204201454/ruby"
+      @user_agent = "vgs-api-client/0.0.1.alpha202204202226/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.alpha202204201454'
+  VERSION = '0.0.1.alpha202204202226'
 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.alpha202204201454 . | xargs sed -i "s/0.0.1.alpha202204201454/${LIB_VERSION}/g"
+grep -rl 0.0.1.alpha202204202226 . | xargs sed -i "s/0.0.1.alpha202204202226/${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,6 +2,5 @@
 
 set -e
 
-docker-compose build && \
-docker-compose run assemble && \
+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,32 +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.alpha202204202226 . | xargs sed -i "s/0.0.1.alpha202204202226/$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"
-  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.alpha202204201454
+  version: 0.0.1.alpha202204202226
 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