cloudkeeper 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8158ac4e36edb0f861a17631f53932f2444d660
-  data.tar.gz: 0362bb1cbb7737a2594f53b27caf0ca3f4b0549e
+  metadata.gz: b68f4e4bb882318c02878608479323a196857f2e
+  data.tar.gz: 13b08b1aae43eb6858fa726ebfe782644b72e681
 SHA512:
-  metadata.gz: 5b84c55cdcb593b9c099a49a9902eec3bace57311e63ee1957673225c5ef152831ddcd5f40888e2588609c1db0b8dfd27bbd2070f95aed010630904734138176
-  data.tar.gz: ce95a0e4622e04d09308f97cc9c99bf6238d0d00d8fb81d6bd0618a708dbae65e81931c507d0c09a4924d02add21cdc60d72aca07988a3aa410a31ad19d310d3
+  metadata.gz: c16beb7fe52106c8987ab873fd3c4be88883d3e830f08aadf3e30a8b7fe12ee15c0c0fb9f91e071e7841e01591493ce385fb325ed5a24a24b63ce6f0fb7bf9d1
+  data.tar.gz: fae35d54048e43b15d0cdc472aa98cf973bfab70322d7610f55018fd077ec4a16560129b947e4804bf9153016b23216b378f78abed6722de6684ef072ad17b89

data/.circleci/config.yml

@@ -0,0 +1,36 @@
+version: 2
+jobs:
+  build:
+    branches:
+      only:
+        - master
+    docker:
+      - image: docker:stable
+    working_directory: /root/cloudkeeper
+    steps:
+      - run: apk add --no-cache git openssh
+      - checkout
+      - setup_remote_docker
+      - run: |
+          TAG=${CIRCLE_BRANCH}
+          BRANCH=${CIRCLE_BRANCH}
+          VERSION=">= 0"
+
+          if [ "${TAG}" == "master" ]; then
+            TAG=latest
+          fi
+
+          if [ -n "${CIRCLE_TAG}" ]; then
+            TAG=${CIRCLE_TAG#v}
+            BRANCH=${TAG/%.*/.x}
+            VERSION=${TAG}
+          fi
+
+          docker build --build-arg branch=$BRANCH --build-arg version="$VERSION" -t cloudkeeper/cloudkeeper:$TAG .
+          docker login -u $DOCKER_USER -p $DOCKER_PASS
+          docker push cloudkeeper/cloudkeeper:$TAG
+deployment:
+  fake_deploy_for_cci2:
+    tag: /v.*/
+    commands:
+      - echo "make tags run in 2.0"

data/Dockerfile

@@ -0,0 +1,51 @@
+FROM ubuntu:16.04
+
+ARG branch=master
+ARG version
+
+ENV name="cloudkeeper"
+ENV spoolDir="/var/spool/${name}"
+ENV imgDir="${spoolDir}/images" \
+    runDir="/var/run/${name}" \
+    logDir="/var/log/${name}" \
+    lockDir="/var/lock/${name}" \
+    nginxLogDir="/var/log/nginx" \
+    nginxLibDir="/var/lib/nginx"
+
+LABEL application=${name} \
+      description="A tool for synchronizing appliances between AppDB and CMFs" \
+      maintainer="kimle@cesnet.cz" \
+      version=${version} \
+      branch=${branch}
+
+SHELL ["/bin/bash", "-c"]
+
+# update + dependencies
+RUN apt-get update && \
+    apt-get --assume-yes upgrade && \
+    apt-get --assume-yes install ruby qemu-utils curl nginx file
+
+# EGI trust anchors
+RUN set -o pipefail && \
+    curl -s https://dist.eugridpma.info/distribution/igtf/current/GPG-KEY-EUGridPMA-RPM-3 | apt-key add - && \
+    echo $'#### EGI Trust Anchor Distribution ####\n\
+deb http://repository.egi.eu/sw/production/cas/1/current egi-igtf core' > /etc/apt/sources.list.d/egi.list && \
+    apt-get update && \
+    apt-get --assume-yes install ca-policy-egi-core
+
+# cloudkeeper
+RUN gem install ${name} -v "${version}" --no-document
+
+# env
+RUN useradd --system --shell /bin/false --home ${spoolDir} --create-home ${name} && \
+    usermod -L ${name} && \
+    mkdir -p ${imgDir} ${runDir} ${logDir} ${lockDir} && \
+    chown -R ${name}:${name} ${spoolDir} ${runDir} ${logDir} ${lockDir} ${nginxLogDir} ${nginxLibDir}
+
+VOLUME ${imgDir}
+
+EXPOSE 7300-7400
+
+USER ${name}
+
+ENTRYPOINT ["cloudkeeper"]

data/cloudkeeper.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'vcr', '~> 3.0'
-  spec.add_development_dependency 'webmock', '~> 2.1'
+  spec.add_development_dependency 'webmock', '~> 3.0'
   spec.add_development_dependency 'diffy', '~> 3.1'
   spec.add_development_dependency 'grpc-tools', '~> 1.0'
 

data/config/cloudkeeper.yml

@@ -15,8 +15,11 @@ cloudkeeper:
     access-log-file: /var/log/cloudkeeper/nginx-access.log # File for NGINX access log
     pid-file: /var/run/cloudkeeper/nginx.pid # NGINX pid file
     ip-address: 127.0.0.1 # IP address NGINX can listen on
-    min-port: 7300 # Minimal port NGINX can listen on
-    max-port: 7400 # Maximal port NGINX can listen on
+    port: 50505 # Port NGINX can listen on
+    proxy:
+      ip-address: # Proxy IP address
+      port: # Proxy port
+      ssl: false # Whether proxy will use SSL connection
   backend:
     endpoint: 127.0.0.1:50051 # Backend's gRPC endpoint
     certificate: /etc/grid-security/backendcert.pem # Backend's certificate

data/lib/cloudkeeper/cli.rb

@@ -84,14 +84,22 @@ module Cloudkeeper
                   default: Cloudkeeper::Settings['nginx']['ip-address'],
                   type: :string,
                   desc: 'IP address NGINX can listen on'
-    method_option :'nginx-min-port',
-                  default: Cloudkeeper::Settings['nginx']['min-port'],
+    method_option :'nginx-port',
+                  default: Cloudkeeper::Settings['nginx']['port'],
                   type: :numeric,
-                  desc: 'Minimal port NGINX can listen on'
-    method_option :'nginx-max-port',
-                  default: Cloudkeeper::Settings['nginx']['max-port'],
+                  desc: 'Port NGINX can listen on'
+    method_option :'nginx-proxy-ip-address',
+                  default: Cloudkeeper::Settings['nginx']['proxy']['ip-address'],
+                  type: :string,
+                  desc: 'Proxy IP address'
+    method_option :'nginx-proxy-port',
+                  default: Cloudkeeper::Settings['nginx']['proxy']['port'],
                   type: :numeric,
-                  desc: 'Maximal port NGINX can listen on'
+                  desc: 'Proxy port'
+    method_option :'nginx-proxy-ssl',
+                  default: Cloudkeeper::Settings['nginx']['proxy']['ssl'],
+                  type: :boolean,
+                  desc: 'Whether proxy will use SSL connection'
     method_option :'backend-endpoint',
                   required: true,
                   default: Cloudkeeper::Settings['backend']['endpoint'],
@@ -142,17 +150,20 @@ module Cloudkeeper
     end
 
     def validate_configuration!
-      validate_configuration_group! :authentication,
+      validate_configuration_group! %i[authentication],
                                     %i[certificate key backend-certificate],
                                     'Authentication configuration missing'
-      validate_configuration_group! :'remote-mode',
+      validate_configuration_group! %i[remote-mode],
                                     %i[nginx-binary nginx-runtime-dir nginx-error-log-file nginx-access-log-file nginx-pid-file
-                                       nginx-ip-address nginx-min-port nginx-max-port],
+                                       nginx-ip-address nginx-port],
                                     'NGINX configuration missing'
+      validate_configuration_group! %i[remote-mode nginx-proxy-ip-address],
+                                    %i[nginx-proxy-port],
+                                    'NGINX proxy configuration missing'
     end
 
-    def validate_configuration_group!(flag, required_options, error_message)
-      return unless Cloudkeeper::Settings[flag]
+    def validate_configuration_group!(flags, required_options, error_message)
+      return unless flags.reduce(true) { |acc, elem| Cloudkeeper::Settings[elem] && acc }
 
       raise Cloudkeeper::Errors::InvalidConfigurationError, error_message unless all_options_available(required_options)
     end

data/lib/cloudkeeper/nginx/http_server.rb

@@ -3,6 +3,7 @@ require 'tempfile'
 require 'securerandom'
 require 'erb'
 require 'tilt/erb'
+require 'uri'
 
 module Cloudkeeper
   module Nginx
@@ -48,8 +49,13 @@ module Cloudkeeper
       private
 
       def fill_access_data(credentials, configuration)
+        host = configuration[:proxy_ip_address] || configuration[:ip_address]
+        port = configuration[:proxy_port] || configuration[:port]
+        scheme = configuration[:proxy_ip_address] && configuration[:proxy_ssl] ? 'https' : 'http'
+        path = configuration[:image_file]
+
         access_data.merge! credentials
-        access_data[:url] = "http://#{configuration[:ip_address]}:#{configuration[:port]}/#{configuration[:image_file]}"
+        access_data[:url] = "#{scheme}://#{host}:#{port}/#{path}"
       end
 
       def prepare_credentials
@@ -100,16 +106,15 @@ module Cloudkeeper
         nginx_configuration[:root_dir] = root_dir
         nginx_configuration[:image_file] = image_file
         nginx_configuration[:ip_address] = Cloudkeeper::Settings[:'nginx-ip-address']
-        nginx_configuration[:port] = choose_port
+        nginx_configuration[:port] = Cloudkeeper::Settings[:'nginx-port']
+        nginx_configuration[:proxy_ip_address] = Cloudkeeper::Settings[:'nginx-proxy-ip-address']
+        nginx_configuration[:proxy_port] = Cloudkeeper::Settings[:'nginx-proxy-port']
+        nginx_configuration[:proxy_ssl] = Cloudkeeper::Settings[:'nginx-proxy-ssl']
 
         logger.debug("NGINX configuration: #{nginx_configuration.inspect}")
         nginx_configuration
       end
 
-      def choose_port
-        rand(Cloudkeeper::Settings[:'nginx-min-port']..Cloudkeeper::Settings[:'nginx-max-port'])
-      end
-
       def random_string
         SecureRandom.uuid
       end

data/lib/cloudkeeper/version.rb

@@ -1,3 +1,3 @@
 module Cloudkeeper
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -318,12 +318,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -432,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Synchronize cloud appliances between AppDB and cloud platforms