google-api-client 0.13.0 → 0.13.1

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

@@ -22,6 +22,42 @@ module Google
   module Apis
     module IamV1
       
+      class CreateServiceAccountRequest
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class ListServiceAccountsResponse
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class QueryGrantableRolesResponse
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class SignBlobRequest
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class Role
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class SetIamPolicyRequest
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class Binding
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -46,13 +82,13 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class TestIamPermissionsResponse
+      class ListServiceAccountKeysResponse
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class ListServiceAccountKeysResponse
+      class TestIamPermissionsResponse
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
@@ -118,40 +154,55 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class ListServiceAccountsResponse
-        class Representation < Google::Apis::Core::JsonRepresentation; end
+      class CreateServiceAccountRequest
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :account_id, as: 'accountId'
+          property :service_account, as: 'serviceAccount', class: Google::Apis::IamV1::ServiceAccount, decorator: Google::Apis::IamV1::ServiceAccount::Representation
       
-        include Google::Apis::Core::JsonObjectSupport
+        end
       end
       
-      class CreateServiceAccountRequest
-        class Representation < Google::Apis::Core::JsonRepresentation; end
+      class ListServiceAccountsResponse
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :next_page_token, as: 'nextPageToken'
+          collection :accounts, as: 'accounts', class: Google::Apis::IamV1::ServiceAccount, decorator: Google::Apis::IamV1::ServiceAccount::Representation
       
-        include Google::Apis::Core::JsonObjectSupport
+        end
       end
       
       class QueryGrantableRolesResponse
-        class Representation < Google::Apis::Core::JsonRepresentation; end
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :next_page_token, as: 'nextPageToken'
+          collection :roles, as: 'roles', class: Google::Apis::IamV1::Role, decorator: Google::Apis::IamV1::Role::Representation
       
-        include Google::Apis::Core::JsonObjectSupport
+        end
       end
       
       class SignBlobRequest
-        class Representation < Google::Apis::Core::JsonRepresentation; end
-      
-        include Google::Apis::Core::JsonObjectSupport
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :bytes_to_sign, :base64 => true, as: 'bytesToSign'
+        end
       end
       
       class Role
-        class Representation < Google::Apis::Core::JsonRepresentation; end
-      
-        include Google::Apis::Core::JsonObjectSupport
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :title, as: 'title'
+          property :name, as: 'name'
+          property :description, as: 'description'
+        end
       end
       
       class SetIamPolicyRequest
-        class Representation < Google::Apis::Core::JsonRepresentation; end
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :policy, as: 'policy', class: Google::Apis::IamV1::Policy, decorator: Google::Apis::IamV1::Policy::Representation
       
-        include Google::Apis::Core::JsonObjectSupport
+        end
       end
       
       class Binding
@@ -165,12 +216,12 @@ module Google
       class ServiceAccount
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :oauth2_client_id, as: 'oauth2ClientId'
           property :unique_id, as: 'uniqueId'
+          property :oauth2_client_id, as: 'oauth2ClientId'
           property :display_name, as: 'displayName'
           property :etag, :base64 => true, as: 'etag'
-          property :name, as: 'name'
           property :email, as: 'email'
+          property :name, as: 'name'
           property :project_id, as: 'projectId'
         end
       end
@@ -190,18 +241,18 @@ module Google
         end
       end
       
-      class TestIamPermissionsResponse
+      class ListServiceAccountKeysResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          collection :permissions, as: 'permissions'
+          collection :keys, as: 'keys', class: Google::Apis::IamV1::ServiceAccountKey, decorator: Google::Apis::IamV1::ServiceAccountKey::Representation
+      
         end
       end
       
-      class ListServiceAccountKeysResponse
+      class TestIamPermissionsResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          collection :keys, as: 'keys', class: Google::Apis::IamV1::ServiceAccountKey, decorator: Google::Apis::IamV1::ServiceAccountKey::Representation
-      
+          collection :permissions, as: 'permissions'
         end
       end
       
@@ -221,9 +272,9 @@ module Google
       class CreateServiceAccountKeyRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :private_key_type, as: 'privateKeyType'
           property :include_public_key_data, as: 'includePublicKeyData'
           property :key_algorithm, as: 'keyAlgorithm'
+          property :private_key_type, as: 'privateKeyType'
         end
       end
       
@@ -245,8 +296,8 @@ module Google
       class SignJwtResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :key_id, as: 'keyId'
           property :signed_jwt, as: 'signedJwt'
+          property :key_id, as: 'keyId'
         end
       end
       
@@ -278,9 +329,9 @@ module Google
       class BindingDelta
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :action, as: 'action'
           property :member, as: 'member'
           property :role, as: 'role'
+          property :action, as: 'action'
         end
       end
       
@@ -291,57 +342,6 @@ module Google
       
         end
       end
-      
-      class ListServiceAccountsResponse
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :next_page_token, as: 'nextPageToken'
-          collection :accounts, as: 'accounts', class: Google::Apis::IamV1::ServiceAccount, decorator: Google::Apis::IamV1::ServiceAccount::Representation
-      
-        end
-      end
-      
-      class CreateServiceAccountRequest
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :service_account, as: 'serviceAccount', class: Google::Apis::IamV1::ServiceAccount, decorator: Google::Apis::IamV1::ServiceAccount::Representation
-      
-          property :account_id, as: 'accountId'
-        end
-      end
-      
-      class QueryGrantableRolesResponse
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          collection :roles, as: 'roles', class: Google::Apis::IamV1::Role, decorator: Google::Apis::IamV1::Role::Representation
-      
-          property :next_page_token, as: 'nextPageToken'
-        end
-      end
-      
-      class SignBlobRequest
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :bytes_to_sign, :base64 => true, as: 'bytesToSign'
-        end
-      end
-      
-      class Role
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :name, as: 'name'
-          property :description, as: 'description'
-          property :title, as: 'title'
-        end
-      end
-      
-      class SetIamPolicyRequest
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :policy, as: 'policy', class: Google::Apis::IamV1::Policy, decorator: Google::Apis::IamV1::Policy::Representation
-      
-        end
-      end
     end
   end
 end

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

@@ -49,72 +49,6 @@ module Google
           @batch_path = 'batch'
         end
         
-        # Returns the IAM access control policy for a
-        # ServiceAccount.
-        # @param [String] resource
-        #   REQUIRED: The resource for which the policy is being requested.
-        #   See the operation documentation for the appropriate value for this field.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
-        # @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 [Google::Apis::RequestOptions] options
-        #   Request-specific options
-        #
-        # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::IamV1::Policy] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::IamV1::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 get_project_service_account_iam_policy(resource, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v1/{+resource}:getIamPolicy', options)
-          command.response_representation = Google::Apis::IamV1::Policy::Representation
-          command.response_class = Google::Apis::IamV1::Policy
-          command.params['resource'] = resource unless resource.nil?
-          command.query['fields'] = fields unless fields.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
-          execute_or_queue_command(command, &block)
-        end
-        
-        # Gets a ServiceAccount.
-        # @param [String] name
-        #   The resource name of the service account in the following format:
-        #   `projects/`PROJECT_ID`/serviceAccounts/`SERVICE_ACCOUNT_EMAIL``.
-        #   Using `-` as a wildcard for the project will infer the project from
-        #   the account. The `account` value can be the `email` address or the
-        #   `unique_id` of the service account.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
-        # @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 [Google::Apis::RequestOptions] options
-        #   Request-specific options
-        #
-        # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::IamV1::ServiceAccount] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::IamV1::ServiceAccount]
-        #
-        # @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_service_account(name, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v1/{+name}', options)
-          command.response_representation = Google::Apis::IamV1::ServiceAccount::Representation
-          command.response_class = Google::Apis::IamV1::ServiceAccount
-          command.params['name'] = name unless name.nil?
-          command.query['fields'] = fields unless fields.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
-          execute_or_queue_command(command, &block)
-        end
-        
         # Updates a ServiceAccount.
         # Currently, only the following fields are updatable:
         # `display_name` .
@@ -226,6 +160,43 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
+        # Signs a blob using a service account's system-managed private key.
+        # @param [String] name
+        #   The resource name of the service account in the following format:
+        #   `projects/`PROJECT_ID`/serviceAccounts/`SERVICE_ACCOUNT_EMAIL``.
+        #   Using `-` as a wildcard for the project will infer the project from
+        #   the account. The `account` value can be the `email` address or the
+        #   `unique_id` of the service account.
+        # @param [Google::Apis::IamV1::SignBlobRequest] sign_blob_request_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @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 [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::IamV1::SignBlobResponse] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::IamV1::SignBlobResponse]
+        #
+        # @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 sign_service_account_blob(name, sign_blob_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v1/{+name}:signBlob', options)
+          command.request_representation = Google::Apis::IamV1::SignBlobRequest::Representation
+          command.request_object = sign_blob_request_object
+          command.response_representation = Google::Apis::IamV1::SignBlobResponse::Representation
+          command.response_class = Google::Apis::IamV1::SignBlobResponse
+          command.params['name'] = name unless name.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
         # Lists ServiceAccounts for a project.
         # @param [String] name
         #   Required. The resource name of the project associated with the service
@@ -267,14 +238,12 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Signs a blob using a service account's system-managed private key.
+        # Creates a ServiceAccount
+        # and returns it.
         # @param [String] name
-        #   The resource name of the service account in the following format:
-        #   `projects/`PROJECT_ID`/serviceAccounts/`SERVICE_ACCOUNT_EMAIL``.
-        #   Using `-` as a wildcard for the project will infer the project from
-        #   the account. The `account` value can be the `email` address or the
-        #   `unique_id` of the service account.
-        # @param [Google::Apis::IamV1::SignBlobRequest] sign_blob_request_object
+        #   Required. The resource name of the project associated with the service
+        #   accounts, such as `projects/my-project-123`.
+        # @param [Google::Apis::IamV1::CreateServiceAccountRequest] create_service_account_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -284,20 +253,20 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::IamV1::SignBlobResponse] parsed result object
+        # @yieldparam result [Google::Apis::IamV1::ServiceAccount] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::IamV1::SignBlobResponse]
+        # @return [Google::Apis::IamV1::ServiceAccount]
         #
         # @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 sign_service_account_blob(name, sign_blob_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v1/{+name}:signBlob', options)
-          command.request_representation = Google::Apis::IamV1::SignBlobRequest::Representation
-          command.request_object = sign_blob_request_object
-          command.response_representation = Google::Apis::IamV1::SignBlobResponse::Representation
-          command.response_class = Google::Apis::IamV1::SignBlobResponse
+        def create_service_account(name, create_service_account_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v1/{+name}/serviceAccounts', options)
+          command.request_representation = Google::Apis::IamV1::CreateServiceAccountRequest::Representation
+          command.request_object = create_service_account_request_object
+          command.response_representation = Google::Apis::IamV1::ServiceAccount::Representation
+          command.response_class = Google::Apis::IamV1::ServiceAccount
           command.params['name'] = name unless name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
@@ -339,12 +308,17 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Creates a ServiceAccount
-        # and returns it.
+        # Signs a JWT using a service account's system-managed private key.
+        # If no expiry time (`exp`) is provided in the `SignJwtRequest`, IAM sets an
+        # an expiry time of one hour by default. If you request an expiry time of
+        # more than one hour, the request will fail.
         # @param [String] name
-        #   Required. The resource name of the project associated with the service
-        #   accounts, such as `projects/my-project-123`.
-        # @param [Google::Apis::IamV1::CreateServiceAccountRequest] create_service_account_request_object
+        #   The resource name of the service account in the following format:
+        #   `projects/`PROJECT_ID`/serviceAccounts/`SERVICE_ACCOUNT_EMAIL``.
+        #   Using `-` as a wildcard for the project will infer the project from
+        #   the account. The `account` value can be the `email` address or the
+        #   `unique_id` of the service account.
+        # @param [Google::Apis::IamV1::SignJwtRequest] sign_jwt_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -354,37 +328,65 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::IamV1::ServiceAccount] parsed result object
+        # @yieldparam result [Google::Apis::IamV1::SignJwtResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::IamV1::ServiceAccount]
+        # @return [Google::Apis::IamV1::SignJwtResponse]
         #
         # @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_service_account(name, create_service_account_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v1/{+name}/serviceAccounts', options)
-          command.request_representation = Google::Apis::IamV1::CreateServiceAccountRequest::Representation
-          command.request_object = create_service_account_request_object
-          command.response_representation = Google::Apis::IamV1::ServiceAccount::Representation
-          command.response_class = Google::Apis::IamV1::ServiceAccount
+        def sign_service_account_jwt(name, sign_jwt_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v1/{+name}:signJwt', options)
+          command.request_representation = Google::Apis::IamV1::SignJwtRequest::Representation
+          command.request_object = sign_jwt_request_object
+          command.response_representation = Google::Apis::IamV1::SignJwtResponse::Representation
+          command.response_class = Google::Apis::IamV1::SignJwtResponse
           command.params['name'] = name unless name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Signs a JWT using a service account's system-managed private key.
-        # If no expiry time (`exp`) is provided in the `SignJwtRequest`, IAM sets an
-        # an expiry time of one hour by default. If you request an expiry time of
-        # more than one hour, the request will fail.
+        # Returns the IAM access control policy for a
+        # ServiceAccount.
+        # @param [String] resource
+        #   REQUIRED: The resource for which the policy is being requested.
+        #   See the operation documentation for the appropriate value for this field.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @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 [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::IamV1::Policy] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::IamV1::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 get_project_service_account_iam_policy(resource, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v1/{+resource}:getIamPolicy', options)
+          command.response_representation = Google::Apis::IamV1::Policy::Representation
+          command.response_class = Google::Apis::IamV1::Policy
+          command.params['resource'] = resource unless resource.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Gets a ServiceAccount.
         # @param [String] name
         #   The resource name of the service account in the following format:
         #   `projects/`PROJECT_ID`/serviceAccounts/`SERVICE_ACCOUNT_EMAIL``.
         #   Using `-` as a wildcard for the project will infer the project from
         #   the account. The `account` value can be the `email` address or the
         #   `unique_id` of the service account.
-        # @param [Google::Apis::IamV1::SignJwtRequest] sign_jwt_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -394,20 +396,18 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::IamV1::SignJwtResponse] parsed result object
+        # @yieldparam result [Google::Apis::IamV1::ServiceAccount] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::IamV1::SignJwtResponse]
+        # @return [Google::Apis::IamV1::ServiceAccount]
         #
         # @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 sign_service_account_jwt(name, sign_jwt_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v1/{+name}:signJwt', options)
-          command.request_representation = Google::Apis::IamV1::SignJwtRequest::Representation
-          command.request_object = sign_jwt_request_object
-          command.response_representation = Google::Apis::IamV1::SignJwtResponse::Representation
-          command.response_class = Google::Apis::IamV1::SignJwtResponse
+        def get_project_service_account(name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v1/{+name}', options)
+          command.response_representation = Google::Apis::IamV1::ServiceAccount::Representation
+          command.response_class = Google::Apis::IamV1::ServiceAccount
           command.params['name'] = name unless name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
@@ -486,17 +486,17 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Lists ServiceAccountKeys.
+        # Gets the ServiceAccountKey
+        # by key id.
         # @param [String] name
-        #   The resource name of the service account in the following format:
-        #   `projects/`PROJECT_ID`/serviceAccounts/`SERVICE_ACCOUNT_EMAIL``.
-        #   Using `-` as a wildcard for the project, will infer the project from
+        #   The resource name of the service account key in the following format:
+        #   `projects/`PROJECT_ID`/serviceAccounts/`SERVICE_ACCOUNT_EMAIL`/keys/`key``.
+        #   Using `-` as a wildcard for the project will infer the project from
         #   the account. The `account` value can be the `email` address or the
         #   `unique_id` of the service account.
-        # @param [Array<String>, String] key_types
-        #   Filters the types of keys the user wants to include in the list
-        #   response. Duplicate key types are not allowed. If no key type
-        #   is provided, all keys are returned.
+        # @param [String] public_key_type
+        #   The output format of the public key requested.
+        #   X509_PEM is the default output format.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -506,36 +506,36 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::IamV1::ListServiceAccountKeysResponse] parsed result object
+        # @yieldparam result [Google::Apis::IamV1::ServiceAccountKey] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::IamV1::ListServiceAccountKeysResponse]
+        # @return [Google::Apis::IamV1::ServiceAccountKey]
         #
         # @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_service_account_keys(name, key_types: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v1/{+name}/keys', options)
-          command.response_representation = Google::Apis::IamV1::ListServiceAccountKeysResponse::Representation
-          command.response_class = Google::Apis::IamV1::ListServiceAccountKeysResponse
+        def get_project_service_account_key(name, public_key_type: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v1/{+name}', options)
+          command.response_representation = Google::Apis::IamV1::ServiceAccountKey::Representation
+          command.response_class = Google::Apis::IamV1::ServiceAccountKey
           command.params['name'] = name unless name.nil?
-          command.query['keyTypes'] = key_types unless key_types.nil?
+          command.query['publicKeyType'] = public_key_type unless public_key_type.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Gets the ServiceAccountKey
-        # by key id.
+        # Lists ServiceAccountKeys.
         # @param [String] name
-        #   The resource name of the service account key in the following format:
-        #   `projects/`PROJECT_ID`/serviceAccounts/`SERVICE_ACCOUNT_EMAIL`/keys/`key``.
-        #   Using `-` as a wildcard for the project will infer the project from
+        #   The resource name of the service account in the following format:
+        #   `projects/`PROJECT_ID`/serviceAccounts/`SERVICE_ACCOUNT_EMAIL``.
+        #   Using `-` as a wildcard for the project, will infer the project from
         #   the account. The `account` value can be the `email` address or the
         #   `unique_id` of the service account.
-        # @param [String] public_key_type
-        #   The output format of the public key requested.
-        #   X509_PEM is the default output format.
+        # @param [Array<String>, String] key_types
+        #   Filters the types of keys the user wants to include in the list
+        #   response. Duplicate key types are not allowed. If no key type
+        #   is provided, all keys are returned.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -545,20 +545,20 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::IamV1::ServiceAccountKey] parsed result object
+        # @yieldparam result [Google::Apis::IamV1::ListServiceAccountKeysResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::IamV1::ServiceAccountKey]
+        # @return [Google::Apis::IamV1::ListServiceAccountKeysResponse]
         #
         # @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_service_account_key(name, public_key_type: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v1/{+name}', options)
-          command.response_representation = Google::Apis::IamV1::ServiceAccountKey::Representation
-          command.response_class = Google::Apis::IamV1::ServiceAccountKey
+        def list_project_service_account_keys(name, key_types: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v1/{+name}/keys', options)
+          command.response_representation = Google::Apis::IamV1::ListServiceAccountKeysResponse::Representation
+          command.response_class = Google::Apis::IamV1::ListServiceAccountKeysResponse
           command.params['name'] = name unless name.nil?
-          command.query['publicKeyType'] = public_key_type unless public_key_type.nil?
+          command.query['keyTypes'] = key_types unless key_types.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)