google-api-client 0.11.3 → 0.12.0

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

@@ -22,6 +22,36 @@ module Google
   module Apis
     module PubsubV1
       
+      class PublishResponse
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class Subscription
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class TestIamPermissionsRequest
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class Topic
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class Policy
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class ModifyAckDeadlineRequest
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -34,13 +64,13 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class Message
+      class ModifyPushConfigRequest
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class ModifyPushConfigRequest
+      class PubsubMessage
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
@@ -119,40 +149,52 @@ module Google
       end
       
       class PublishResponse
-        class Representation < Google::Apis::Core::JsonRepresentation; end
-      
-        include Google::Apis::Core::JsonObjectSupport
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          collection :message_ids, as: 'messageIds'
+        end
       end
       
       class Subscription
-        class Representation < Google::Apis::Core::JsonRepresentation; end
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :topic, as: 'topic'
+          property :push_config, as: 'pushConfig', class: Google::Apis::PubsubV1::PushConfig, decorator: Google::Apis::PubsubV1::PushConfig::Representation
       
-        include Google::Apis::Core::JsonObjectSupport
+          property :ack_deadline_seconds, as: 'ackDeadlineSeconds'
+          property :name, as: 'name'
+        end
       end
       
       class TestIamPermissionsRequest
-        class Representation < Google::Apis::Core::JsonRepresentation; end
-      
-        include Google::Apis::Core::JsonObjectSupport
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          collection :permissions, as: 'permissions'
+        end
       end
       
       class Topic
-        class Representation < Google::Apis::Core::JsonRepresentation; end
-      
-        include Google::Apis::Core::JsonObjectSupport
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :name, as: 'name'
+        end
       end
       
       class Policy
-        class Representation < Google::Apis::Core::JsonRepresentation; end
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :etag, :base64 => true, as: 'etag'
+          property :version, as: 'version'
+          collection :bindings, as: 'bindings', class: Google::Apis::PubsubV1::Binding, decorator: Google::Apis::PubsubV1::Binding::Representation
       
-        include Google::Apis::Core::JsonObjectSupport
+        end
       end
       
       class ModifyAckDeadlineRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          collection :ack_ids, as: 'ackIds'
           property :ack_deadline_seconds, as: 'ackDeadlineSeconds'
+          collection :ack_ids, as: 'ackIds'
         end
       end
       
@@ -164,21 +206,21 @@ module Google
         end
       end
       
-      class Message
+      class ModifyPushConfigRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          hash :attributes, as: 'attributes'
-          property :message_id, as: 'messageId'
-          property :publish_time, as: 'publishTime'
-          property :data, :base64 => true, as: 'data'
+          property :push_config, as: 'pushConfig', class: Google::Apis::PubsubV1::PushConfig, decorator: Google::Apis::PubsubV1::PushConfig::Representation
+      
         end
       end
       
-      class ModifyPushConfigRequest
+      class PubsubMessage
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :push_config, as: 'pushConfig', class: Google::Apis::PubsubV1::PushConfig, decorator: Google::Apis::PubsubV1::PushConfig::Representation
-      
+          hash :attributes, as: 'attributes'
+          property :message_id, as: 'messageId'
+          property :publish_time, as: 'publishTime'
+          property :data, :base64 => true, as: 'data'
         end
       end
       
@@ -206,9 +248,9 @@ module Google
       class ListTopicsResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
+          property :next_page_token, as: 'nextPageToken'
           collection :topics, as: 'topics', class: Google::Apis::PubsubV1::Topic, decorator: Google::Apis::PubsubV1::Topic::Representation
       
-          property :next_page_token, as: 'nextPageToken'
         end
       end
       
@@ -231,7 +273,7 @@ module Google
       class ReceivedMessage
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :message, as: 'message', class: Google::Apis::PubsubV1::Message, decorator: Google::Apis::PubsubV1::Message::Representation
+          property :message, as: 'message', class: Google::Apis::PubsubV1::PubsubMessage, decorator: Google::Apis::PubsubV1::PubsubMessage::Representation
       
           property :ack_id, as: 'ackId'
         end
@@ -272,49 +314,7 @@ module Google
       class PublishRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          collection :messages, as: 'messages', class: Google::Apis::PubsubV1::Message, decorator: Google::Apis::PubsubV1::Message::Representation
-      
-        end
-      end
-      
-      class PublishResponse
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          collection :message_ids, as: 'messageIds'
-        end
-      end
-      
-      class Subscription
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :topic, as: 'topic'
-          property :push_config, as: 'pushConfig', class: Google::Apis::PubsubV1::PushConfig, decorator: Google::Apis::PubsubV1::PushConfig::Representation
-      
-          property :ack_deadline_seconds, as: 'ackDeadlineSeconds'
-          property :name, as: 'name'
-        end
-      end
-      
-      class TestIamPermissionsRequest
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          collection :permissions, as: 'permissions'
-        end
-      end
-      
-      class Topic
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :name, as: 'name'
-        end
-      end
-      
-      class Policy
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :etag, :base64 => true, as: 'etag'
-          property :version, as: 'version'
-          collection :bindings, as: 'bindings', class: Google::Apis::PubsubV1::Binding, decorator: Google::Apis::PubsubV1::Binding::Representation
+          collection :messages, as: 'messages', class: Google::Apis::PubsubV1::PubsubMessage, decorator: Google::Apis::PubsubV1::PubsubMessage::Representation
       
         end
       end

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

@@ -47,6 +47,112 @@ module Google
           @batch_path = 'batch'
         end
         
+        # Creates the given topic with the given name.
+        # @param [String] name
+        #   The name of the topic. It must have the format
+        #   `"projects/`project`/topics/`topic`"`. ``topic`` must start with a letter,
+        #   and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`),
+        #   underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent
+        #   signs (`%`). It must be between 3 and 255 characters in length, and it
+        #   must not start with `"goog"`.
+        # @param [Google::Apis::PubsubV1::Topic] topic_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::PubsubV1::Topic] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::PubsubV1::Topic]
+        #
+        # @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_topic(name, topic_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:put, 'v1/{+name}', options)
+          command.request_representation = Google::Apis::PubsubV1::Topic::Representation
+          command.request_object = topic_object
+          command.response_representation = Google::Apis::PubsubV1::Topic::Representation
+          command.response_class = Google::Apis::PubsubV1::Topic
+          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
+        
+        # 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::PubsubV1::SetIamPolicyRequest] set_iam_policy_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::PubsubV1::Policy] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::PubsubV1::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_topic_iam_policy(resource, set_iam_policy_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v1/{+resource}:setIamPolicy', options)
+          command.request_representation = Google::Apis::PubsubV1::SetIamPolicyRequest::Representation
+          command.request_object = set_iam_policy_request_object
+          command.response_representation = Google::Apis::PubsubV1::Policy::Representation
+          command.response_class = Google::Apis::PubsubV1::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 the access control policy for a resource.
+        # Returns an empty policy if the resource exists and does not have a policy
+        # set.
+        # @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::PubsubV1::Policy] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::PubsubV1::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_topic_iam_policy(resource, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v1/{+resource}:getIamPolicy', options)
+          command.response_representation = Google::Apis::PubsubV1::Policy::Representation
+          command.response_class = Google::Apis::PubsubV1::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 the configuration of a topic.
         # @param [String] topic
         #   The name of the topic to get.
@@ -68,7 +174,7 @@ 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_topic(topic, fields: nil, quota_user: nil, options: nil, &block)
+        def get_project_topic(topic, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:get, 'v1/{+topic}', options)
           command.response_representation = Google::Apis::PubsubV1::Topic::Representation
           command.response_class = Google::Apis::PubsubV1::Topic
@@ -178,7 +284,7 @@ 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 delete_topic(topic, fields: nil, quota_user: nil, options: nil, &block)
+        def delete_project_topic(topic, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:delete, 'v1/{+topic}', options)
           command.response_representation = Google::Apis::PubsubV1::Empty::Representation
           command.response_class = Google::Apis::PubsubV1::Empty
@@ -192,12 +298,12 @@ module Google
         # @param [String] project
         #   The name of the cloud project that topics belong to.
         #   Format is `projects/`project``.
-        # @param [Fixnum] page_size
-        #   Maximum number of topics to return.
         # @param [String] page_token
         #   The value returned by the last `ListTopicsResponse`; indicates that this is
         #   a continuation of a prior `ListTopics` call, and that the system should
         #   return the next page of data.
+        # @param [Fixnum] page_size
+        #   Maximum number of topics to return.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -215,97 +321,28 @@ 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_topics(project, page_size: nil, page_token: nil, fields: nil, quota_user: nil, options: nil, &block)
+        def list_project_topics(project, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:get, 'v1/{+project}/topics', options)
           command.response_representation = Google::Apis::PubsubV1::ListTopicsResponse::Representation
           command.response_class = Google::Apis::PubsubV1::ListTopicsResponse
           command.params['project'] = project unless project.nil?
-          command.query['pageSize'] = page_size unless page_size.nil?
           command.query['pageToken'] = page_token unless page_token.nil?
+          command.query['pageSize'] = page_size unless page_size.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Creates the given topic with the given name.
-        # @param [String] name
-        #   The name of the topic. It must have the format
-        #   `"projects/`project`/topics/`topic`"`. ``topic`` must start with a letter,
-        #   and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`),
-        #   underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent
-        #   signs (`%`). It must be between 3 and 255 characters in length, and it
-        #   must not start with `"goog"`.
-        # @param [Google::Apis::PubsubV1::Topic] topic_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::PubsubV1::Topic] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::PubsubV1::Topic]
-        #
-        # @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_topic(name, topic_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:put, 'v1/{+name}', options)
-          command.request_representation = Google::Apis::PubsubV1::Topic::Representation
-          command.request_object = topic_object
-          command.response_representation = Google::Apis::PubsubV1::Topic::Representation
-          command.response_class = Google::Apis::PubsubV1::Topic
-          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
-        
-        # 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::PubsubV1::SetIamPolicyRequest] set_iam_policy_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::PubsubV1::Policy] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::PubsubV1::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_topic_iam_policy(resource, set_iam_policy_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v1/{+resource}:setIamPolicy', options)
-          command.request_representation = Google::Apis::PubsubV1::SetIamPolicyRequest::Representation
-          command.request_object = set_iam_policy_request_object
-          command.response_representation = Google::Apis::PubsubV1::Policy::Representation
-          command.response_class = Google::Apis::PubsubV1::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 the access control policy for a resource.
-        # Returns an empty policy if the resource exists and does not have a policy
-        # set.
-        # @param [String] resource
-        #   REQUIRED: The resource for which the policy is being requested.
-        #   See the operation documentation for the appropriate value for this field.
+        # Lists the name of the subscriptions for this topic.
+        # @param [String] topic
+        #   The name of the topic that subscriptions are attached to.
+        #   Format is `projects/`project`/topics/`topic``.
+        # @param [String] page_token
+        #   The value returned by the last `ListTopicSubscriptionsResponse`; indicates
+        #   that this is a continuation of a prior `ListTopicSubscriptions` call, and
+        #   that the system should return the next page of data.
+        # @param [Fixnum] page_size
+        #   Maximum number of subscription names to return.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -315,34 +352,30 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::PubsubV1::Policy] parsed result object
+        # @yieldparam result [Google::Apis::PubsubV1::ListTopicSubscriptionsResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::PubsubV1::Policy]
+        # @return [Google::Apis::PubsubV1::ListTopicSubscriptionsResponse]
         #
         # @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_topic_iam_policy(resource, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v1/{+resource}:getIamPolicy', options)
-          command.response_representation = Google::Apis::PubsubV1::Policy::Representation
-          command.response_class = Google::Apis::PubsubV1::Policy
-          command.params['resource'] = resource unless resource.nil?
+        def list_project_topic_subscriptions(topic, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v1/{+topic}/subscriptions', options)
+          command.response_representation = Google::Apis::PubsubV1::ListTopicSubscriptionsResponse::Representation
+          command.response_class = Google::Apis::PubsubV1::ListTopicSubscriptionsResponse
+          command.params['topic'] = topic unless topic.nil?
+          command.query['pageToken'] = page_token unless page_token.nil?
+          command.query['pageSize'] = page_size unless page_size.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 the name of the subscriptions for this topic.
-        # @param [String] topic
-        #   The name of the topic that subscriptions are attached to.
-        #   Format is `projects/`project`/topics/`topic``.
-        # @param [String] page_token
-        #   The value returned by the last `ListTopicSubscriptionsResponse`; indicates
-        #   that this is a continuation of a prior `ListTopicSubscriptions` call, and
-        #   that the system should return the next page of data.
-        # @param [Fixnum] page_size
-        #   Maximum number of subscription names to return.
+        # Gets the configuration details of a subscription.
+        # @param [String] subscription
+        #   The name of the subscription to get.
+        #   Format is `projects/`project`/subscriptions/`sub``.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -352,21 +385,19 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::PubsubV1::ListTopicSubscriptionsResponse] parsed result object
+        # @yieldparam result [Google::Apis::PubsubV1::Subscription] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::PubsubV1::ListTopicSubscriptionsResponse]
+        # @return [Google::Apis::PubsubV1::Subscription]
         #
         # @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_topic_subscriptions(topic, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v1/{+topic}/subscriptions', options)
-          command.response_representation = Google::Apis::PubsubV1::ListTopicSubscriptionsResponse::Representation
-          command.response_class = Google::Apis::PubsubV1::ListTopicSubscriptionsResponse
-          command.params['topic'] = topic unless topic.nil?
-          command.query['pageToken'] = page_token unless page_token.nil?
-          command.query['pageSize'] = page_size unless page_size.nil?
+        def get_project_subscription(subscription, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v1/{+subscription}', options)
+          command.response_representation = Google::Apis::PubsubV1::Subscription::Representation
+          command.response_class = Google::Apis::PubsubV1::Subscription
+          command.params['subscription'] = subscription unless subscription.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
@@ -474,7 +505,7 @@ 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 delete_subscription(subscription, fields: nil, quota_user: nil, options: nil, &block)
+        def delete_project_subscription(subscription, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:delete, 'v1/{+subscription}', options)
           command.response_representation = Google::Apis::PubsubV1::Empty::Representation
           command.response_class = Google::Apis::PubsubV1::Empty
@@ -525,12 +556,12 @@ module Google
         # @param [String] project
         #   The name of the cloud project that subscriptions belong to.
         #   Format is `projects/`project``.
-        # @param [Fixnum] page_size
-        #   Maximum number of subscriptions to return.
         # @param [String] page_token
         #   The value returned by the last `ListSubscriptionsResponse`; indicates that
         #   this is a continuation of a prior `ListSubscriptions` call, and that the
         #   system should return the next page of data.
+        # @param [Fixnum] page_size
+        #   Maximum number of subscriptions to return.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -548,13 +579,13 @@ 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_subscriptions(project, page_size: nil, page_token: nil, fields: nil, quota_user: nil, options: nil, &block)
+        def list_project_subscriptions(project, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:get, 'v1/{+project}/subscriptions', options)
           command.response_representation = Google::Apis::PubsubV1::ListSubscriptionsResponse::Representation
           command.response_class = Google::Apis::PubsubV1::ListSubscriptionsResponse
           command.params['project'] = project unless project.nil?
-          command.query['pageSize'] = page_size unless page_size.nil?
           command.query['pageToken'] = page_token unless page_token.nil?
+          command.query['pageSize'] = page_size unless page_size.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
@@ -594,7 +625,7 @@ 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_subscription(name, subscription_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+        def create_project_subscription(name, subscription_object = nil, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:put, 'v1/{+name}', options)
           command.request_representation = Google::Apis::PubsubV1::Subscription::Representation
           command.request_object = subscription_object
@@ -751,47 +782,12 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Gets the configuration details of a subscription.
-        # @param [String] subscription
-        #   The name of the subscription to get.
-        #   Format is `projects/`project`/subscriptions/`sub``.
-        # @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::PubsubV1::Subscription] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::PubsubV1::Subscription]
-        #
-        # @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_subscription(subscription, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v1/{+subscription}', options)
-          command.response_representation = Google::Apis::PubsubV1::Subscription::Representation
-          command.response_class = Google::Apis::PubsubV1::Subscription
-          command.params['subscription'] = subscription unless subscription.nil?
-          command.query['fields'] = fields unless fields.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
-          execute_or_queue_command(command, &block)
-        end
-        
-        # Returns permissions that a caller has on the specified resource.
-        # If the resource does not exist, this will return an empty set of
-        # permissions, not a NOT_FOUND error.
-        # Note: This operation is designed to be used for building permission-aware
-        # UIs and command-line tools, not for authorization checking. This operation
-        # may "fail open" without warning.
+        # Gets the access control policy for a resource.
+        # Returns an empty policy if the resource exists and does not have a policy
+        # set.
         # @param [String] resource
-        #   REQUIRED: The resource for which the policy detail is being requested.
+        #   REQUIRED: The resource for which the policy is being requested.
         #   See the operation documentation for the appropriate value for this field.
-        # @param [Google::Apis::PubsubV1::TestIamPermissionsRequest] test_iam_permissions_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -801,32 +797,30 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::PubsubV1::TestIamPermissionsResponse] parsed result object
+        # @yieldparam result [Google::Apis::PubsubV1::Policy] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::PubsubV1::TestIamPermissionsResponse]
+        # @return [Google::Apis::PubsubV1::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 test_snapshot_iam_permissions(resource, test_iam_permissions_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v1/{+resource}:testIamPermissions', options)
-          command.request_representation = Google::Apis::PubsubV1::TestIamPermissionsRequest::Representation
-          command.request_object = test_iam_permissions_request_object
-          command.response_representation = Google::Apis::PubsubV1::TestIamPermissionsResponse::Representation
-          command.response_class = Google::Apis::PubsubV1::TestIamPermissionsResponse
+        def get_project_snapshot_iam_policy(resource, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v1/{+resource}:getIamPolicy', options)
+          command.response_representation = Google::Apis::PubsubV1::Policy::Representation
+          command.response_class = Google::Apis::PubsubV1::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 the access control policy for a resource.
-        # Returns an empty policy if the resource exists and does not have a policy
-        # set.
+        # 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 requested.
+        #   REQUIRED: The resource for which the policy is being specified.
         #   See the operation documentation for the appropriate value for this field.
+        # @param [Google::Apis::PubsubV1::SetIamPolicyRequest] set_iam_policy_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -844,8 +838,10 @@ 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_snapshot_iam_policy(resource, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v1/{+resource}:getIamPolicy', options)
+        def set_snapshot_iam_policy(resource, set_iam_policy_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v1/{+resource}:setIamPolicy', options)
+          command.request_representation = Google::Apis::PubsubV1::SetIamPolicyRequest::Representation
+          command.request_object = set_iam_policy_request_object
           command.response_representation = Google::Apis::PubsubV1::Policy::Representation
           command.response_class = Google::Apis::PubsubV1::Policy
           command.params['resource'] = resource unless resource.nil?
@@ -854,12 +850,16 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Sets the access control policy on the specified resource. Replaces any
-        # existing policy.
+        # Returns permissions that a caller has on the specified resource.
+        # If the resource does not exist, this will return an empty set of
+        # permissions, not a NOT_FOUND error.
+        # Note: This operation is designed to be used for building permission-aware
+        # UIs and command-line tools, not for authorization checking. This operation
+        # may "fail open" without warning.
         # @param [String] resource
-        #   REQUIRED: The resource for which the policy is being specified.
+        #   REQUIRED: The resource for which the policy detail is being requested.
         #   See the operation documentation for the appropriate value for this field.
-        # @param [Google::Apis::PubsubV1::SetIamPolicyRequest] set_iam_policy_request_object
+        # @param [Google::Apis::PubsubV1::TestIamPermissionsRequest] test_iam_permissions_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -869,20 +869,20 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::PubsubV1::Policy] parsed result object
+        # @yieldparam result [Google::Apis::PubsubV1::TestIamPermissionsResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::PubsubV1::Policy]
+        # @return [Google::Apis::PubsubV1::TestIamPermissionsResponse]
         #
         # @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_snapshot_iam_policy(resource, set_iam_policy_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v1/{+resource}:setIamPolicy', options)
-          command.request_representation = Google::Apis::PubsubV1::SetIamPolicyRequest::Representation
-          command.request_object = set_iam_policy_request_object
-          command.response_representation = Google::Apis::PubsubV1::Policy::Representation
-          command.response_class = Google::Apis::PubsubV1::Policy
+        def test_snapshot_iam_permissions(resource, test_iam_permissions_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v1/{+resource}:testIamPermissions', options)
+          command.request_representation = Google::Apis::PubsubV1::TestIamPermissionsRequest::Representation
+          command.request_object = test_iam_permissions_request_object
+          command.response_representation = Google::Apis::PubsubV1::TestIamPermissionsResponse::Representation
+          command.response_class = Google::Apis::PubsubV1::TestIamPermissionsResponse
           command.params['resource'] = resource unless resource.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?