google-api-client 0.10.1 → 0.10.2

data/generated/google/apis/cloudkms_v1/representations.rb

@@ -22,6 +22,18 @@ module Google
   module Apis
     module CloudkmsV1
       
+      class Location
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class ListCryptoKeysResponse
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class Condition
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -52,49 +64,49 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class ListLocationsResponse
+      class Policy
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class Policy
+      class ListLocationsResponse
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class EncryptResponse
+      class KeyRing
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class KeyRing
+      class EncryptResponse
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class UpdateCryptoKeyPrimaryVersionRequest
+      class RestoreCryptoKeyVersionRequest
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class RestoreCryptoKeyVersionRequest
+      class UpdateCryptoKeyPrimaryVersionRequest
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class DataAccessOptions
+      class ListKeyRingsResponse
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class ListKeyRingsResponse
+      class DataAccessOptions
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
@@ -148,13 +160,13 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class Rule
+      class CryptoKey
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class CryptoKey
+      class Rule
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
@@ -179,15 +191,23 @@ module Google
       end
       
       class Location
-        class Representation < Google::Apis::Core::JsonRepresentation; end
-      
-        include Google::Apis::Core::JsonObjectSupport
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :name, as: 'name'
+          property :location_id, as: 'locationId'
+          hash :metadata, as: 'metadata'
+          hash :labels, as: 'labels'
+        end
       end
       
       class ListCryptoKeysResponse
-        class Representation < Google::Apis::Core::JsonRepresentation; end
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :next_page_token, as: 'nextPageToken'
+          collection :crypto_keys, as: 'cryptoKeys', class: Google::Apis::CloudkmsV1::CryptoKey, decorator: Google::Apis::CloudkmsV1::CryptoKey::Representation
       
-        include Google::Apis::Core::JsonObjectSupport
+          property :total_size, as: 'totalSize'
+        end
       end
       
       class Condition
@@ -195,10 +215,10 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           property :op, as: 'op'
           property :svc, as: 'svc'
-          property :sys, as: 'sys'
           property :value, as: 'value'
-          collection :values, as: 'values'
+          property :sys, as: 'sys'
           property :iam, as: 'iam'
+          collection :values, as: 'values'
         end
       end
       
@@ -232,15 +252,6 @@ module Google
         end
       end
       
-      class ListLocationsResponse
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          collection :locations, as: 'locations', class: Google::Apis::CloudkmsV1::Location, decorator: Google::Apis::CloudkmsV1::Location::Representation
-      
-          property :next_page_token, as: 'nextPageToken'
-        end
-      end
-      
       class Policy
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -256,26 +267,28 @@ module Google
         end
       end
       
-      class EncryptResponse
+      class ListLocationsResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :ciphertext, :base64 => true, as: 'ciphertext'
-          property :name, as: 'name'
+          collection :locations, as: 'locations', class: Google::Apis::CloudkmsV1::Location, decorator: Google::Apis::CloudkmsV1::Location::Representation
+      
+          property :next_page_token, as: 'nextPageToken'
         end
       end
       
       class KeyRing
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :create_time, as: 'createTime'
           property :name, as: 'name'
+          property :create_time, as: 'createTime'
         end
       end
       
-      class UpdateCryptoKeyPrimaryVersionRequest
+      class EncryptResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :crypto_key_version_id, as: 'cryptoKeyVersionId'
+          property :name, as: 'name'
+          property :ciphertext, :base64 => true, as: 'ciphertext'
         end
       end
       
@@ -285,9 +298,10 @@ module Google
         end
       end
       
-      class DataAccessOptions
+      class UpdateCryptoKeyPrimaryVersionRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
+          property :crypto_key_version_id, as: 'cryptoKeyVersionId'
         end
       end
       
@@ -301,24 +315,30 @@ module Google
         end
       end
       
+      class DataAccessOptions
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+        end
+      end
+      
       class AuditConfig
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          collection :exempted_members, as: 'exemptedMembers'
           property :service, as: 'service'
           collection :audit_log_configs, as: 'auditLogConfigs', class: Google::Apis::CloudkmsV1::AuditLogConfig, decorator: Google::Apis::CloudkmsV1::AuditLogConfig::Representation
       
+          collection :exempted_members, as: 'exemptedMembers'
         end
       end
       
       class CryptoKeyVersion
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
+          property :destroy_time, as: 'destroyTime'
+          property :create_time, as: 'createTime'
           property :state, as: 'state'
           property :name, as: 'name'
           property :destroy_event_time, as: 'destroyEventTime'
-          property :destroy_time, as: 'destroyTime'
-          property :create_time, as: 'createTime'
         end
       end
       
@@ -339,8 +359,8 @@ module Google
       class EncryptRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :plaintext, :base64 => true, as: 'plaintext'
           property :additional_authenticated_data, :base64 => true, as: 'additionalAuthenticatedData'
+          property :plaintext, :base64 => true, as: 'plaintext'
         end
       end
       
@@ -367,21 +387,6 @@ module Google
         end
       end
       
-      class Rule
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          collection :not_in, as: 'notIn'
-          property :description, as: 'description'
-          collection :conditions, as: 'conditions', class: Google::Apis::CloudkmsV1::Condition, decorator: Google::Apis::CloudkmsV1::Condition::Representation
-      
-          collection :log_config, as: 'logConfig', class: Google::Apis::CloudkmsV1::LogConfig, decorator: Google::Apis::CloudkmsV1::LogConfig::Representation
-      
-          collection :in, as: 'in'
-          collection :permissions, as: 'permissions'
-          property :action, as: 'action'
-        end
-      end
-      
       class CryptoKey
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -395,15 +400,30 @@ module Google
         end
       end
       
+      class Rule
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          collection :log_config, as: 'logConfig', class: Google::Apis::CloudkmsV1::LogConfig, decorator: Google::Apis::CloudkmsV1::LogConfig::Representation
+      
+          collection :in, as: 'in'
+          collection :permissions, as: 'permissions'
+          property :action, as: 'action'
+          collection :not_in, as: 'notIn'
+          property :description, as: 'description'
+          collection :conditions, as: 'conditions', class: Google::Apis::CloudkmsV1::Condition, decorator: Google::Apis::CloudkmsV1::Condition::Representation
+      
+        end
+      end
+      
       class LogConfig
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
+          property :cloud_audit, as: 'cloudAudit', class: Google::Apis::CloudkmsV1::CloudAuditOptions, decorator: Google::Apis::CloudkmsV1::CloudAuditOptions::Representation
+      
           property :counter, as: 'counter', class: Google::Apis::CloudkmsV1::CounterOptions, decorator: Google::Apis::CloudkmsV1::CounterOptions::Representation
       
           property :data_access, as: 'dataAccess', class: Google::Apis::CloudkmsV1::DataAccessOptions, decorator: Google::Apis::CloudkmsV1::DataAccessOptions::Representation
       
-          property :cloud_audit, as: 'cloudAudit', class: Google::Apis::CloudkmsV1::CloudAuditOptions, decorator: Google::Apis::CloudkmsV1::CloudAuditOptions::Representation
-      
         end
       end
       
@@ -423,26 +443,6 @@ module Google
           property :additional_authenticated_data, :base64 => true, as: 'additionalAuthenticatedData'
         end
       end
-      
-      class Location
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :name, as: 'name'
-          property :location_id, as: 'locationId'
-          hash :metadata, as: 'metadata'
-          hash :labels, as: 'labels'
-        end
-      end
-      
-      class ListCryptoKeysResponse
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :next_page_token, as: 'nextPageToken'
-          collection :crypto_keys, as: 'cryptoKeys', class: Google::Apis::CloudkmsV1::CryptoKey, decorator: Google::Apis::CloudkmsV1::CryptoKey::Representation
-      
-          property :total_size, as: 'totalSize'
-        end
-      end
     end
   end
 end

data/generated/google/apis/cloudkms_v1/service.rb

@@ -33,16 +33,16 @@ module Google
       #
       # @see https://cloud.google.com/kms/
       class CloudKMSService < Google::Apis::Core::BaseService
-        # @return [String]
-        #  Available to use for quota purposes for server-side applications. Can be any
-        #  arbitrary string assigned to a user, but should not exceed 40 characters.
-        attr_accessor :quota_user
-
         # @return [String]
         #  API key. Your API key identifies your project and provides you with API access,
         #  quota, and reports. Required unless you provide an OAuth 2.0 token.
         attr_accessor :key
 
+        # @return [String]
+        #  Available to use for quota purposes for server-side applications. Can be any
+        #  arbitrary string assigned to a user, but should not exceed 40 characters.
+        attr_accessor :quota_user
+
         def initialize
           super('https://cloudkms.googleapis.com/', '')
         end
@@ -50,12 +50,12 @@ module Google
         # Lists information about the supported locations for this service.
         # @param [String] name
         #   The resource that owns the locations collection, if applicable.
-        # @param [String] filter
-        #   The standard list filter.
         # @param [String] page_token
         #   The standard list page token.
         # @param [Fixnum] page_size
         #   The standard list page size.
+        # @param [String] filter
+        #   The standard list filter.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
@@ -73,14 +73,14 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_project_locations(name, filter: nil, page_token: nil, page_size: nil, quota_user: nil, fields: nil, options: nil, &block)
+        def list_project_locations(name, page_token: nil, page_size: nil, filter: nil, quota_user: nil, fields: nil, options: nil, &block)
           command =  make_simple_command(:get, 'v1/{+name}/locations', options)
           command.response_representation = Google::Apis::CloudkmsV1::ListLocationsResponse::Representation
           command.response_class = Google::Apis::CloudkmsV1::ListLocationsResponse
           command.params['name'] = name unless name.nil?
-          command.query['filter'] = filter unless filter.nil?
           command.query['pageToken'] = page_token unless page_token.nil?
           command.query['pageSize'] = page_size unless page_size.nil?
+          command.query['filter'] = filter unless filter.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)
@@ -116,6 +116,79 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
+        # Create a new KeyRing in a given Project and Location.
+        # @param [String] parent
+        #   Required. The resource name of the location associated with the
+        #   KeyRings, in the format `projects/*/locations/*`.
+        # @param [Google::Apis::CloudkmsV1::KeyRing] key_ring_object
+        # @param [String] key_ring_id
+        #   Required. It must be unique within a location and match the regular
+        #   expression `[a-zA-Z0-9_-]`1,63``
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::CloudkmsV1::KeyRing] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::CloudkmsV1::KeyRing]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def create_project_location_key_ring(parent, key_ring_object = nil, key_ring_id: nil, quota_user: nil, fields: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v1/{+parent}/keyRings', options)
+          command.request_representation = Google::Apis::CloudkmsV1::KeyRing::Representation
+          command.request_object = key_ring_object
+          command.response_representation = Google::Apis::CloudkmsV1::KeyRing::Representation
+          command.response_class = Google::Apis::CloudkmsV1::KeyRing
+          command.params['parent'] = parent unless parent.nil?
+          command.query['keyRingId'] = key_ring_id unless key_ring_id.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['fields'] = fields unless fields.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Sets the access control policy on the specified resource. Replaces any
+        # existing policy.
+        # @param [String] resource
+        #   REQUIRED: The resource for which the policy is being specified.
+        #   See the operation documentation for the appropriate value for this field.
+        # @param [Google::Apis::CloudkmsV1::SetIamPolicyRequest] set_iam_policy_request_object
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::CloudkmsV1::Policy] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::CloudkmsV1::Policy]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def set_key_ring_iam_policy(resource, set_iam_policy_request_object = nil, quota_user: nil, fields: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v1/{+resource}:setIamPolicy', options)
+          command.request_representation = Google::Apis::CloudkmsV1::SetIamPolicyRequest::Representation
+          command.request_object = set_iam_policy_request_object
+          command.response_representation = Google::Apis::CloudkmsV1::Policy::Representation
+          command.response_class = Google::Apis::CloudkmsV1::Policy
+          command.params['resource'] = resource unless resource.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['fields'] = fields unless fields.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
         # Gets the access control policy for a resource.
         # Returns an empty policy if the resource exists and does not have a policy
         # set.
@@ -259,120 +332,6 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Create a new KeyRing in a given Project and Location.
-        # @param [String] parent
-        #   Required. The resource name of the location associated with the
-        #   KeyRings, in the format `projects/*/locations/*`.
-        # @param [Google::Apis::CloudkmsV1::KeyRing] key_ring_object
-        # @param [String] key_ring_id
-        #   Required. It must be unique within a location and match the regular
-        #   expression `[a-zA-Z0-9_-]`1,63``
-        # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
-        # @param [Google::Apis::RequestOptions] options
-        #   Request-specific options
-        #
-        # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::CloudkmsV1::KeyRing] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::CloudkmsV1::KeyRing]
-        #
-        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
-        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
-        # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def create_project_location_key_ring(parent, key_ring_object = nil, key_ring_id: nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v1/{+parent}/keyRings', options)
-          command.request_representation = Google::Apis::CloudkmsV1::KeyRing::Representation
-          command.request_object = key_ring_object
-          command.response_representation = Google::Apis::CloudkmsV1::KeyRing::Representation
-          command.response_class = Google::Apis::CloudkmsV1::KeyRing
-          command.params['parent'] = parent unless parent.nil?
-          command.query['keyRingId'] = key_ring_id unless key_ring_id.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['fields'] = fields unless fields.nil?
-          execute_or_queue_command(command, &block)
-        end
-        
-        # Sets the access control policy on the specified resource. Replaces any
-        # existing policy.
-        # @param [String] resource
-        #   REQUIRED: The resource for which the policy is being specified.
-        #   See the operation documentation for the appropriate value for this field.
-        # @param [Google::Apis::CloudkmsV1::SetIamPolicyRequest] set_iam_policy_request_object
-        # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
-        # @param [Google::Apis::RequestOptions] options
-        #   Request-specific options
-        #
-        # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::CloudkmsV1::Policy] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::CloudkmsV1::Policy]
-        #
-        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
-        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
-        # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def set_key_ring_iam_policy(resource, set_iam_policy_request_object = nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v1/{+resource}:setIamPolicy', options)
-          command.request_representation = Google::Apis::CloudkmsV1::SetIamPolicyRequest::Representation
-          command.request_object = set_iam_policy_request_object
-          command.response_representation = Google::Apis::CloudkmsV1::Policy::Representation
-          command.response_class = Google::Apis::CloudkmsV1::Policy
-          command.params['resource'] = resource unless resource.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['fields'] = fields unless fields.nil?
-          execute_or_queue_command(command, &block)
-        end
-        
-        # Lists CryptoKeys.
-        # @param [String] parent
-        #   Required. The resource name of the KeyRing to list, in the format
-        #   `projects/*/locations/*/keyRings/*`.
-        # @param [String] page_token
-        #   Optional pagination token, returned earlier via
-        #   ListCryptoKeysResponse.next_page_token.
-        # @param [Fixnum] page_size
-        #   Optional limit on the number of CryptoKeys to include in the
-        #   response.  Further CryptoKeys can subsequently be obtained by
-        #   including the ListCryptoKeysResponse.next_page_token in a subsequent
-        #   request.  If unspecified, the server will pick an appropriate default.
-        # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
-        # @param [Google::Apis::RequestOptions] options
-        #   Request-specific options
-        #
-        # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::CloudkmsV1::ListCryptoKeysResponse] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::CloudkmsV1::ListCryptoKeysResponse]
-        #
-        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
-        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
-        # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_project_location_key_ring_crypto_keys(parent, page_token: nil, page_size: nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v1/{+parent}/cryptoKeys', options)
-          command.response_representation = Google::Apis::CloudkmsV1::ListCryptoKeysResponse::Representation
-          command.response_class = Google::Apis::CloudkmsV1::ListCryptoKeysResponse
-          command.params['parent'] = parent unless parent.nil?
-          command.query['pageToken'] = page_token unless page_token.nil?
-          command.query['pageSize'] = page_size unless page_size.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['fields'] = fields unless fields.nil?
-          execute_or_queue_command(command, &block)
-        end
-        
         # Encrypt data, so that it can only be recovered by a call to Decrypt.
         # @param [String] name
         #   Required. The resource name of the CryptoKey or CryptoKeyVersion
@@ -549,10 +508,13 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Returns metadata for a given CryptoKey, as well as its
-        # primary CryptoKeyVersion.
+        # Update a CryptoKey.
         # @param [String] name
-        #   The name of the CryptoKey to get.
+        #   Output only. The resource name for this CryptoKey in the format
+        #   `projects/*/locations/*/keyRings/*/cryptoKeys/*`.
+        # @param [Google::Apis::CloudkmsV1::CryptoKey] crypto_key_object
+        # @param [String] update_mask
+        #   Required list of fields to be updated in this request.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
@@ -570,23 +532,23 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_project_location_key_ring_crypto_key(name, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v1/{+name}', options)
+        def patch_project_location_key_ring_crypto_key(name, crypto_key_object = nil, update_mask: nil, quota_user: nil, fields: nil, options: nil, &block)
+          command =  make_simple_command(:patch, 'v1/{+name}', options)
+          command.request_representation = Google::Apis::CloudkmsV1::CryptoKey::Representation
+          command.request_object = crypto_key_object
           command.response_representation = Google::Apis::CloudkmsV1::CryptoKey::Representation
           command.response_class = Google::Apis::CloudkmsV1::CryptoKey
           command.params['name'] = name unless name.nil?
+          command.query['updateMask'] = update_mask unless update_mask.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Update a CryptoKey.
+        # Returns metadata for a given CryptoKey, as well as its
+        # primary CryptoKeyVersion.
         # @param [String] name
-        #   Output only. The resource name for this CryptoKey in the format
-        #   `projects/*/locations/*/keyRings/*/cryptoKeys/*`.
-        # @param [Google::Apis::CloudkmsV1::CryptoKey] crypto_key_object
-        # @param [String] update_mask
-        #   Required list of fields to be updated in this request.
+        #   The name of the CryptoKey to get.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
@@ -604,14 +566,11 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def patch_project_location_key_ring_crypto_key(name, crypto_key_object = nil, update_mask: nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:patch, 'v1/{+name}', options)
-          command.request_representation = Google::Apis::CloudkmsV1::CryptoKey::Representation
-          command.request_object = crypto_key_object
+        def get_project_location_key_ring_crypto_key(name, quota_user: nil, fields: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v1/{+name}', options)
           command.response_representation = Google::Apis::CloudkmsV1::CryptoKey::Representation
           command.response_class = Google::Apis::CloudkmsV1::CryptoKey
           command.params['name'] = name unless name.nil?
-          command.query['updateMask'] = update_mask unless update_mask.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)
@@ -690,15 +649,18 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Restore a CryptoKeyVersion in the
-        # DESTROY_SCHEDULED,
-        # state.
-        # Upon restoration of the CryptoKeyVersion, state
-        # will be set to DISABLED,
-        # and destroy_time will be cleared.
-        # @param [String] name
-        #   The resource name of the CryptoKeyVersion to restore.
-        # @param [Google::Apis::CloudkmsV1::RestoreCryptoKeyVersionRequest] restore_crypto_key_version_request_object
+        # Lists CryptoKeys.
+        # @param [String] parent
+        #   Required. The resource name of the KeyRing to list, in the format
+        #   `projects/*/locations/*/keyRings/*`.
+        # @param [String] page_token
+        #   Optional pagination token, returned earlier via
+        #   ListCryptoKeysResponse.next_page_token.
+        # @param [Fixnum] page_size
+        #   Optional limit on the number of CryptoKeys to include in the
+        #   response.  Further CryptoKeys can subsequently be obtained by
+        #   including the ListCryptoKeysResponse.next_page_token in a subsequent
+        #   request.  If unspecified, the server will pick an appropriate default.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
@@ -708,29 +670,76 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::CloudkmsV1::CryptoKeyVersion] parsed result object
+        # @yieldparam result [Google::Apis::CloudkmsV1::ListCryptoKeysResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::CloudkmsV1::CryptoKeyVersion]
+        # @return [Google::Apis::CloudkmsV1::ListCryptoKeysResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def restore_crypto_key_version(name, restore_crypto_key_version_request_object = nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v1/{+name}:restore', options)
-          command.request_representation = Google::Apis::CloudkmsV1::RestoreCryptoKeyVersionRequest::Representation
-          command.request_object = restore_crypto_key_version_request_object
-          command.response_representation = Google::Apis::CloudkmsV1::CryptoKeyVersion::Representation
-          command.response_class = Google::Apis::CloudkmsV1::CryptoKeyVersion
-          command.params['name'] = name unless name.nil?
+        def list_project_location_key_ring_crypto_keys(parent, page_token: nil, page_size: nil, quota_user: nil, fields: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v1/{+parent}/cryptoKeys', options)
+          command.response_representation = Google::Apis::CloudkmsV1::ListCryptoKeysResponse::Representation
+          command.response_class = Google::Apis::CloudkmsV1::ListCryptoKeysResponse
+          command.params['parent'] = parent unless parent.nil?
+          command.query['pageToken'] = page_token unless page_token.nil?
+          command.query['pageSize'] = page_size unless page_size.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Returns metadata for a given CryptoKeyVersion.
-        # @param [String] name
-        #   The name of the CryptoKeyVersion to get.
+        # Lists CryptoKeyVersions.
+        # @param [String] parent
+        #   Required. The resource name of the CryptoKey to list, in the format
+        #   `projects/*/locations/*/keyRings/*/cryptoKeys/*`.
+        # @param [String] page_token
+        #   Optional pagination token, returned earlier via
+        #   ListCryptoKeyVersionsResponse.next_page_token.
+        # @param [Fixnum] page_size
+        #   Optional limit on the number of CryptoKeyVersions to
+        #   include in the response. Further CryptoKeyVersions can
+        #   subsequently be obtained by including the
+        #   ListCryptoKeyVersionsResponse.next_page_token in a subsequent request.
+        #   If unspecified, the server will pick an appropriate default.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::CloudkmsV1::ListCryptoKeyVersionsResponse] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::CloudkmsV1::ListCryptoKeyVersionsResponse]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def list_project_location_key_ring_crypto_key_crypto_key_versions(parent, page_token: nil, page_size: nil, quota_user: nil, fields: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v1/{+parent}/cryptoKeyVersions', options)
+          command.response_representation = Google::Apis::CloudkmsV1::ListCryptoKeyVersionsResponse::Representation
+          command.response_class = Google::Apis::CloudkmsV1::ListCryptoKeyVersionsResponse
+          command.params['parent'] = parent unless parent.nil?
+          command.query['pageToken'] = page_token unless page_token.nil?
+          command.query['pageSize'] = page_size unless page_size.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['fields'] = fields unless fields.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Create a new CryptoKeyVersion in a CryptoKey.
+        # The server will assign the next sequential id. If unset,
+        # state will be set to
+        # ENABLED.
+        # @param [String] parent
+        #   Required. The name of the CryptoKey associated with
+        #   the CryptoKeyVersions.
+        # @param [Google::Apis::CloudkmsV1::CryptoKeyVersion] crypto_key_version_object
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
@@ -748,28 +757,31 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_project_location_key_ring_crypto_key_crypto_key_version(name, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v1/{+name}', options)
+        def create_project_location_key_ring_crypto_key_crypto_key_version(parent, crypto_key_version_object = nil, quota_user: nil, fields: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v1/{+parent}/cryptoKeyVersions', options)
+          command.request_representation = Google::Apis::CloudkmsV1::CryptoKeyVersion::Representation
+          command.request_object = crypto_key_version_object
           command.response_representation = Google::Apis::CloudkmsV1::CryptoKeyVersion::Representation
           command.response_class = Google::Apis::CloudkmsV1::CryptoKeyVersion
-          command.params['name'] = name unless name.nil?
+          command.params['parent'] = parent unless parent.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Update a CryptoKeyVersion's metadata.
-        # state may be changed between
-        # ENABLED and
-        # DISABLED using this
-        # method. See DestroyCryptoKeyVersion and RestoreCryptoKeyVersion to
-        # move between other states.
+        # Schedule a CryptoKeyVersion for destruction.
+        # Upon calling this method, CryptoKeyVersion.state will be set to
+        # DESTROY_SCHEDULED
+        # and destroy_time will be set to a time 24
+        # hours in the future, at which point the state
+        # will be changed to
+        # DESTROYED, and the key
+        # material will be irrevocably destroyed.
+        # Before the destroy_time is reached,
+        # RestoreCryptoKeyVersion may be called to reverse the process.
         # @param [String] name
-        #   Output only. The resource name for this CryptoKeyVersion in the format
-        #   `projects/*/locations/*/keyRings/*/cryptoKeys/*/cryptoKeyVersions/*`.
-        # @param [Google::Apis::CloudkmsV1::CryptoKeyVersion] crypto_key_version_object
-        # @param [String] update_mask
-        #   Required list of fields to be updated in this request.
+        #   The resource name of the CryptoKeyVersion to destroy.
+        # @param [Google::Apis::CloudkmsV1::DestroyCryptoKeyVersionRequest] destroy_crypto_key_version_request_object
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
@@ -787,32 +799,27 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def patch_project_location_key_ring_crypto_key_crypto_key_version(name, crypto_key_version_object = nil, update_mask: nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:patch, 'v1/{+name}', options)
-          command.request_representation = Google::Apis::CloudkmsV1::CryptoKeyVersion::Representation
-          command.request_object = crypto_key_version_object
+        def destroy_crypto_key_version(name, destroy_crypto_key_version_request_object = nil, quota_user: nil, fields: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v1/{+name}:destroy', options)
+          command.request_representation = Google::Apis::CloudkmsV1::DestroyCryptoKeyVersionRequest::Representation
+          command.request_object = destroy_crypto_key_version_request_object
           command.response_representation = Google::Apis::CloudkmsV1::CryptoKeyVersion::Representation
           command.response_class = Google::Apis::CloudkmsV1::CryptoKeyVersion
           command.params['name'] = name unless name.nil?
-          command.query['updateMask'] = update_mask unless update_mask.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists CryptoKeyVersions.
-        # @param [String] parent
-        #   Required. The resource name of the CryptoKey to list, in the format
-        #   `projects/*/locations/*/keyRings/*/cryptoKeys/*`.
-        # @param [String] page_token
-        #   Optional pagination token, returned earlier via
-        #   ListCryptoKeyVersionsResponse.next_page_token.
-        # @param [Fixnum] page_size
-        #   Optional limit on the number of CryptoKeyVersions to
-        #   include in the response. Further CryptoKeyVersions can
-        #   subsequently be obtained by including the
-        #   ListCryptoKeyVersionsResponse.next_page_token in a subsequent request.
-        #   If unspecified, the server will pick an appropriate default.
+        # Restore a CryptoKeyVersion in the
+        # DESTROY_SCHEDULED,
+        # state.
+        # Upon restoration of the CryptoKeyVersion, state
+        # will be set to DISABLED,
+        # and destroy_time will be cleared.
+        # @param [String] name
+        #   The resource name of the CryptoKeyVersion to restore.
+        # @param [Google::Apis::CloudkmsV1::RestoreCryptoKeyVersionRequest] restore_crypto_key_version_request_object
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
@@ -822,34 +829,38 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::CloudkmsV1::ListCryptoKeyVersionsResponse] parsed result object
+        # @yieldparam result [Google::Apis::CloudkmsV1::CryptoKeyVersion] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::CloudkmsV1::ListCryptoKeyVersionsResponse]
+        # @return [Google::Apis::CloudkmsV1::CryptoKeyVersion]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_project_location_key_ring_crypto_key_crypto_key_versions(parent, page_token: nil, page_size: nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v1/{+parent}/cryptoKeyVersions', options)
-          command.response_representation = Google::Apis::CloudkmsV1::ListCryptoKeyVersionsResponse::Representation
-          command.response_class = Google::Apis::CloudkmsV1::ListCryptoKeyVersionsResponse
-          command.params['parent'] = parent unless parent.nil?
-          command.query['pageToken'] = page_token unless page_token.nil?
-          command.query['pageSize'] = page_size unless page_size.nil?
+        def restore_crypto_key_version(name, restore_crypto_key_version_request_object = nil, quota_user: nil, fields: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v1/{+name}:restore', options)
+          command.request_representation = Google::Apis::CloudkmsV1::RestoreCryptoKeyVersionRequest::Representation
+          command.request_object = restore_crypto_key_version_request_object
+          command.response_representation = Google::Apis::CloudkmsV1::CryptoKeyVersion::Representation
+          command.response_class = Google::Apis::CloudkmsV1::CryptoKeyVersion
+          command.params['name'] = name unless name.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Create a new CryptoKeyVersion in a CryptoKey.
-        # The server will assign the next sequential id. If unset,
-        # state will be set to
-        # ENABLED.
-        # @param [String] parent
-        #   Required. The name of the CryptoKey associated with
-        #   the CryptoKeyVersions.
+        # Update a CryptoKeyVersion's metadata.
+        # state may be changed between
+        # ENABLED and
+        # DISABLED using this
+        # method. See DestroyCryptoKeyVersion and RestoreCryptoKeyVersion to
+        # move between other states.
+        # @param [String] name
+        #   Output only. The resource name for this CryptoKeyVersion in the format
+        #   `projects/*/locations/*/keyRings/*/cryptoKeys/*/cryptoKeyVersions/*`.
         # @param [Google::Apis::CloudkmsV1::CryptoKeyVersion] crypto_key_version_object
+        # @param [String] update_mask
+        #   Required list of fields to be updated in this request.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
@@ -867,31 +878,22 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def create_project_location_key_ring_crypto_key_crypto_key_version(parent, crypto_key_version_object = nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v1/{+parent}/cryptoKeyVersions', options)
+        def patch_project_location_key_ring_crypto_key_crypto_key_version(name, crypto_key_version_object = nil, update_mask: nil, quota_user: nil, fields: nil, options: nil, &block)
+          command =  make_simple_command(:patch, 'v1/{+name}', options)
           command.request_representation = Google::Apis::CloudkmsV1::CryptoKeyVersion::Representation
           command.request_object = crypto_key_version_object
           command.response_representation = Google::Apis::CloudkmsV1::CryptoKeyVersion::Representation
           command.response_class = Google::Apis::CloudkmsV1::CryptoKeyVersion
-          command.params['parent'] = parent unless parent.nil?
+          command.params['name'] = name unless name.nil?
+          command.query['updateMask'] = update_mask unless update_mask.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Schedule a CryptoKeyVersion for destruction.
-        # Upon calling this method, CryptoKeyVersion.state will be set to
-        # DESTROY_SCHEDULED
-        # and destroy_time will be set to a time 24
-        # hours in the future, at which point the state
-        # will be changed to
-        # DESTROYED, and the key
-        # material will be irrevocably destroyed.
-        # Before the destroy_time is reached,
-        # RestoreCryptoKeyVersion may be called to reverse the process.
+        # Returns metadata for a given CryptoKeyVersion.
         # @param [String] name
-        #   The resource name of the CryptoKeyVersion to destroy.
-        # @param [Google::Apis::CloudkmsV1::DestroyCryptoKeyVersionRequest] destroy_crypto_key_version_request_object
+        #   The name of the CryptoKeyVersion to get.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
@@ -909,10 +911,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def destroy_crypto_key_version(name, destroy_crypto_key_version_request_object = nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v1/{+name}:destroy', options)
-          command.request_representation = Google::Apis::CloudkmsV1::DestroyCryptoKeyVersionRequest::Representation
-          command.request_object = destroy_crypto_key_version_request_object
+        def get_project_location_key_ring_crypto_key_crypto_key_version(name, quota_user: nil, fields: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v1/{+name}', options)
           command.response_representation = Google::Apis::CloudkmsV1::CryptoKeyVersion::Representation
           command.response_class = Google::Apis::CloudkmsV1::CryptoKeyVersion
           command.params['name'] = name unless name.nil?
@@ -924,8 +924,8 @@ module Google
         protected
 
         def apply_command_defaults(command)
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['key'] = key unless key.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
         end
       end
     end