ansible_tower_client 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1b0a1ac463760d8b5494152a6e9646ed367655dfbf857f1899a322cbf89b98f
-  data.tar.gz: 643abb688c74f01c1e7caaed8fb7cb3e1e65eab2a658c1825a5dd1e7176cc398
+  metadata.gz: afa572e7a5320c8c4128c1b60a256b3becdbf63b2962e126b3295b7096f7472f
+  data.tar.gz: af3e60d79451302d1c5cfe8b9a7ee0371117370a7e002e0eccd7887f733690a3
 SHA512:
-  metadata.gz: 9f7a7d8a683736eddec813fd3e85aab35675e6bbe1cddc3da13f780e6ebe8d0672ea76bccfe0352f5cdd2255ad2500abf875b193973740e530db2e8704ed200f
-  data.tar.gz: 7d3388d96c17847d266597a5a47d31b02cd6777d819dcad8c448df4e44bf1787399f0d282c39d2ae45453db8f62efa4376a93f99acd04c641d91a1715f54eb18
+  metadata.gz: e4a3651e8cf033e8b1c8c2a012aa4f0013d721e458d5cb90f390c40abde1d9ec25429b653af29bf576ebea41c1be82c9cdd8ef499778472c612870be9387ef50
+  data.tar.gz: e0217ab79d41ad8f9cb592aa42a7d7a050e8b83077992afd28ed0d65d706fbf24973efc6c7f4686441021ee0b79bed3a08db0f87cbc10a7945b1eb35ebb89bfb

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.17.0] - 2018-07-27
+### Removed
+- Reverted support for API v2 and v2 Credentials [(#117)](https://github.com/ansible/ansible_tower_client_ruby/pull/117)
+
+### Fixed
+- Fix WorkflowJobNode#job and add tests[(#116)](https://github.com/ansible/ansible_tower_client_ruby/pull/116)
+
 ## [0.16.0] - 2018-07-06
 ### Added
 - Added support for API v2 and v2 Credentials [(#107)](https://github.com/ansible/ansible_tower_client_ruby/pull/107)
@@ -91,7 +98,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Adjusted project_spec to test on a Project [(#63)](https://github.com/ansible/ansible_tower_client_ruby/pull/63)
 
-[Unreleased]: https://github.com/ansible/ansible_tower_client_ruby/compare/v0.16.0...master
+[Unreleased]: https://github.com/ansible/ansible_tower_client_ruby/compare/v0.17.0...master
+[0.17.0]: https://github.com/ansible/ansible_tower_client_ruby/compare/v0.16.0...v0.17.0
 [0.16.0]: https://github.com/ansible/ansible_tower_client_ruby/compare/v0.15.0...v0.16.0
 [0.15.0]: https://github.com/ansible/ansible_tower_client_ruby/compare/v0.14.0...v0.15.0
 [0.14.0]: https://github.com/ansible/ansible_tower_client_ruby/compare/v0.13.0...v0.14.0

data/lib/ansible_tower_client.rb

@@ -34,8 +34,6 @@ require "ansible_tower_client/base_models/workflow_job_template"
 require "ansible_tower_client/base_models/workflow_job_template_node"
 
 require "ansible_tower_client/v2/job_template_v2"
-require "ansible_tower_client/v2/credential_v2"
-require "ansible_tower_client/v2/credential_type_v2"
 
 require "more_core_extensions/all"
 require "active_support/inflector"

data/lib/ansible_tower_client/api.rb

@@ -6,10 +6,9 @@ module AnsibleTowerClient
 
     DEFAULT_ERROR_MSG = "An unknown error was returned from the provider".freeze
 
-    attr_reader :instance, :api_version
-    def initialize(connection, api_version)
-      @instance    = connection
-      @api_version = api_version
+    attr_reader :instance
+    def initialize(connection)
+      @instance = connection
     end
 
     def config
@@ -36,11 +35,6 @@ module AnsibleTowerClient
       Collection.new(self, credential_class)
     end
 
-    def credential_types
-      raise AnsibleTowerClient::UnsupportedApiError, 'requires API v2 or higher' if api_version?(1)
-      Collection.new(self, credential_type_class)
-    end
-
     def groups
       Collection.new(self, group_class)
     end
@@ -152,17 +146,7 @@ module AnsibleTowerClient
     end
 
     def credential_class
-      @credential_class ||= begin
-        if api_version?(2)
-          AnsibleTowerClient::CredentialV2
-        else
-          AnsibleTowerClient::Credential
-        end
-      end
-    end
-
-    def credential_type_class
-      @credential_type_class ||= AnsibleTowerClient::CredentialTypeV2
+      @credential_class ||= AnsibleTowerClient::Credential
     end
 
     def group_class
@@ -199,7 +183,7 @@ module AnsibleTowerClient
 
     def job_template_class
       @job_template_class ||= begin
-        if awx_version_between?(2, 3)
+        if Gem::Version.new(version).between?(Gem::Version.new(2), Gem::Version.new(3))
           AnsibleTowerClient::JobTemplateV2
         else
           AnsibleTowerClient::JobTemplate
@@ -254,13 +238,5 @@ module AnsibleTowerClient
       return original if instance.url_prefix.path == "/"
       File.join(instance.url_prefix.path, Regexp.last_match[1])
     end
-
-    def awx_version_between?(min, max)
-      Gem::Version.new(version).between?(Gem::Version.new(min), Gem::Version.new(max))
-    end
-
-    def api_version?(desired)
-      Gem::Version.new(api_version).eql?(Gem::Version.new(desired))
-    end
   end
 end

data/lib/ansible_tower_client/base_models/workflow_job_node.rb

@@ -5,7 +5,7 @@ module AnsibleTowerClient
     end
 
     def job
-      job_id.nil? ? nil : api.jobs.find(job_id)
+      api.jobs.find(job_id) if respond_to?(:job_id) && job_id
     end
   end
 end

data/lib/ansible_tower_client/connection.rb

@@ -1,70 +1,31 @@
 module AnsibleTowerClient
   class Connection
-    attr_reader :options
+    attr_reader :connection
 
-    # Options:
-    # - base_url: you have two options here:
-    #   a) pass in only scheme and hostname e.g. 'https://localhost:54321' to allow client to connect to both api v1
-    #      and v2 versions like this: `client.api(:version => 1)` and `client.api(:version => 2)`. This requires ansible
-    #      tower API being accessible directly at `https://localhost:54321/api/v1` and `https://localhost:54321/api/v2`.
-    #   b) pass in a complete api address e.g. 'https://localhost:54321/tower'. Client will then connect to the path
-    #      directly and it's your responsibility to know what version of API is there.
-    # - username
-    # - password
-    # - verify_ssl
-    def initialize(options = {})
+    def initialize(options = nil)
       raise "Credentials are required" unless options[:username] && options[:password]
       raise ":base_url is required" unless options[:base_url]
-      logger = options[:logger] || AnsibleTowerClient.logger
+      logger     = options[:logger] || AnsibleTowerClient.logger
+      verify_ssl = options[:verify_ssl] || OpenSSL::SSL::VERIFY_PEER
+      verify_ssl = verify_ssl == OpenSSL::SSL::VERIFY_NONE ? false : true
 
       require 'faraday'
       require 'faraday_middleware'
       require 'ansible_tower_client/middleware/raise_tower_error'
       Faraday::Response.register_middleware :raise_tower_error => -> { Middleware::RaiseTowerError }
-
-      @options = {
-        :url        => options[:base_url],
-        :verify_ssl => (options[:verify_ssl] || OpenSSL::SSL::VERIFY_PEER) != OpenSSL::SSL::VERIFY_NONE,
-        :username   => options[:username],
-        :password   => options[:password],
-        :logger     => logger,
-      }
-
-      reset
-    end
-
-    def connection(url:, username:, password:, verify_ssl: false, logger: nil)
-      Faraday.new(url, :ssl => {:verify => verify_ssl}) do |f|
+      @connection = Faraday.new(options[:base_url], :ssl => {:verify => verify_ssl}) do |f|
         f.use(FaradayMiddleware::EncodeJson)
         f.use(FaradayMiddleware::FollowRedirects, :limit => 3, :standards_compliant => true)
         f.request(:url_encoded)
         f.response(:raise_tower_error)
         f.response(:logger, logger)
         f.adapter(Faraday.default_adapter)
-        f.basic_auth(username, password)
+        f.basic_auth(options[:username], options[:password])
       end
     end
 
-    def api(version: 2)
-      @api[version] ||= begin
-        # Build uri path.
-        options = @options.clone.tap do |opts|
-          opts[:url] = URI(opts[:url]).tap { |url| url.path = url_path_for_version(url.path, version) }
-        end
-
-        Api.new(connection(**options), version)
-      end
-    end
-
-    def reset
-      @api = {}
-    end
-
-    private
-
-    def url_path_for_version(orig_path, api_version)
-      return orig_path unless orig_path.sub(/\/$/, "").empty?
-      "/api/v#{api_version}"
+    def api
+      @api ||= Api.new(connection)
     end
   end
 end

data/lib/ansible_tower_client/exception.rb

@@ -7,5 +7,4 @@ module AnsibleTowerClient
   class ResourceNotFoundError  < ClientError; end
   class SSLError               < ClientError; end
   class UnlicensedFeatureError < ClientError; end
-  class UnsupportedApiError    < ClientError; end
 end

data/lib/ansible_tower_client/version.rb

@@ -1,3 +1,3 @@
 module AnsibleTowerClient
-  VERSION = "0.16.0".freeze
+  VERSION = "0.17.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansible_tower_client
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Brandon Dunne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -175,8 +175,6 @@ files:
 - lib/ansible_tower_client/logging.rb
 - lib/ansible_tower_client/middleware/raise_tower_error.rb
 - lib/ansible_tower_client/null_logger.rb
-- lib/ansible_tower_client/v2/credential_type_v2.rb
-- lib/ansible_tower_client/v2/credential_v2.rb
 - lib/ansible_tower_client/v2/job_template_v2.rb
 - lib/ansible_tower_client/version.rb
 homepage: https://github.com/Ansible/ansible_tower_client_ruby

data/lib/ansible_tower_client/v2/credential_type_v2.rb

@@ -1,9 +0,0 @@
-module AnsibleTowerClient
-  class CredentialTypeV2 < BaseModel
-    class Inputs < BaseModel; end
-
-    def self.endpoint
-      'credential_types'
-    end
-  end
-end

data/lib/ansible_tower_client/v2/credential_v2.rb

@@ -1,13 +0,0 @@
-module AnsibleTowerClient
-  class CredentialV2 < Credential
-    class Inputs < BaseModel
-      def size
-        @raw_hash.keys.size
-      end
-    end
-
-    def self.endpoint
-      'credentials'
-    end
-  end
-end