diff --git a/api_names_out.yaml b/api_names_out.yaml index bb77fd09b..66ab8ad56 100644 --- a/api_names_out.yaml +++ b/api_names_out.yaml @@ -28404,6 +28404,7 @@ "/content:v2/OrderLineItem": order_line_item "/content:v2/OrderLineItem/cancellations": cancellations "/content:v2/OrderLineItem/cancellations/cancellation": cancellation +"/content:v2/OrderLineItem/channelType": channel_type "/content:v2/OrderLineItem/id": id "/content:v2/OrderLineItem/price": price "/content:v2/OrderLineItem/product": product @@ -29233,6 +29234,7 @@ "/content:v2sandbox/OrderLineItem": order_line_item "/content:v2sandbox/OrderLineItem/cancellations": cancellations "/content:v2sandbox/OrderLineItem/cancellations/cancellation": cancellation +"/content:v2sandbox/OrderLineItem/channelType": channel_type "/content:v2sandbox/OrderLineItem/id": id "/content:v2sandbox/OrderLineItem/price": price "/content:v2sandbox/OrderLineItem/product": product @@ -51443,6 +51445,13 @@ "/servicemanagement:v1/BackendRule/deadline": deadline "/servicemanagement:v1/BackendRule/minDeadline": min_deadline "/servicemanagement:v1/BackendRule/selector": selector +"/servicemanagement:v1/Billing": billing +"/servicemanagement:v1/Billing/consumerDestinations": consumer_destinations +"/servicemanagement:v1/Billing/consumerDestinations/consumer_destination": consumer_destination +"/servicemanagement:v1/BillingDestination": billing_destination +"/servicemanagement:v1/BillingDestination/metrics": metrics +"/servicemanagement:v1/BillingDestination/metrics/metric": metric +"/servicemanagement:v1/BillingDestination/monitoredResource": monitored_resource "/servicemanagement:v1/Binding": binding "/servicemanagement:v1/Binding/condition": condition "/servicemanagement:v1/Binding/members": members @@ -51575,9 +51584,11 @@ "/servicemanagement:v1/FlowOperationMetadata/cancelState": cancel_state "/servicemanagement:v1/FlowOperationMetadata/deadline": deadline "/servicemanagement:v1/FlowOperationMetadata/flowName": flow_name +"/servicemanagement:v1/FlowOperationMetadata/operationType": operation_type "/servicemanagement:v1/FlowOperationMetadata/resourceNames": resource_names "/servicemanagement:v1/FlowOperationMetadata/resourceNames/resource_name": resource_name "/servicemanagement:v1/FlowOperationMetadata/startTime": start_time +"/servicemanagement:v1/FlowOperationMetadata/surface": surface "/servicemanagement:v1/GenerateConfigReportRequest": generate_config_report_request "/servicemanagement:v1/GenerateConfigReportRequest/newConfig": new_config "/servicemanagement:v1/GenerateConfigReportRequest/newConfig/new_config": new_config @@ -51791,6 +51802,7 @@ "/servicemanagement:v1/Service/apis/api": api "/servicemanagement:v1/Service/authentication": authentication "/servicemanagement:v1/Service/backend": backend +"/servicemanagement:v1/Service/billing": billing "/servicemanagement:v1/Service/configVersion": config_version "/servicemanagement:v1/Service/context": context "/servicemanagement:v1/Service/control": control @@ -52004,6 +52016,13 @@ "/serviceuser:v1/BackendRule/deadline": deadline "/serviceuser:v1/BackendRule/minDeadline": min_deadline "/serviceuser:v1/BackendRule/selector": selector +"/serviceuser:v1/Billing": billing +"/serviceuser:v1/Billing/consumerDestinations": consumer_destinations +"/serviceuser:v1/Billing/consumerDestinations/consumer_destination": consumer_destination +"/serviceuser:v1/BillingDestination": billing_destination +"/serviceuser:v1/BillingDestination/metrics": metrics +"/serviceuser:v1/BillingDestination/metrics/metric": metric +"/serviceuser:v1/BillingDestination/monitoredResource": monitored_resource "/serviceuser:v1/Context": context "/serviceuser:v1/Context/rules": rules "/serviceuser:v1/Context/rules/rule": rule @@ -52238,6 +52257,7 @@ "/serviceuser:v1/Service/apis/api": api "/serviceuser:v1/Service/authentication": authentication "/serviceuser:v1/Service/backend": backend +"/serviceuser:v1/Service/billing": billing "/serviceuser:v1/Service/configVersion": config_version "/serviceuser:v1/Service/context": context "/serviceuser:v1/Service/control": control diff --git a/generated/google/apis/content_v2.rb b/generated/google/apis/content_v2.rb index f858c5001..5303aaccf 100644 --- a/generated/google/apis/content_v2.rb +++ b/generated/google/apis/content_v2.rb @@ -26,7 +26,7 @@ module Google # @see https://developers.google.com/shopping-content module ContentV2 VERSION = 'V2' - REVISION = '20170926' + REVISION = '20170928' # Manage your product listings and accounts for Google Shopping AUTH_CONTENT = 'https://www.googleapis.com/auth/content' diff --git a/generated/google/apis/content_v2/classes.rb b/generated/google/apis/content_v2/classes.rb index a429e7a31..0a4cc2364 100644 --- a/generated/google/apis/content_v2/classes.rb +++ b/generated/google/apis/content_v2/classes.rb @@ -2700,6 +2700,11 @@ module Google # @return [Array] attr_accessor :cancellations + # The channel type of the order: "purchaseOnGoogle" or "googleExpress". + # Corresponds to the JSON property `channelType` + # @return [String] + attr_accessor :channel_type + # The id of the line item. # Corresponds to the JSON property `id` # @return [String] @@ -2774,6 +2779,7 @@ module Google # Update properties of this object def update!(**args) @cancellations = args[:cancellations] if args.key?(:cancellations) + @channel_type = args[:channel_type] if args.key?(:channel_type) @id = args[:id] if args.key?(:id) @price = args[:price] if args.key?(:price) @product = args[:product] if args.key?(:product) diff --git a/generated/google/apis/content_v2/representations.rb b/generated/google/apis/content_v2/representations.rb index 9a4908226..334534228 100644 --- a/generated/google/apis/content_v2/representations.rb +++ b/generated/google/apis/content_v2/representations.rb @@ -1722,6 +1722,7 @@ module Google class Representation < Google::Apis::Core::JsonRepresentation collection :cancellations, as: 'cancellations', class: Google::Apis::ContentV2::OrderCancellation, decorator: Google::Apis::ContentV2::OrderCancellation::Representation + property :channel_type, as: 'channelType' property :id, as: 'id' property :price, as: 'price', class: Google::Apis::ContentV2::Price, decorator: Google::Apis::ContentV2::Price::Representation diff --git a/generated/google/apis/content_v2/service.rb b/generated/google/apis/content_v2/service.rb index 20d3c3587..e2ee896f1 100644 --- a/generated/google/apis/content_v2/service.rb +++ b/generated/google/apis/content_v2/service.rb @@ -180,8 +180,7 @@ module Google # @param [Boolean] dry_run # Flag to run the request in dry-run mode. # @param [Boolean] force - # Flag to delete sub-accounts with products. The default value of false will - # become active on September 28, 2017. + # Flag to delete sub-accounts with products. The default value is false. # @param [String] fields # Selector specifying which fields to include in a partial response. # @param [String] quota_user diff --git a/generated/google/apis/content_v2sandbox.rb b/generated/google/apis/content_v2sandbox.rb index 274aaade8..b521a9aab 100644 --- a/generated/google/apis/content_v2sandbox.rb +++ b/generated/google/apis/content_v2sandbox.rb @@ -26,7 +26,7 @@ module Google # @see https://developers.google.com/shopping-content module ContentV2sandbox VERSION = 'V2sandbox' - REVISION = '20170926' + REVISION = '20170928' # Manage your product listings and accounts for Google Shopping AUTH_CONTENT = 'https://www.googleapis.com/auth/content' diff --git a/generated/google/apis/content_v2sandbox/classes.rb b/generated/google/apis/content_v2sandbox/classes.rb index aeaf9a77f..3aa87b42c 100644 --- a/generated/google/apis/content_v2sandbox/classes.rb +++ b/generated/google/apis/content_v2sandbox/classes.rb @@ -404,6 +404,11 @@ module Google # @return [Array] attr_accessor :cancellations + # The channel type of the order: "purchaseOnGoogle" or "googleExpress". + # Corresponds to the JSON property `channelType` + # @return [String] + attr_accessor :channel_type + # The id of the line item. # Corresponds to the JSON property `id` # @return [String] @@ -478,6 +483,7 @@ module Google # Update properties of this object def update!(**args) @cancellations = args[:cancellations] if args.key?(:cancellations) + @channel_type = args[:channel_type] if args.key?(:channel_type) @id = args[:id] if args.key?(:id) @price = args[:price] if args.key?(:price) @product = args[:product] if args.key?(:product) diff --git a/generated/google/apis/content_v2sandbox/representations.rb b/generated/google/apis/content_v2sandbox/representations.rb index b85faa128..c42e00fb1 100644 --- a/generated/google/apis/content_v2sandbox/representations.rb +++ b/generated/google/apis/content_v2sandbox/representations.rb @@ -479,6 +479,7 @@ module Google class Representation < Google::Apis::Core::JsonRepresentation collection :cancellations, as: 'cancellations', class: Google::Apis::ContentV2sandbox::OrderCancellation, decorator: Google::Apis::ContentV2sandbox::OrderCancellation::Representation + property :channel_type, as: 'channelType' property :id, as: 'id' property :price, as: 'price', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation diff --git a/generated/google/apis/dlp_v2beta1.rb b/generated/google/apis/dlp_v2beta1.rb index bcb9568ad..36997dfd0 100644 --- a/generated/google/apis/dlp_v2beta1.rb +++ b/generated/google/apis/dlp_v2beta1.rb @@ -27,7 +27,7 @@ module Google # @see https://cloud.google.com/dlp/docs/ module DlpV2beta1 VERSION = 'V2beta1' - REVISION = '20170927' + REVISION = '20170928' # View and manage your data across Google Cloud Platform services AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform' diff --git a/generated/google/apis/dlp_v2beta1/classes.rb b/generated/google/apis/dlp_v2beta1/classes.rb index fdcdfc96c..d2c656658 100644 --- a/generated/google/apis/dlp_v2beta1/classes.rb +++ b/generated/google/apis/dlp_v2beta1/classes.rb @@ -849,55 +849,6 @@ module Google end end - # Replaces an identifier with a surrogate using FPE based - # on a regular expression. - # The identifier must be representable by the ISO LATIN-1 character set. - # For a given crypto key and context, the same identifier will be - # replaced with the same surrogate. - class GooglePrivacyDlpV2beta1CryptoReplaceRegexFpeConfig - include Google::Apis::Core::Hashable - - # General identifier of a data field in a storage service. - # Corresponds to the JSON property `context` - # @return [Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1FieldId] - attr_accessor :context - - # This is a data encryption key (DEK) (as opposed to - # a key encryption key (KEK) stored by KMS). - # When using KMS to wrap/unwrap DEKs, be sure to set an appropriate - # IAM policy on the KMS CryptoKey (KEK) to ensure an attacker cannot - # unwrap the data crypto key. - # Corresponds to the JSON property `cryptoKey` - # @return [Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1CryptoKey] - attr_accessor :crypto_key - - # The regular expression to match the identifier/surrogate values. - # There are several restrictions on the regular expression: - # - It must match at least two distinct strings - # (for example, 'a' is invalid but '[ab]' is valid). - # - Both the regular expression itself and the strings it matches must be - # representable by the ISO LATIN-1 character set. - # - Its [syntax](https://github.com/google/re2/wiki/Syntax) can be found - # under the google/re2 repository on GitHub. - # - It is advisable to anchor the regex (with '^' and '$'); otherwise - # implicit '.*'s are assumed. - # - It must be 1000 characters at most. - # Corresponds to the JSON property `regex` - # @return [String] - attr_accessor :regex - - def initialize(**args) - update!(**args) - end - - # Update properties of this object - def update!(**args) - @context = args[:context] if args.key?(:context) - @crypto_key = args[:crypto_key] if args.key?(:crypto_key) - @regex = args[:regex] if args.key?(:regex) - end - end - # Record key for a finding in Cloud Datastore. class GooglePrivacyDlpV2beta1DatastoreKey include Google::Apis::Core::Hashable @@ -2377,15 +2328,6 @@ module Google # @return [Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1CryptoReplaceFfxFpeConfig] attr_accessor :crypto_replace_ffx_fpe_config - # Replaces an identifier with a surrogate using FPE based - # on a regular expression. - # The identifier must be representable by the ISO LATIN-1 character set. - # For a given crypto key and context, the same identifier will be - # replaced with the same surrogate. - # Corresponds to the JSON property `cryptoReplaceRegexFpeConfig` - # @return [Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1CryptoReplaceRegexFpeConfig] - attr_accessor :crypto_replace_regex_fpe_config - # Buckets values based on fixed size ranges. The # Bucketing transformation can provide all of this functionality, # but requires more configuration. This message is provided as a convenience to @@ -2433,7 +2375,6 @@ module Google @character_mask_config = args[:character_mask_config] if args.key?(:character_mask_config) @crypto_hash_config = args[:crypto_hash_config] if args.key?(:crypto_hash_config) @crypto_replace_ffx_fpe_config = args[:crypto_replace_ffx_fpe_config] if args.key?(:crypto_replace_ffx_fpe_config) - @crypto_replace_regex_fpe_config = args[:crypto_replace_regex_fpe_config] if args.key?(:crypto_replace_regex_fpe_config) @fixed_size_bucketing_config = args[:fixed_size_bucketing_config] if args.key?(:fixed_size_bucketing_config) @redact_config = args[:redact_config] if args.key?(:redact_config) @replace_config = args[:replace_config] if args.key?(:replace_config) diff --git a/generated/google/apis/dlp_v2beta1/representations.rb b/generated/google/apis/dlp_v2beta1/representations.rb index 9e99779e4..fb16c1c95 100644 --- a/generated/google/apis/dlp_v2beta1/representations.rb +++ b/generated/google/apis/dlp_v2beta1/representations.rb @@ -172,12 +172,6 @@ module Google include Google::Apis::Core::JsonObjectSupport end - class GooglePrivacyDlpV2beta1CryptoReplaceRegexFpeConfig - class Representation < Google::Apis::Core::JsonRepresentation; end - - include Google::Apis::Core::JsonObjectSupport - end - class GooglePrivacyDlpV2beta1DatastoreKey class Representation < Google::Apis::Core::JsonRepresentation; end @@ -897,17 +891,6 @@ module Google end end - class GooglePrivacyDlpV2beta1CryptoReplaceRegexFpeConfig - # @private - class Representation < Google::Apis::Core::JsonRepresentation - property :context, as: 'context', class: Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1FieldId, decorator: Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1FieldId::Representation - - property :crypto_key, as: 'cryptoKey', class: Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1CryptoKey, decorator: Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1CryptoKey::Representation - - property :regex, as: 'regex' - end - end - class GooglePrivacyDlpV2beta1DatastoreKey # @private class Representation < Google::Apis::Core::JsonRepresentation @@ -1389,8 +1372,6 @@ module Google property :crypto_replace_ffx_fpe_config, as: 'cryptoReplaceFfxFpeConfig', class: Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1CryptoReplaceFfxFpeConfig, decorator: Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1CryptoReplaceFfxFpeConfig::Representation - property :crypto_replace_regex_fpe_config, as: 'cryptoReplaceRegexFpeConfig', class: Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1CryptoReplaceRegexFpeConfig, decorator: Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1CryptoReplaceRegexFpeConfig::Representation - property :fixed_size_bucketing_config, as: 'fixedSizeBucketingConfig', class: Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1FixedSizeBucketingConfig, decorator: Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1FixedSizeBucketingConfig::Representation property :redact_config, as: 'redactConfig', class: Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1RedactConfig, decorator: Google::Apis::DlpV2beta1::GooglePrivacyDlpV2beta1RedactConfig::Representation diff --git a/generated/google/apis/pubsub_v1.rb b/generated/google/apis/pubsub_v1.rb index 89bc4dbc0..554c41bb0 100644 --- a/generated/google/apis/pubsub_v1.rb +++ b/generated/google/apis/pubsub_v1.rb @@ -25,7 +25,7 @@ module Google # @see https://cloud.google.com/pubsub/docs module PubsubV1 VERSION = 'V1' - REVISION = '20170607' + REVISION = '20170918' # View and manage your data across Google Cloud Platform services AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform' diff --git a/generated/google/apis/pubsub_v1/classes.rb b/generated/google/apis/pubsub_v1/classes.rb index 05a1ea058..fbe7fbf0b 100644 --- a/generated/google/apis/pubsub_v1/classes.rb +++ b/generated/google/apis/pubsub_v1/classes.rb @@ -558,7 +558,8 @@ module Google # For pull subscriptions, this value is used as the initial value for the ack # deadline. To override this value for a given message, call # `ModifyAckDeadline` with the corresponding `ack_id` if using - # pull. + # non-streaming pull or send the `ack_id` in a + # `StreamingModifyAckDeadlineRequest` if using streaming pull. # The minimum custom deadline you can specify is 10 seconds. # The maximum custom deadline you can specify is 600 seconds (10 minutes). # If this parameter is 0, a default value of 10 seconds is used. diff --git a/generated/google/apis/script_v1.rb b/generated/google/apis/script_v1.rb index 0a42e46f9..52c6261c7 100644 --- a/generated/google/apis/script_v1.rb +++ b/generated/google/apis/script_v1.rb @@ -20,12 +20,12 @@ module Google module Apis # Google Apps Script Execution API # - # Executes functions in Google Apps Script projects. + # An API for managing and executing Google Apps Script projects. # # @see https://developers.google.com/apps-script/execution/rest/v1/scripts/run module ScriptV1 VERSION = 'V1' - REVISION = '20170823' + REVISION = '20170927' # Read, send, delete, and manage your email AUTH_SCOPE = 'https://mail.google.com/' diff --git a/generated/google/apis/script_v1/service.rb b/generated/google/apis/script_v1/service.rb index 4ed04b2cb..fb836e46a 100644 --- a/generated/google/apis/script_v1/service.rb +++ b/generated/google/apis/script_v1/service.rb @@ -22,7 +22,7 @@ module Google module ScriptV1 # Google Apps Script Execution API # - # Executes functions in Google Apps Script projects. + # An API for managing and executing Google Apps Script projects. # # @example # require 'google/apis/script_v1' diff --git a/generated/google/apis/servicemanagement_v1.rb b/generated/google/apis/servicemanagement_v1.rb index 6f467c2c5..8bff80534 100644 --- a/generated/google/apis/servicemanagement_v1.rb +++ b/generated/google/apis/servicemanagement_v1.rb @@ -27,7 +27,7 @@ module Google # @see https://cloud.google.com/service-management/ module ServicemanagementV1 VERSION = 'V1' - REVISION = '20170908' + REVISION = '20170926' # View and manage your data across Google Cloud Platform services AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform' diff --git a/generated/google/apis/servicemanagement_v1/classes.rb b/generated/google/apis/servicemanagement_v1/classes.rb index c14b1dc72..d1bf8d56e 100644 --- a/generated/google/apis/servicemanagement_v1/classes.rb +++ b/generated/google/apis/servicemanagement_v1/classes.rb @@ -555,6 +555,74 @@ module Google end end + # Billing related configuration of the service. + # The following example shows how to configure monitored resources and metrics + # for billing: + # monitored_resources: + # - type: library.googleapis.com/branch + # labels: + # - key: /city + # description: The city where the library branch is located in. + # - key: /name + # description: The name of the branch. + # metrics: + # - name: library.googleapis.com/book/borrowed_count + # metric_kind: DELTA + # value_type: INT64 + # billing: + # consumer_destinations: + # - monitored_resource: library.googleapis.com/branch + # metrics: + # - library.googleapis.com/book/borrowed_count + class Billing + include Google::Apis::Core::Hashable + + # Billing configurations for sending metrics to the consumer project. + # There can be multiple consumer destinations per service, each one must have + # a different monitored resource type. A metric can be used in at most + # one consumer destination. + # Corresponds to the JSON property `consumerDestinations` + # @return [Array] + attr_accessor :consumer_destinations + + def initialize(**args) + update!(**args) + end + + # Update properties of this object + def update!(**args) + @consumer_destinations = args[:consumer_destinations] if args.key?(:consumer_destinations) + end + end + + # Configuration of a specific billing destination (Currently only support + # bill against consumer project). + class BillingDestination + include Google::Apis::Core::Hashable + + # Names of the metrics to report to this billing destination. + # Each name must be defined in Service.metrics section. + # Corresponds to the JSON property `metrics` + # @return [Array] + attr_accessor :metrics + + # The monitored resource type. The type must be defined in + # Service.monitored_resources section. + # Corresponds to the JSON property `monitoredResource` + # @return [String] + attr_accessor :monitored_resource + + def initialize(**args) + update!(**args) + end + + # Update properties of this object + def update!(**args) + @metrics = args[:metrics] if args.key?(:metrics) + @monitored_resource = args[:monitored_resource] if args.key?(:monitored_resource) + end + end + # Associates `members` with a `role`. class Binding include Google::Apis::Core::Hashable @@ -1531,6 +1599,13 @@ module Google # @return [String] attr_accessor :flow_name + # Operation type which is a flow type and subtype info as that is missing in + # our datastore otherwise. This maps to the ordinal value of the enum: + # jcg/api/tenant/operations/OperationNamespace.java + # Corresponds to the JSON property `operationType` + # @return [Fixnum] + attr_accessor :operation_type + # The full name of the resources that this flow is directly associated with. # Corresponds to the JSON property `resourceNames` # @return [Array] @@ -1541,6 +1616,11 @@ module Google # @return [String] attr_accessor :start_time + # + # Corresponds to the JSON property `surface` + # @return [String] + attr_accessor :surface + def initialize(**args) update!(**args) end @@ -1550,8 +1630,10 @@ module Google @cancel_state = args[:cancel_state] if args.key?(:cancel_state) @deadline = args[:deadline] if args.key?(:deadline) @flow_name = args[:flow_name] if args.key?(:flow_name) + @operation_type = args[:operation_type] if args.key?(:operation_type) @resource_names = args[:resource_names] if args.key?(:resource_names) @start_time = args[:start_time] if args.key?(:start_time) + @surface = args[:surface] if args.key?(:surface) end end @@ -3514,6 +3596,29 @@ module Google # @return [Google::Apis::ServicemanagementV1::Backend] attr_accessor :backend + # Billing related configuration of the service. + # The following example shows how to configure monitored resources and metrics + # for billing: + # monitored_resources: + # - type: library.googleapis.com/branch + # labels: + # - key: /city + # description: The city where the library branch is located in. + # - key: /name + # description: The name of the branch. + # metrics: + # - name: library.googleapis.com/book/borrowed_count + # metric_kind: DELTA + # value_type: INT64 + # billing: + # consumer_destinations: + # - monitored_resource: library.googleapis.com/branch + # metrics: + # - library.googleapis.com/book/borrowed_count + # Corresponds to the JSON property `billing` + # @return [Google::Apis::ServicemanagementV1::Billing] + attr_accessor :billing + # The semantic version of the service configuration. The config version # affects the interpretation of the service configuration. For example, # certain features are enabled by default for certain config versions. @@ -3866,6 +3971,7 @@ module Google @apis = args[:apis] if args.key?(:apis) @authentication = args[:authentication] if args.key?(:authentication) @backend = args[:backend] if args.key?(:backend) + @billing = args[:billing] if args.key?(:billing) @config_version = args[:config_version] if args.key?(:config_version) @context = args[:context] if args.key?(:context) @control = args[:control] if args.key?(:control) diff --git a/generated/google/apis/servicemanagement_v1/representations.rb b/generated/google/apis/servicemanagement_v1/representations.rb index 6ddd948e1..ccb1a066a 100644 --- a/generated/google/apis/servicemanagement_v1/representations.rb +++ b/generated/google/apis/servicemanagement_v1/representations.rb @@ -88,6 +88,18 @@ module Google include Google::Apis::Core::JsonObjectSupport end + class Billing + class Representation < Google::Apis::Core::JsonRepresentation; end + + include Google::Apis::Core::JsonObjectSupport + end + + class BillingDestination + class Representation < Google::Apis::Core::JsonRepresentation; end + + include Google::Apis::Core::JsonObjectSupport + end + class Binding class Representation < Google::Apis::Core::JsonRepresentation; end @@ -666,6 +678,22 @@ module Google end end + class Billing + # @private + class Representation < Google::Apis::Core::JsonRepresentation + collection :consumer_destinations, as: 'consumerDestinations', class: Google::Apis::ServicemanagementV1::BillingDestination, decorator: Google::Apis::ServicemanagementV1::BillingDestination::Representation + + end + end + + class BillingDestination + # @private + class Representation < Google::Apis::Core::JsonRepresentation + collection :metrics, as: 'metrics' + property :monitored_resource, as: 'monitoredResource' + end + end + class Binding # @private class Representation < Google::Apis::Core::JsonRepresentation @@ -905,8 +933,10 @@ module Google property :cancel_state, as: 'cancelState' property :deadline, as: 'deadline' property :flow_name, as: 'flowName' + property :operation_type, as: 'operationType' collection :resource_names, as: 'resourceNames' property :start_time, as: 'startTime' + property :surface, as: 'surface' end end @@ -1261,6 +1291,8 @@ module Google property :backend, as: 'backend', class: Google::Apis::ServicemanagementV1::Backend, decorator: Google::Apis::ServicemanagementV1::Backend::Representation + property :billing, as: 'billing', class: Google::Apis::ServicemanagementV1::Billing, decorator: Google::Apis::ServicemanagementV1::Billing::Representation + property :config_version, as: 'configVersion' property :context, as: 'context', class: Google::Apis::ServicemanagementV1::Context, decorator: Google::Apis::ServicemanagementV1::Context::Representation diff --git a/generated/google/apis/serviceuser_v1.rb b/generated/google/apis/serviceuser_v1.rb index a189ba54d..bcfefb515 100644 --- a/generated/google/apis/serviceuser_v1.rb +++ b/generated/google/apis/serviceuser_v1.rb @@ -27,7 +27,7 @@ module Google # @see https://cloud.google.com/service-management/ module ServiceuserV1 VERSION = 'V1' - REVISION = '20170908' + REVISION = '20170926' # View and manage your data across Google Cloud Platform services AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform' diff --git a/generated/google/apis/serviceuser_v1/classes.rb b/generated/google/apis/serviceuser_v1/classes.rb index 2c8775410..5be5b2883 100644 --- a/generated/google/apis/serviceuser_v1/classes.rb +++ b/generated/google/apis/serviceuser_v1/classes.rb @@ -351,49 +351,6 @@ module Google end end - # Authorization rule for API services. - # It specifies the permission(s) required for an API element for the overall - # API request to succeed. It is typically used to mark request message fields - # that contain the name of the resource and indicates the permissions that - # will be checked on that resource. - # For example: - # package google.storage.v1; - # message CopyObjectRequest ` - # string source = 1 [ - # (google.api.authz).permissions = "storage.objects.get"]; - # string destination = 2 [ - # (google.api.authz).permissions = - # "storage.objects.create,storage.objects.update"]; - # ` - class AuthorizationRule - include Google::Apis::Core::Hashable - - # The required permissions. The acceptable values vary depend on the - # authorization system used. For Google APIs, it should be a comma-separated - # Google IAM permission values. When multiple permissions are listed, the - # semantics is not defined by the system. Additional documentation must - # be provided manually. - # Corresponds to the JSON property `permissions` - # @return [String] - attr_accessor :permissions - - # Selects the API elements to which this rule applies. - # Refer to selector for syntax details. - # Corresponds to the JSON property `selector` - # @return [String] - attr_accessor :selector - - def initialize(**args) - update!(**args) - end - - # Update properties of this object - def update!(**args) - @permissions = args[:permissions] if args.key?(:permissions) - @selector = args[:selector] if args.key?(:selector) - end - end - # `Backend` defines the backend configuration for a service. class Backend include Google::Apis::Core::Hashable @@ -454,6 +411,74 @@ module Google end end + # Billing related configuration of the service. + # The following example shows how to configure monitored resources and metrics + # for billing: + # monitored_resources: + # - type: library.googleapis.com/branch + # labels: + # - key: /city + # description: The city where the library branch is located in. + # - key: /name + # description: The name of the branch. + # metrics: + # - name: library.googleapis.com/book/borrowed_count + # metric_kind: DELTA + # value_type: INT64 + # billing: + # consumer_destinations: + # - monitored_resource: library.googleapis.com/branch + # metrics: + # - library.googleapis.com/book/borrowed_count + class Billing + include Google::Apis::Core::Hashable + + # Billing configurations for sending metrics to the consumer project. + # There can be multiple consumer destinations per service, each one must have + # a different monitored resource type. A metric can be used in at most + # one consumer destination. + # Corresponds to the JSON property `consumerDestinations` + # @return [Array] + attr_accessor :consumer_destinations + + def initialize(**args) + update!(**args) + end + + # Update properties of this object + def update!(**args) + @consumer_destinations = args[:consumer_destinations] if args.key?(:consumer_destinations) + end + end + + # Configuration of a specific billing destination (Currently only support + # bill against consumer project). + class BillingDestination + include Google::Apis::Core::Hashable + + # Names of the metrics to report to this billing destination. + # Each name must be defined in Service.metrics section. + # Corresponds to the JSON property `metrics` + # @return [Array] + attr_accessor :metrics + + # The monitored resource type. The type must be defined in + # Service.monitored_resources section. + # Corresponds to the JSON property `monitoredResource` + # @return [String] + attr_accessor :monitored_resource + + def initialize(**args) + update!(**args) + end + + # Update properties of this object + def update!(**args) + @metrics = args[:metrics] if args.key?(:metrics) + @monitored_resource = args[:monitored_resource] if args.key?(:monitored_resource) + end + end + # `Context` defines which contexts an API requests. # Example: # context: @@ -1297,14 +1322,6 @@ module Google # @return [Array] attr_accessor :additional_bindings - # Specifies the permission(s) required for an API element for the overall - # API request to succeed. It is typically used to mark request message fields - # that contain the name of the resource and indicates the permissions that - # will be checked on that resource. - # Corresponds to the JSON property `authorizations` - # @return [Array] - attr_accessor :authorizations - # The name of the request field whose value is mapped to the HTTP body, or # `*` for mapping all fields not captured by the path pattern to the HTTP # body. NOTE: the referred field must not be a repeated field and must be @@ -1368,44 +1385,6 @@ module Google # @return [String] attr_accessor :response_body - # DO NOT USE. This is an experimental field. - # Optional. The REST collection name is by default derived from the URL - # pattern. If specified, this field overrides the default collection name. - # Example: - # rpc AddressesAggregatedList(AddressesAggregatedListRequest) - # returns (AddressesAggregatedListResponse) ` - # option (google.api.http) = ` - # get: "/v1/projects/`project_id`/aggregated/addresses" - # rest_collection: "projects.addresses" - # `; - # ` - # This method has the automatically derived collection name - # "projects.aggregated". Because, semantically, this rpc is actually an - # operation on the "projects.addresses" collection, the `rest_collection` - # field is configured to override the derived collection name. - # Corresponds to the JSON property `restCollection` - # @return [String] - attr_accessor :rest_collection - - # DO NOT USE. This is an experimental field. - # Optional. The rest method name is by default derived from the URL - # pattern. If specified, this field overrides the default method name. - # Example: - # rpc CreateResource(CreateResourceRequest) - # returns (CreateResourceResponse) ` - # option (google.api.http) = ` - # post: "/v1/resources", - # body: "resource", - # rest_method_name: "insert" - # `; - # ` - # This method has the automatically derived rest method name - # "create", but for backwards compatibility with apiary, it is specified as - # insert. - # Corresponds to the JSON property `restMethodName` - # @return [String] - attr_accessor :rest_method_name - # Selects methods to which this rule applies. # Refer to selector for syntax details. # Corresponds to the JSON property `selector` @@ -1419,7 +1398,6 @@ module Google # Update properties of this object def update!(**args) @additional_bindings = args[:additional_bindings] if args.key?(:additional_bindings) - @authorizations = args[:authorizations] if args.key?(:authorizations) @body = args[:body] if args.key?(:body) @custom = args[:custom] if args.key?(:custom) @delete = args[:delete] if args.key?(:delete) @@ -1430,8 +1408,6 @@ module Google @post = args[:post] if args.key?(:post) @put = args[:put] if args.key?(:put) @response_body = args[:response_body] if args.key?(:response_body) - @rest_collection = args[:rest_collection] if args.key?(:rest_collection) - @rest_method_name = args[:rest_method_name] if args.key?(:rest_method_name) @selector = args[:selector] if args.key?(:selector) end end @@ -2799,6 +2775,29 @@ module Google # @return [Google::Apis::ServiceuserV1::Backend] attr_accessor :backend + # Billing related configuration of the service. + # The following example shows how to configure monitored resources and metrics + # for billing: + # monitored_resources: + # - type: library.googleapis.com/branch + # labels: + # - key: /city + # description: The city where the library branch is located in. + # - key: /name + # description: The name of the branch. + # metrics: + # - name: library.googleapis.com/book/borrowed_count + # metric_kind: DELTA + # value_type: INT64 + # billing: + # consumer_destinations: + # - monitored_resource: library.googleapis.com/branch + # metrics: + # - library.googleapis.com/book/borrowed_count + # Corresponds to the JSON property `billing` + # @return [Google::Apis::ServiceuserV1::Billing] + attr_accessor :billing + # The semantic version of the service configuration. The config version # affects the interpretation of the service configuration. For example, # certain features are enabled by default for certain config versions. @@ -3151,6 +3150,7 @@ module Google @apis = args[:apis] if args.key?(:apis) @authentication = args[:authentication] if args.key?(:authentication) @backend = args[:backend] if args.key?(:backend) + @billing = args[:billing] if args.key?(:billing) @config_version = args[:config_version] if args.key?(:config_version) @context = args[:context] if args.key?(:context) @control = args[:control] if args.key?(:control) diff --git a/generated/google/apis/serviceuser_v1/representations.rb b/generated/google/apis/serviceuser_v1/representations.rb index 3b8a5dc54..6ba26b7f0 100644 --- a/generated/google/apis/serviceuser_v1/representations.rb +++ b/generated/google/apis/serviceuser_v1/representations.rb @@ -58,12 +58,6 @@ module Google include Google::Apis::Core::JsonObjectSupport end - class AuthorizationRule - class Representation < Google::Apis::Core::JsonRepresentation; end - - include Google::Apis::Core::JsonObjectSupport - end - class Backend class Representation < Google::Apis::Core::JsonRepresentation; end @@ -76,6 +70,18 @@ module Google include Google::Apis::Core::JsonObjectSupport end + class Billing + class Representation < Google::Apis::Core::JsonRepresentation; end + + include Google::Apis::Core::JsonObjectSupport + end + + class BillingDestination + class Representation < Google::Apis::Core::JsonRepresentation; end + + include Google::Apis::Core::JsonObjectSupport + end + class Context class Representation < Google::Apis::Core::JsonRepresentation; end @@ -467,14 +473,6 @@ module Google end end - class AuthorizationRule - # @private - class Representation < Google::Apis::Core::JsonRepresentation - property :permissions, as: 'permissions' - property :selector, as: 'selector' - end - end - class Backend # @private class Representation < Google::Apis::Core::JsonRepresentation @@ -493,6 +491,22 @@ module Google end end + class Billing + # @private + class Representation < Google::Apis::Core::JsonRepresentation + collection :consumer_destinations, as: 'consumerDestinations', class: Google::Apis::ServiceuserV1::BillingDestination, decorator: Google::Apis::ServiceuserV1::BillingDestination::Representation + + end + end + + class BillingDestination + # @private + class Representation < Google::Apis::Core::JsonRepresentation + collection :metrics, as: 'metrics' + property :monitored_resource, as: 'monitoredResource' + end + end + class Context # @private class Representation < Google::Apis::Core::JsonRepresentation @@ -658,8 +672,6 @@ module Google class Representation < Google::Apis::Core::JsonRepresentation collection :additional_bindings, as: 'additionalBindings', class: Google::Apis::ServiceuserV1::HttpRule, decorator: Google::Apis::ServiceuserV1::HttpRule::Representation - collection :authorizations, as: 'authorizations', class: Google::Apis::ServiceuserV1::AuthorizationRule, decorator: Google::Apis::ServiceuserV1::AuthorizationRule::Representation - property :body, as: 'body' property :custom, as: 'custom', class: Google::Apis::ServiceuserV1::CustomHttpPattern, decorator: Google::Apis::ServiceuserV1::CustomHttpPattern::Representation @@ -673,8 +685,6 @@ module Google property :post, as: 'post' property :put, as: 'put' property :response_body, as: 'responseBody' - property :rest_collection, as: 'restCollection' - property :rest_method_name, as: 'restMethodName' property :selector, as: 'selector' end end @@ -928,6 +938,8 @@ module Google property :backend, as: 'backend', class: Google::Apis::ServiceuserV1::Backend, decorator: Google::Apis::ServiceuserV1::Backend::Representation + property :billing, as: 'billing', class: Google::Apis::ServiceuserV1::Billing, decorator: Google::Apis::ServiceuserV1::Billing::Representation + property :config_version, as: 'configVersion' property :context, as: 'context', class: Google::Apis::ServiceuserV1::Context, decorator: Google::Apis::ServiceuserV1::Context::Representation