fog-openstack 1.0.9 → 1.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 530da777fdef44b8a3c8fa5a17af871552a076cffe5d02ceb62c7111398e9f96
-  data.tar.gz: 347b19093860b01a5a55bf449b132ace59f7587c273aa011a7a6b7f933c45d3f
+  metadata.gz: 90f32cb63d4fc6b8d35a8c3fc4462a680a095e9ab86a66c0efb6b7ed0e2d4023
+  data.tar.gz: 9d3d2ceac51ca9abf227456f88aafe1284e8588905cb8bfb1d4db227fe36a971
 SHA512:
-  metadata.gz: 20cf27a82b8c3cd6383a502b4ca14dbf69939a654ae70d43172203be191bb9b3d1d5f89a51bfb7a3d30055cd0cf87b1ecfd2084ed8808ce92446f76d1da722b7
-  data.tar.gz: 7206050c3ae79424adec760d7d796117784c24124d9049268b9d3ab9dd19a19529d6dc6f25f87b8d5513057086023861644c931e90bd1a5ef2ade4ef0a72ac0b
+  metadata.gz: 9931dbb575db4abca720def96263dc653663087d4f636de9ac82a2dccd79047b4df700868976e689bb17acd61933a0f48a3ca76322c576bea60673536283d3a7
+  data.tar.gz: 286571d8314b7587a816bd6e89c3b7f7a72b9c79343a9313d955ec5bb0f39740f7c9be2b4d1a0f7bb241c7aacb3b288efae7f57fcc0a2ee6f2e34da2ad03cd0c

data/.github/workflows/linting.yml

@@ -0,0 +1,20 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Linting
+
+on: [push]
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+      - run: bundle install
+      - name: rubocop runs
+        run: rubocop

data/.github/workflows/main.yml

@@ -0,0 +1,37 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run unit tests
+      run: bundle exec rake tests:unit
+    - name: Run specs tests
+      run: bundle exec rake tests:spec

data/.rubocop.yml

@@ -1,41 +1,24 @@
+# Opt-in new cops
+AllCops:
+  NewCops: enable
 #
 # Overrides
 #
-AbcSize:
-  Severity: refactor
-AlignHash:
+Layout/HashAlignment:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
-BlockNesting:
-  Severity: refactor
-ClassLength:
-  Max: 150
-  Severity: refactor
-ClassCheck:
-  EnforcedStyle: kind_of?
-CollectionMethods:
-  PreferredMethods:
-    find: detect
-    find_all: select
-    map: collect
-    reduce: inject
-CyclomaticComplexity:
-  Severity: refactor
-Debugger:
-  Enabled: true
-FormatString:
-  EnforcedStyle: percent
-HashSyntax:
-  EnforcedStyle: hash_rockets
-LineLength:
+Layout/LineLength:
   Max: 120
   Severity: refactor
-MethodLength:
-  Max: 25
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+Lint/Debugger:
+  Enabled: true
+Metrics/AbcSize:
   Severity: refactor
 # Exclude test methods from BlockLength.
 Metrics/BlockLength:
-  ExcludedMethods:
+  IgnoredMethods:
   - after
   - before
   - context
@@ -44,72 +27,88 @@ Metrics/BlockLength:
   - model_tests
   - namespace
   - draw
-ParameterLists:
+Metrics/BlockNesting:
+  Severity: refactor
+Metrics/ClassLength:
+  Max: 150
+  Severity: refactor
+Metrics/CyclomaticComplexity:
+  Severity: refactor
+Metrics/MethodLength:
+  Max: 25
+  Severity: refactor
+Metrics/ParameterLists:
   Severity: refactor
-PerceivedComplexity:
+Metrics/PerceivedComplexity:
   Severity: refactor
-RedundantReturn:
+Style/ClassCheck:
+  EnforcedStyle: kind_of?
+Style/CollectionMethods:
+  PreferredMethods:
+    find: detect
+    find_all: select
+    map: collect
+    reduce: inject
+Style/FormatString:
+  EnforcedStyle: percent
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+Style/RedundantReturn:
   AllowMultipleReturnValues: true
-SignalException:
-  EnforcedStyle: only_raise
-SingleLineMethods:
-  AllowIfMethodIsEmpty: false
-SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
 Style/RegexpLiteral:
   EnforcedStyle: slashes
   AllowInnerSlashes: true
-TrivialAccessors:
+Style/SignalException:
+  EnforcedStyle: only_raise
+Style/SingleLineMethods:
+  AllowIfMethodIsEmpty: false
+Style/TrivialAccessors:
   AllowPredicates: true
 #
 # Enabled/Disabled
 #
-ClassAndModuleChildren:
-  Enabled: false
-DefEndAlignment:
+Layout/DefEndAlignment:
   AutoCorrect: true
-Documentation:
+Layout/EndAlignment:
+  AutoCorrect: true
+Layout/ExtraSpacing:
+  AutoCorrect: false # https://github.com/bbatsov/rubocop/issues/2280 <= Now closed, we should remove this
+Layout/SpaceBeforeFirstArg:
   Enabled: false
-Encoding:
+Style/ClassAndModuleChildren:
   Enabled: false
-EndAlignment:
-  AutoCorrect: true
-ExtraSpacing:
-  AutoCorrect: false # https://github.com/bbatsov/rubocop/issues/2280
-FindEach:
+Style/Documentation:
+  Enabled: false
+Style/Encoding:
   Enabled: false
-GuardClause:
+Style/GuardClause:
   Enabled: false
-IfUnlessModifier:
+Style/IfUnlessModifier:
   Enabled: false
-NumericLiterals:
+Style/NumericLiterals:
   AutoCorrect: false
   MinDigits: 7
-ParallelAssignment:
+Style/ParallelAssignment:
   Enabled: false
-PerlBackrefs:
+Style/PerlBackrefs:
   Enabled: false
-ReadWriteAttribute:
+Style/RescueModifier:
   AutoCorrect: false
-RescueModifier:
-  AutoCorrect: false
-SingleLineBlockParams:
-  Enabled: false
-SpaceBeforeFirstArg:
+Style/SingleLineBlockParams:
   Enabled: false
-SpecialGlobalVars:
+Style/SpecialGlobalVars:
   AutoCorrect: false
 Style/FrozenStringLiteralComment:
   Enabled: false
-StringLiterals:
+Style/StringLiterals:
   Enabled: false
-StringLiteralsInInterpolation:
+Style/StringLiteralsInInterpolation:
   Enabled: false
-TrailingCommaInArrayLiteral:
+Style/TrailingCommaInArrayLiteral:
   Enabled: false
-TrailingCommaInHashLiteral:
+Style/TrailingCommaInHashLiteral:
   Enabled: false
-WhileUntilModifier:
+Style/WhileUntilModifier:
   Enabled: false
-WordArray:
+Style/WordArray:
   AutoCorrect: false

data/fog-openstack.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'fog-core',  '~> 2.1'
   spec.add_dependency 'fog-json',  '>= 1.0'
-  spec.add_dependency 'ipaddress', '>= 0.8'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coveralls'
@@ -31,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "mime-types-data"
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rake',    '~> 10.0'
+  spec.add_development_dependency 'rake',    '>= 12.3.3'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'shindo',  '~> 0.3'
   spec.add_development_dependency 'vcr'

data/lib/fog/openstack/auth/name.rb

@@ -30,7 +30,7 @@ module Fog
         end
 
         def to_h(var)
-          {var => send(var)}
+          {var => send(var).to_s}
         end
       end
 

data/lib/fog/openstack/auth/token.rb

@@ -42,15 +42,19 @@ module Fog
         def authenticate(creds, options)
           connection = Fog::Core::Connection.new(creds[:uri].to_s, false, options)
 
-          request = {
+          headers = {
+            'Accept'       => 'application/json',
+            'Content-Type' => 'application/json'
+          }
+          request_options = {
             :expects => [200, 201],
-            :headers => {'Content-Type' => 'application/json'},
+            :headers => headers,
             :body    => Fog::JSON.encode(creds[:data]),
             :method  => 'POST',
             :path    => creds[:uri].path + prefix_path(creds[:uri]) + path
           }
 
-          connection.request(request)
+          connection.request(request_options)
         end
 
         def expired?

data/lib/fog/openstack/core.rb

@@ -54,7 +54,7 @@ module Fog
 
           response = @connection.request(
             params.merge(
-              :headers => headers(params.delete(:headers)),
+              :headers => headers(params[:headers]),
               :path    => "#{@path}/#{params[:path]}"
             )
           )

data/lib/fog/openstack/orchestration/models/stacks.rb

@@ -20,10 +20,11 @@ module Fog
           load_response(data, 'stacks')
         end
 
-        # Deprecated
         def find_by_id(id)
-          Fog::Logger.deprecation("#find_by_id(id) is deprecated, use #get(name, id) instead [light_black](#{caller.first})[/]")
-          find { |stack| stack.id == id }
+          data = service.show_stack(id).body['stack']
+          new(data)
+        rescue Fog::OpenStack::Orchestration::NotFound
+            nil
         end
 
         def get(arg1, arg2 = nil)

data/lib/fog/openstack/orchestration/requests/show_stack.rb

@@ -0,0 +1,26 @@
+module Fog
+    module OpenStack
+      class Orchestration
+        class Real
+          def show_stack(id)
+            request(
+              :method  => 'GET',
+              :path    => "stacks/#{id}",
+              :expects => 200
+            )
+          end
+        end
+
+        class Mock
+          def show_stack(_id)
+            stack = data[:stack].values
+
+            Excon::Response.new(
+              :body   => {'stack' => stack},
+              :status => 200
+            )
+          end
+        end
+      end
+    end
+  end

data/lib/fog/openstack/orchestration.rb

@@ -47,6 +47,7 @@ module Fog
       request :show_resource_metadata
       request :show_resource_schema
       request :show_resource_template
+      request :show_stack
       request :show_stack_details
       request :update_stack
       request :patch_stack

data/lib/fog/openstack/shared_file_system.rb

@@ -81,7 +81,7 @@ module Fog
       # availability zones
       request :list_availability_zones
 
-      # rubocop:disable LineLength, Metrics/MethodLength, Metrics/ClassLength, Metrics/AbcSize
+      # rubocop:disable Metrics/LineLength, Metrics/MethodLength, Metrics/ClassLength, Metrics/AbcSize
       class Mock
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -342,7 +342,7 @@ module Fog
            :openstack_management_url => @openstack_management_url}
         end
       end
-      # rubocop:enable LineLength, Metrics/MethodLength, Metrics/ClassLength, Metrics/AbcSize
+      # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Metrics/ClassLength, Metrics/AbcSize
 
       class Real
         include Fog::OpenStack::Core

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OpenStack
-    VERSION = '1.0.9'.freeze
+    VERSION = '1.1.0.pre'.freeze
   end
 end

data/lib/fog/openstack/volume/v3/mock.rb

@@ -0,0 +1,68 @@
+module Fog
+  module OpenStack
+    class Volume
+      class V3 < Fog::OpenStack::Volume
+        class Mock
+          def self.data
+            @data ||= Hash.new do |hash, key|
+              hash[key] = {
+                :users   => {},
+                :tenants => {},
+                :quota   => {
+                  'gigabytes' => 1000,
+                  'volumes'   => 10,
+                  'snapshots' => 10
+                }
+              }
+            end
+          end
+
+          def self.reset
+            @data = nil
+          end
+
+          def initialize(options = {})
+            @openstack_username = options[:openstack_username]
+            @openstack_tenant   = options[:openstack_tenant]
+            @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+
+            @auth_token            = Fog::Mock.random_base64(64)
+            @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+            management_url            = URI.parse(options[:openstack_auth_url])
+            management_url.port       = 8776
+            management_url.path       = '/v1'
+            @openstack_management_url = management_url.to_s
+
+            @data ||= {:users => {}}
+            unless @data[:users].find { |u| u['name'] == options[:openstack_username] }
+              id                = Fog::Mock.random_numbers(6).to_s
+              @data[:users][id] = {
+                'id'       => id,
+                'name'     => options[:openstack_username],
+                'email'    => "#{options[:openstack_username]}@mock.com",
+                'tenantId' => Fog::Mock.random_numbers(6).to_s,
+                'enabled'  => true
+              }
+            end
+          end
+
+          def data
+            self.class.data[@openstack_username]
+          end
+
+          def reset_data
+            self.class.data.delete(@openstack_username)
+          end
+
+          def credentials
+            {:provider                 => 'openstack',
+             :openstack_auth_url       => @openstack_auth_uri.to_s,
+             :openstack_auth_token     => @auth_token,
+             :openstack_management_url => @openstack_management_url}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v3/models/availability_zone.rb

@@ -0,0 +1,15 @@
+require 'fog/openstack/volume/models/availability_zone'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class AvailabilityZone < Fog::OpenStack::Volume::AvailabilityZone
+          identity :zoneName
+
+          attribute :zoneState
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v3/models/availability_zones.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/volume/v3/models/availability_zone'
+require 'fog/openstack/volume/models/availability_zones'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class AvailabilityZones < Fog::OpenStack::Collection
+          model Fog::OpenStack::Volume::V3::AvailabilityZone
+          include Fog::OpenStack::Volume::AvailabilityZones
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v3/models/backup.rb

@@ -0,0 +1,15 @@
+require 'fog/openstack/volume/models/backup'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class Backup < Fog::OpenStack::Volume::Backup
+          identity :id
+
+          superclass.attributes.each { |attrib| attribute attrib }
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v3/models/backups.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/volume/v3/models/backup'
+require 'fog/openstack/volume/models/backups'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class Backups < Fog::OpenStack::Collection
+          model Fog::OpenStack::Volume::V3::Backup
+          include Fog::OpenStack::Volume::Backups
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v3/models/snapshot.rb

@@ -0,0 +1,44 @@
+require 'fog/openstack/volume/models/snapshot'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class Snapshot < Fog::OpenStack::Volume::Snapshot
+          identity :id
+
+          attribute :name
+          attribute :status
+          attribute :description
+          attribute :metadata
+          attribute :force
+          attribute :size
+
+          def save
+            requires :name
+            data = if id.nil?
+                     service.create_snapshot(attributes[:volume_id], name, description, force)
+                   else
+                     service.update_snapshot(id, attributes.reject { |k, _v| k == :id })
+                   end
+            merge_attributes(data.body['snapshot'])
+            true
+          end
+
+          def create
+            requires :name
+
+            # volume_id, name, description, force=false
+            response = service.create_snapshot(attributes[:volume_id],
+                                               attributes[:name],
+                                               attributes[:description],
+                                               attributes[:force])
+            merge_attributes(response.body['snapshot'])
+
+            self
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v3/models/snapshots.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/volume/v3/models/snapshot'
+require 'fog/openstack/volume/models/snapshots'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class Snapshots < Fog::OpenStack::Collection
+          model Fog::OpenStack::Volume::V3::Snapshot
+          include Fog::OpenStack::Volume::Snapshots
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v3/models/transfer.rb

@@ -0,0 +1,18 @@
+require 'fog/openstack/volume/models/transfer'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class Transfer < Fog::OpenStack::Volume::Transfer
+          identity :id
+
+          attribute :auth_key, :aliases => 'authKey'
+          attribute :created_at, :aliases => 'createdAt'
+          attribute :name
+          attribute :volume_id, :aliases => 'volumeId'
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v3/models/transfers.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/volume/v3/models/transfer'
+require 'fog/openstack/volume/models/transfers'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class Transfers < Fog::OpenStack::Collection
+          model Fog::OpenStack::Volume::V3::Transfer
+          include Fog::OpenStack::Volume::Transfers
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v3/models/volume.rb

@@ -0,0 +1,37 @@
+require 'fog/openstack/volume/models/volume'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class Volume < Fog::OpenStack::Volume::Volume
+          identity :id
+
+          superclass.attributes.each { |attrib| attribute attrib }
+          attribute :name
+          attribute :description
+          attribute :tenant_id, :aliases => 'os-vol-tenant-attr:tenant_id'
+
+          def save
+            requires :name, :size
+            data = if id.nil?
+                     service.create_volume(name, description, size, attributes)
+                   else
+                     service.update_volume(id, attributes.select { |key| %i(name description metadata).include?(key) })
+                   end
+            merge_attributes(data.body['volume'])
+            true
+          end
+
+          def update(attr = nil)
+            requires :id
+            merge_attributes(
+              service.update_volume(id, attr || attributes).body['volume']
+            )
+            self
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v3/models/volume_type.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/volume/models/volume_type'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class VolumeType < Fog::OpenStack::Volume::VolumeType
+          identity :id
+
+          attribute :name
+          attribute :volume_backend_name
+        end
+      end
+    end
+  end
+end