vagrant-1cloud 1.1.11 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0eda057555fed2140559180d27019516b68ab32
-  data.tar.gz: e5caf05d8ca1bdab7656d01cde7050ee4c8a1648
+  metadata.gz: 9dd93d1fe16c6d389d7e0b7731fa1ab86cacfa25
+  data.tar.gz: 8016eac83e39d99ea70b7e660672d2e3b5d115ec
 SHA512:
-  metadata.gz: cbe5bb0ed603dca1f143161f9790f0778877b6b5262157c03d2caf69e90815ef569993913d2fc4a6c66fd186aeeb94a213fddbf8f2cd64d2230aacc6b729b5c7
-  data.tar.gz: cd9dc9f7a988967b13a88d37e7a815bc896d2a7c9504ed93d7a91bfc6a98c67840c42a744eee2f066cb5f5f2a8d97e200338f1e113aa7f7c8725a44eaf044ca3
+  metadata.gz: 5d21028f62b15d9390d4ddd8835dbb3fb05b67ec873116cdc64f9e5f7a0b0f296b39ddf3cae9a133f183e911f105638f32743e5752528ae9a0212451af5b1245
+  data.tar.gz: 64d803f4fb55997fcb336e6ba5579a0e09d8cbd4e03589149df8566b474465bec210653eccb564e3d23463b0c66685d28d10096d221ec68964f94901294f836b

data/build.sh

@@ -3,12 +3,13 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PROVIDER="onecloud"
 PLUGIN_NAME="vagrant-1cloud"
+LABEL="${PLUGIN_NAME}-build"
 PLUGIN_VERSION=$(cat ${DIR}/lib/${PLUGIN_NAME}/version.rb | grep VERSION | awk -F= '{gsub(" ","");gsub("'\''","");print $2}')
 
-docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+docker stop $(docker ps -a -q --filter label=${LABEL})
 
 docker pull docker.avtodoria.dev:5043/test/vagrant
-BUILDER_ID=$(docker run -it -d --rm --label ${PLUGIN_NAME} docker.avtodoria.dev:5043/test/vagrant)
+BUILDER_ID=$(docker run -it -d --rm --label ${LABEL} docker.avtodoria.dev:5043/test/vagrant)
 
 docker cp ${DIR}/../${PLUGIN_NAME} ${BUILDER_ID}:/tmp/
 
@@ -23,10 +24,10 @@ docker exec -i ${BUILDER_ID} bash -c "cd /tmp/${PLUGIN_NAME} && \
                                       gem push pkg/${PLUGIN_NAME}-${PLUGIN_VERSION}.gem"
 if [ $? -ne 0 ]; then
     echo "${PLUGIN_NAME} plugin was not built and released successfully!"
-    docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+    docker stop $(docker ps -a -q --filter label=${LABEL})
     exit 1
 fi
 
 echo "${PLUGIN_NAME} plugin was built and released successfully."
-docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+docker stop $(docker ps -a -q --filter label=${LABEL})
 exit 0

data/lib/vagrant-1cloud/config.rb

@@ -9,6 +9,7 @@ module VagrantPlugins
       attr_accessor :cpu
       attr_accessor :ram
       attr_accessor :hi_perf
+      attr_accessor :api_url
       attr_accessor :ca_path
       attr_accessor :private_net
       attr_accessor :ssh_key_name
@@ -22,6 +23,7 @@ module VagrantPlugins
         @cpu                = UNSET_VALUE
         @ram                = UNSET_VALUE
         @hi_perf            = UNSET_VALUE
+        @api_url            = UNSET_VALUE
         @ca_path            = UNSET_VALUE
         @private_net        = UNSET_VALUE
         @ssh_key_name       = UNSET_VALUE
@@ -36,6 +38,7 @@ module VagrantPlugins
         @cpu                = '1' if @cpu == UNSET_VALUE
         @ram                = '512' if @ram == UNSET_VALUE
         @hi_perf            = false if @hi_perf == UNSET_VALUE
+        @api_url            = 'https://api.1cloud.ru/' if @api_url == UNSET_VALUE
         @ca_path            = nil if @ca_path == UNSET_VALUE
         @private_net        = nil if @private_net == UNSET_VALUE
         @ssh_key_name       = 'Vagrant' if @ssh_key_name == UNSET_VALUE

data/lib/vagrant-1cloud/helpers/client.rb

@@ -19,7 +19,7 @@ module VagrantPlugins
           @config = machine.provider_config
           @machine = machine
           @client = Faraday.new({
-            :url => 'https://api.1cloud.ru/',
+            :url => @config.api_url,
             :ssl => {
               :ca_file => @config.ca_path
             }

data/lib/vagrant-1cloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OneCloud
-    VERSION = '1.1.11'
+    VERSION = '1.1.12'
   end
 end

data/test.sh

@@ -3,12 +3,13 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PROVIDER="onecloud"
 PLUGIN_NAME="vagrant-1cloud"
+LABEL="${PLUGIN_NAME}-test"
 PLUGIN_VERSION=$(cat ${DIR}/lib/${PLUGIN_NAME}/version.rb | grep VERSION | awk -F= '{gsub(" ","");gsub("'\''","");print $2}')
 
-docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+docker stop $(docker ps -a -q --filter label=${LABEL})
 
 docker pull docker.avtodoria.dev:5043/test/vagrant
-BUILDER_ID=$(docker run -it -d --rm --label ${PLUGIN_NAME} docker.avtodoria.dev:5043/test/vagrant)
+BUILDER_ID=$(docker run -it -d --rm --label ${LABEL} --cap-add=NET_ADMIN docker.avtodoria.dev:5043/test/vagrant)
 
 sleep 60
 
@@ -18,7 +19,7 @@ while [ "${RESULT}" != "0" ]; do
     ((COUNT++))
     if [ ${COUNT} -eq 10 ]; then
         echo "${PLUGIN_NAME} plugin was not installed successfully!"
-        docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+        docker stop $(docker ps -a -q --filter label=${LABEL})
         exit 1
     fi
     docker exec -i ${BUILDER_ID} bash -c "vagrant plugin install ${PLUGIN_NAME} --plugin-version ${PLUGIN_VERSION}"
@@ -26,13 +27,23 @@ while [ "${RESULT}" != "0" ]; do
 done
 
 docker cp ${DIR}/test/Vagrantfile ${BUILDER_ID}:/tmp/
-RESULT=$(docker exec -i ${BUILDER_ID} bash -c "cd /tmp/ && vagrant up --provider=${PROVIDER}" 2>&1)
-if [[ ! ${RESULT} =~ "The response JSON from the API" ]]; then
-    echo "${PLUGIN_NAME} plugin does not work correctly!"
-    docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
-    exit 2
-fi
-
-echo "${PLUGIN_NAME} plugin was tested successfully."
-docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
-exit 0
+
+MAPPINGS_PATH=${DIR}/wiremock_mappings
+TEMP_DIR=/tmp/wiremock/${PLUGIN_NAME}
+rm -rf $TEMP_DIR
+mkdir -p $TEMP_DIR
+cp -R $MAPPINGS_PATH $TEMP_DIR
+WIREMOCK_ID=$(docker run --label ${LABEL} -v $TEMP_DIR/wiremock_mappings:/opt/wiremock/mappings --rm -it -P -d docker.avtodoria.dev:5043/test/wiremock)
+WIREMOCK_IP=$(docker inspect $WIREMOCK_ID | jq -r '.[0].NetworkSettings.Networks.bridge.IPAddress')
+WIREMOCK_8080_PORT=$(docker inspect $WIREMOCK_ID | jq -r '.[0].NetworkSettings.Ports["8080/tcp"]' | jq -r '.[0].HostPort')
+
+#RESULT=$(docker exec -i ${BUILDER_ID} bash -c "cd /tmp/ && vagrant up --provider=${PROVIDER}" 2>&1)
+#if [[ ! ${RESULT} =~ "The response JSON from the API" ]]; then
+#    echo "${PLUGIN_NAME} plugin does not work correctly!"
+#    docker stop $(docker ps -a -q --filter label=${LABEL})
+#    exit 2
+#fi
+#
+#echo "${PLUGIN_NAME} plugin was tested successfully."
+#docker stop $(docker ps -a -q --filter label=${LABEL})
+#exit 0

data/wiremock_mappings/vagrant_up.json

@@ -0,0 +1,26 @@
+{
+  "request": {
+    "urlPattern": "/",
+    "method": "POST"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "apiVersion": "1.2",
+      "codeVersion": "2.0.0-SNAPSHOT",
+      "hostname": "webservice-hostname",
+      "path": "/api/v1/apps",
+      "instanceId": "12",
+      "requestId": "AGFRTBJU13HBGFD",
+      "data": [
+        "avtomonitor",
+        "controlpanel",
+        "reports",
+        "photoarchives"
+      ]
+    },
+    "headers": {
+      "Access-Control-Allow-Origin": "*"
+    }
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-1cloud
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - Bulat Yusupov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -97,6 +97,7 @@ files:
 - test/test_id_rsa
 - test/test_id_rsa.pub
 - vagrant-1cloud.gemspec
+- wiremock_mappings/vagrant_up.json
 homepage: 
 licenses: []
 metadata: {}