Navigation Menu

Skip to content

Commit

Permalink
fix!: remove unused fields from EnhancedMeasurementSettings
Browse files Browse the repository at this point in the history 
fix!: `update_mask` field is required for all Update operations
feat: add pagination support for `ListFirebaseLinks` operation
fix!: rename `country_code` field to `region_code` in `Account`
fix!: rename `url_query_parameter` field to `uri_query_parameter` in `EnhancedMeasurementSettings`
fix!: remove `parent` field from `GoogleAdsLink`

PiperOrigin-RevId: 351651504
  • Loading branch information
Google APIs authored and Copybara-Service committed Jan 13, 2021
1 parent 2707d2e commit 23e7356
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 114 deletions.
3 changes: 1 addition & 2 deletions google/analytics/admin/v1alpha/BUILD.bazel
View file
Expand Up @@ -71,6 +71,7 @@ java_gapic_library(
name = "admin_java_gapic",
srcs = [":admin_proto_with_info"],
grpc_service_config = "admin_grpc_service_config.json",
package = "google.analytics.admin.v1alpha",
test_deps = [
":admin_java_grpc",
],
Expand All @@ -82,7 +83,6 @@ java_gapic_library(
java_gapic_test(
name = "admin_java_gapic_test_suite",
test_classes = [
"com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClientTest",
],
runtime_deps = [":admin_java_gapic_test"],
)
Expand Down Expand Up @@ -150,7 +150,6 @@ go_gapic_assembly_pkg(
##############################################################################
# Python
##############################################################################

load(
"@com_google_googleapis_imports//:imports.bzl",
"py_gapic_assembly_pkg",
Expand Down
82 changes: 51 additions & 31 deletions google/analytics/admin/v1alpha/analytics_admin.proto
View file
Expand Up @@ -23,6 +23,7 @@ import "google/api/field_behavior.proto";
import "google/api/resource.proto";
import "google/protobuf/empty.proto";
import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto";

option go_package = "google.golang.org/genproto/googleapis/analytics/admin/v1alpha;admin";
option java_multiple_files = true;
Expand All @@ -39,8 +40,6 @@ service AnalyticsAdminService {
"https://www.googleapis.com/auth/analytics.readonly";

// Lookup for a single Account.
// Throws "Target not found" if no such account found, or if caller does not
// have permissions to access it.
rpc GetAccount(GetAccountRequest) returns (Account) {
option (google.api.http) = {
get: "/v1alpha/{name=accounts/*}"
Expand Down Expand Up @@ -102,9 +101,6 @@ service AnalyticsAdminService {
}

// Lookup for a single "GA4" Property.
//
// Throws "Target not found" if no such property found, if property is not
// of the type "GA4", or if caller does not have permissions to access it.
rpc GetProperty(GetPropertyRequest) returns (Property) {
option (google.api.http) = {
get: "/v1alpha/{name=properties/*}"
Expand Down Expand Up @@ -293,9 +289,6 @@ service AnalyticsAdminService {
}

// Lookup for a single WebDataStream
//
// Throws "Target not found" if no such web data stream found, or if the
// caller does not have permissions to access it.
rpc GetWebDataStream(GetWebDataStreamRequest) returns (WebDataStream) {
option (google.api.http) = {
get: "/v1alpha/{name=properties/*/webDataStreams/*}"
Expand Down Expand Up @@ -341,9 +334,6 @@ service AnalyticsAdminService {
}

// Lookup for a single IosAppDataStream
//
// Throws "Target not found" if no such iOS app data stream found, or if the
// caller does not have permissions to access it.
rpc GetIosAppDataStream(GetIosAppDataStreamRequest) returns (IosAppDataStream) {
option (google.api.http) = {
get: "/v1alpha/{name=properties/*/iosAppDataStreams/*}"
Expand Down Expand Up @@ -389,9 +379,6 @@ service AnalyticsAdminService {
}

// Lookup for a single AndroidAppDataStream
//
// Throws "Target not found" if no such android app data stream found, or if
// the caller does not have permissions to access it.
rpc GetAndroidAppDataStream(GetAndroidAppDataStreamRequest) returns (AndroidAppDataStream) {
option (google.api.http) = {
get: "/v1alpha/{name=properties/*/androidAppDataStreams/*}"
Expand Down Expand Up @@ -609,8 +596,10 @@ message UpdateAccountRequest {
// The account's `name` field is used to identify the account.
Account account = 1 [(google.api.field_behavior) = REQUIRED];

// The list of fields to be updated. Omitted fields will not be updated.
google.protobuf.FieldMask update_mask = 2;
// Required. The list of fields to be updated. Omitted fields will not be updated.
// To replace the entire entity, use one path with the string "*" to match
// all fields.
google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
}

// Request message for ProvisionAccountTicket RPC.
Expand Down Expand Up @@ -694,8 +683,10 @@ message UpdatePropertyRequest {
// updated.
Property property = 1 [(google.api.field_behavior) = REQUIRED];

// The list of fields to be updated. Omitted fields will not be updated.
google.protobuf.FieldMask update_mask = 2;
// Required. The list of fields to be updated. Omitted fields will not be updated.
// To replace the entire entity, use one path with the string "*" to match
// all fields.
google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
}

// Request message for CreateProperty RPC.
Expand Down Expand Up @@ -971,8 +962,10 @@ message UpdateWebDataStreamRequest {
// The `name` field is used to identify the web stream to be updated.
WebDataStream web_data_stream = 1 [(google.api.field_behavior) = REQUIRED];

// The list of fields to be updated. Omitted fields will not be updated.
google.protobuf.FieldMask update_mask = 2;
// Required. The list of fields to be updated. Omitted fields will not be updated.
// To replace the entire entity, use one path with the string "*" to match
// all fields.
google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
}

// Request message for CreateWebDataStream RPC.
Expand Down Expand Up @@ -1056,8 +1049,10 @@ message UpdateIosAppDataStreamRequest {
// The `name` field is used to identify the iOS app stream to be updated.
IosAppDataStream ios_app_data_stream = 1 [(google.api.field_behavior) = REQUIRED];

// The list of fields to be updated. Omitted fields will not be updated.
google.protobuf.FieldMask update_mask = 2;
// Required. The list of fields to be updated. Omitted fields will not be updated.
// To replace the entire entity, use one path with the string "*" to match
// all fields.
google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
}

// Request message for CreateIosAppDataStream RPC.
Expand Down Expand Up @@ -1141,8 +1136,10 @@ message UpdateAndroidAppDataStreamRequest {
// The `name` field is used to identify the android app stream to be updated.
AndroidAppDataStream android_app_data_stream = 1 [(google.api.field_behavior) = REQUIRED];

// The list of fields to be updated. Omitted fields will not be updated.
google.protobuf.FieldMask update_mask = 2;
// Required. The list of fields to be updated. Omitted fields will not be updated.
// To replace the entire entity, use one path with the string "*" to match
// all fields.
google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
}

// Request message for CreateAndroidAppDataStream RPC.
Expand Down Expand Up @@ -1200,7 +1197,6 @@ message ListAndroidAppDataStreamsResponse {
message GetEnhancedMeasurementSettingsRequest {
// Required. The name of the settings to lookup.
// Format:
//
// properties/{property_id}/webDataStreams/{stream_id}/enhancedMeasurementSettings
// Example: "properties/1000/webDataStreams/2000/enhancedMeasurementSettings"
string name = 1 [
Expand All @@ -1217,8 +1213,10 @@ message UpdateEnhancedMeasurementSettingsRequest {
// The `name` field is used to identify the settings to be updated.
EnhancedMeasurementSettings enhanced_measurement_settings = 1 [(google.api.field_behavior) = REQUIRED];

// The list of fields to be updated. Omitted fields will not be updated.
google.protobuf.FieldMask update_mask = 2;
// Required. The list of fields to be updated. Omitted fields will not be updated.
// To replace the entire entity, use one path with the string "*" to match
// all fields.
google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
}

// Request message for CreateFirebaseLink RPC
Expand All @@ -1241,8 +1239,10 @@ message UpdateFirebaseLinkRequest {
// Required. The Firebase link to update.
FirebaseLink firebase_link = 1 [(google.api.field_behavior) = REQUIRED];

// The list of fields to be updated. Omitted fields will not be updated.
google.protobuf.FieldMask update_mask = 2;
// Required. The list of fields to be updated. Omitted fields will not be updated.
// To replace the entire entity, use one path with the string "*" to match
// all fields.
google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
}

// Request message for DeleteFirebaseLink RPC
Expand All @@ -1267,12 +1267,30 @@ message ListFirebaseLinksRequest {
child_type: "analyticsadmin.googleapis.com/FirebaseLink"
}
];

// The maximum number of resources to return. The service may return
// fewer than this value, even if there are additional pages.
// If unspecified, at most 50 resources will be returned.
// The maximum value is 200; (higher values will be coerced to the maximum)
int32 page_size = 2;

// A page token, received from a previous `ListFirebaseLinks` call.
// Provide this to retrieve the subsequent page.
// When paginating, all other parameters provided to `ListProperties` must
// match the call that provided the page token.
string page_token = 3;
}

// Response message for ListFirebaseLinks RPC
message ListFirebaseLinksResponse {
// List of FirebaseLinks. This will have at most one value.
repeated FirebaseLink firebase_links = 1;

// A token, which can be sent as `page_token` to retrieve the next page.
// If this field is omitted, there are no subsequent pages.
// Currently, Google Analytics supports only one FirebaseLink per property,
// so this will never be populated.
string next_page_token = 2;
}

// Request message for GetGlobalSiteTag RPC.
Expand Down Expand Up @@ -1308,8 +1326,10 @@ message UpdateGoogleAdsLinkRequest {
// The GoogleAdsLink to update
GoogleAdsLink google_ads_link = 1;

// The list of fields to be updated. Omitted fields will not be updated.
google.protobuf.FieldMask update_mask = 2;
// Required. The list of fields to be updated. Omitted fields will not be updated.
// To replace the entire entity, use one path with the string "*" to match
// all fields.
google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
}

// Request message for DeleteGoogleAdsLink RPC.
Expand Down

0 comments on commit 23e7356

Please sign in to comment.