v2 api support

lib/ansible_tower_client.rb

@@ -14,6 +14,7 @@
 require "ansible_tower_client/base_models/activity_stream"
 require "ansible_tower_client/base_models/ad_hoc_command"
 require "ansible_tower_client/base_models/credential"
+require "ansible_tower_client/base_models/credential_type"
 require "ansible_tower_client/base_models/group"
 require "ansible_tower_client/base_models/host"
 require "ansible_tower_client/base_models/inventory"

lib/ansible_tower_client/api.rb

@@ -35,6 +35,10 @@ def credentials
       Collection.new(self, credential_class)
     end
 
+    def credential_types
+      Collection.new(self, AnsibleTowerClient::CredentialType)
+    end
+
     def groups
       Collection.new(self, group_class)
     end

lib/ansible_tower_client/base_models/credential.rb

@@ -1,7 +1,43 @@
 module AnsibleTowerClient
   class Credential < BaseModel
     def override_raw_attributes
-      { :organization => :organization_id }
+      {
+        :organization    => :organization_id,
+        :credential_type => :credential_type_id,
+      }
+    end
+
+    # https://github.com/ansible/awx/blob/1328fb80a02ef4e37bc021eb07d4be041a41f937/awx/main/models/credential/__init__.py#L76-L90
+    KIND_CHOICES = {
+      'ssh'        => 'Machine',
+      'net'        => 'Network',
+      'scm'        => 'Source Control',
+      'aws'        => 'Amazon Web Services',
+      'vmware'     => 'VMware vCenter',
+      'satellite6' => 'Red Hat Satellite 6',
+      'cloudforms' => 'Red Hat CloudForms',
+      'gce'        => 'Google Compute Engine',
+      'azure_rm'   => 'Microsoft Azure Resource Manager',
+      'openstack'  => 'OpenStack',
+      'rhv'        => 'Red Hat Virtualization',
+      'insights'   => 'Insights',
+      'tower'      => 'Ansible Tower',
+    }.invert.freeze
+
+    # https://github.com/ansible/awx/blob/1328fb80a02ef4e37bc021eb07d4be041a41f937/awx/main/models/credential/__init__.py#L301
+    def kind
+      @data['kind'] ||= begin
+        kind = credential_type.kind
+        kind == 'cloud' && KIND_CHOICES[credential_type.name] || kind
+      end.to_s
+    end
+
+    def credential_type
+      @credential_type ||= api.credential_types.find(credential_type_id)
+    end
+
+    def vault_password
+      @data['vault_password'] ||= inputs.vault_password.to_s
     end
   end
 end

lib/ansible_tower_client/base_models/credential_type.rb

@@ -0,0 +1,4 @@
+module AnsibleTowerClient
+  class CredentialType < BaseModel
+  end
+end

lib/ansible_tower_client/base_models/project.rb

@@ -19,8 +19,19 @@ def update
     end
 
     def last_update
-      return if related['last_update'].blank?
-      api.project_updates.find(related['last_update'])
+      return @last_update if defined? @last_update
+      return @last_update = nil unless related.raw_hash.key?('last_update')
+      return @last_update = nil if (update_id = related.last_update).blank?
+
+      unless update_id.is_a?(Numeric) || update_id =~ /\A\d+\z/
+        if raw_hash.key?('summary_fields') && summary_fields.raw_hash.key?('last_update')
+          update_id = summary_fields.last_update.id
+        else
+          /\/(?'update_id'\d+)\/?\z/ =~ update_id
+        end
+      end
+
+      @last_update = update_id.blank? ? nil : api.project_updates.find(update_id)
     end
   end
 end

lib/ansible_tower_client/middleware/raise_tower_error.rb

@@ -23,7 +23,12 @@ def on_complete(env)
       end
 
       def response_values(env)
-        {:status => env.status, :headers => env.response_headers, :body => env.body}
+        {
+          :headers => env.response_headers,
+          :status  => env.status,
+          :body    => env.body,
+          :url     => env.url,
+        }
       end
     end
   end