From cc85255c273384d3ab5d5344d0bdf098c39d2a63 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Wed, 8 Jul 2020 13:22:07 -0700 Subject: [PATCH] Feature: Add CSV and TSV to file types. Fixes: Cleaned up resource_reference annotations for correct semantics and improved client library generation Fixes: BucketingConfig.replacement_value marked as required PiperOrigin-RevId: 320252582 --- google/privacy/dlp/v2/dlp.proto | 281 +++++++++++------- .../dlp/v2/dlp_grpc_service_config.json | 24 +- google/privacy/dlp/v2/storage.proto | 20 +- 3 files changed, 198 insertions(+), 127 deletions(-) diff --git a/google/privacy/dlp/v2/dlp.proto b/google/privacy/dlp/v2/dlp.proto index dea49625..781ac1c4 100644 --- a/google/privacy/dlp/v2/dlp.proto +++ b/google/privacy/dlp/v2/dlp.proto @@ -16,7 +16,6 @@ syntax = "proto3"; package google.privacy.dlp.v2; -import "google/api/annotations.proto"; import "google/api/client.proto"; import "google/api/field_behavior.proto"; import "google/api/resource.proto"; @@ -29,6 +28,7 @@ import "google/rpc/status.proto"; import "google/type/date.proto"; import "google/type/dayofweek.proto"; import "google/type/timeofday.proto"; +import "google/api/annotations.proto"; option csharp_namespace = "Google.Cloud.Dlp.V2"; option go_package = "google.golang.org/genproto/googleapis/privacy/dlp/v2;dlp"; @@ -37,6 +37,11 @@ option java_outer_classname = "DlpProto"; option java_package = "com.google.privacy.dlp.v2"; option php_namespace = "Google\\Cloud\\Dlp\\V2"; option ruby_package = "Google::Cloud::Dlp::V2"; +option (google.api.resource_definition) = { + type: "dlp.googleapis.com/DlpContent" + pattern: "projects/{project}/dlpContent" + pattern: "projects/{project}/locations/{location}/dlpContent" +}; option (google.api.resource_definition) = { type: "dlp.googleapis.com/OrganizationLocation" pattern: "organizations/{organization}/locations/{location}" @@ -808,6 +813,12 @@ message ByteContentItem { // avro AVRO = 11; + + // csv + CSV = 12; + + // tsv + TSV = 13; } // The type of data stored in the bytes string. Default will be TEXT_UTF8. @@ -873,8 +884,8 @@ message Finding { }; // Resource name in format - // projects/{project}/locations/{location}/findings/{finding} - // Populated only when viewing persisted findings. + // projects/{project}/locations/{location}/findings/{finding} Populated only + // when viewing persisted findings. string name = 14; // The content that was found. Even if the content is not textual, it @@ -1143,11 +1154,12 @@ message RedactImageRequest { Color redaction_color = 3; } - // The parent resource name, for example projects/my-project-id - // or projects/my-project-id/locations/{location_id}. + // The parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] string parent = 1 [(google.api.resource_reference) = { - type: "cloudresourcemanager.googleapis.com/Project" - }]; + child_type: "dlp.googleapis.com/DlpContent" + }]; // Deprecated. This field has no effect. string location_id = 8; @@ -1194,11 +1206,12 @@ message RedactImageResponse { // Request to de-identify a list of items. message DeidentifyContentRequest { - // The parent resource name, for example projects/my-project-id - // or projects/my-project-id/locations/{location_id}. + // Parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] string parent = 1 [(google.api.resource_reference) = { - type: "cloudresourcemanager.googleapis.com/Project" - }]; + child_type: "dlp.googleapis.com/DlpContent" + }]; // Configuration for the de-identification of the content item. // Items specified here will override the template referenced by the @@ -1243,10 +1256,12 @@ message DeidentifyContentResponse { // Request to re-identify an item. message ReidentifyContentRequest { // Required. The parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { - type: "cloudresourcemanager.googleapis.com/Project" + child_type: "dlp.googleapis.com/DlpContent" } ]; @@ -1298,11 +1313,12 @@ message ReidentifyContentResponse { // Request to search for potentially sensitive info in a ContentItem. message InspectContentRequest { - // The parent resource name, for example projects/my-project-id - // or projects/my-project-id/locations/{location_id} + // Parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] string parent = 1 [(google.api.resource_reference) = { - type: "cloudresourcemanager.googleapis.com/Project" - }]; + child_type: "dlp.googleapis.com/DlpContent" + }]; // Configuration for the inspector. What specified here will override // the template referenced by the inspect_template_name argument. @@ -1432,7 +1448,7 @@ message InspectDataSourceDetails { Result result = 3; } -// Statistics related to processing hybrid inspect requests.s +// Statistics related to processing hybrid inspect requests. message HybridInspectStatistics { // The number of hybrid inspection requests processed within this job. int64 processed_count = 1; @@ -1467,8 +1483,10 @@ message InfoTypeDescription { // Request for the list of infoTypes. message ListInfoTypesRequest { - // The parent resource name, for example locations/{location_id} + // The parent resource name. + // - Format:locations/[LOCATION-ID] string parent = 4; + // BCP-47 language code for localized infoType friendly // names. If omitted, or if localized strings are not available, // en-US strings will be returned. @@ -1553,11 +1571,10 @@ message StatisticalTable { BigQueryTable table = 3 [(google.api.field_behavior) = REQUIRED]; // Required. Quasi-identifier columns. - repeated QuasiIdentifierField quasi_ids = 1 - [(google.api.field_behavior) = REQUIRED]; + repeated QuasiIdentifierField quasi_ids = 1 [(google.api.field_behavior) = REQUIRED]; - // Required. The relative frequency column must contain a floating-point - // number between 0 and 1 (inclusive). Null values are assumed to be zero. + // Required. The relative frequency column must contain a floating-point number + // between 0 and 1 (inclusive). Null values are assumed to be zero. FieldId relative_frequency = 2 [(google.api.field_behavior) = REQUIRED]; } @@ -1670,16 +1687,15 @@ message PrivacyMetric { BigQueryTable table = 3 [(google.api.field_behavior) = REQUIRED]; // Required. Quasi-identifier columns. - repeated QuasiIdField quasi_ids = 1 - [(google.api.field_behavior) = REQUIRED]; + repeated QuasiIdField quasi_ids = 1 [(google.api.field_behavior) = REQUIRED]; - // Required. The relative frequency column must contain a floating-point - // number between 0 and 1 (inclusive). Null values are assumed to be zero. + // Required. The relative frequency column must contain a floating-point number + // between 0 and 1 (inclusive). Null values are assumed to be zero. FieldId relative_frequency = 2 [(google.api.field_behavior) = REQUIRED]; } - // Required. Fields considered to be quasi-identifiers. No two columns can - // have the same tag. + // Required. Fields considered to be quasi-identifiers. No two columns can have the + // same tag. repeated TaggedField quasi_ids = 1 [(google.api.field_behavior) = REQUIRED]; // ISO 3166-1 alpha-2 region code to use in the statistical modeling. @@ -1698,8 +1714,8 @@ message PrivacyMetric { // Similarly to the k-map metric, we cannot compute δ-presence exactly without // knowing the attack dataset, so we use a statistical model instead. message DeltaPresenceEstimationConfig { - // Required. Fields considered to be quasi-identifiers. No two fields can - // have the same tag. + // Required. Fields considered to be quasi-identifiers. No two fields can have the + // same tag. repeated QuasiId quasi_ids = 1 [(google.api.field_behavior) = REQUIRED]; // ISO 3166-1 alpha-2 region code to use in the statistical modeling. @@ -1772,8 +1788,7 @@ message AnalyzeDataSourceRiskDetails { } // Histogram of value frequencies in the column. - repeated CategoricalStatsHistogramBucket value_frequency_histogram_buckets = - 5; + repeated CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5; } // Result of the k-anonymity computation. @@ -1853,8 +1868,7 @@ message AnalyzeDataSourceRiskDetails { } // Histogram of l-diversity equivalence class sensitive value frequencies. - repeated LDiversityHistogramBucket - sensitive_value_frequency_histogram_buckets = 5; + repeated LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5; } // Result of the reidentifiability analysis. Note that these results are an @@ -2268,12 +2282,16 @@ message ReplaceValueConfig { } // Replace each matching finding with the name of the info_type. -message ReplaceWithInfoTypeConfig {} +message ReplaceWithInfoTypeConfig { + +} // Redact a given value. For example, if used with an `InfoTypeTransformation` // transforming PHONE_NUMBER, and input 'My phone number is 206-555-0123', the // output would be 'My phone number is '. -message RedactConfig {} +message RedactConfig { + +} // Characters to skip when doing deidentification of a value. These will be left // alone and skipped. @@ -2357,18 +2375,18 @@ message CharacterMaskConfig { // // See https://cloud.google.com/dlp/docs/concepts-bucketing to learn more. message FixedSizeBucketingConfig { - // Required. Lower bound value of buckets. All values less than `lower_bound` - // are grouped together into a single bucket; for example if `lower_bound` = - // 10, then all values less than 10 are replaced with the value “-10”. + // Required. Lower bound value of buckets. All values less than `lower_bound` are + // grouped together into a single bucket; for example if `lower_bound` = 10, + // then all values less than 10 are replaced with the value "-10". Value lower_bound = 1 [(google.api.field_behavior) = REQUIRED]; - // Required. Upper bound value of buckets. All values greater than upper_bound - // are grouped together into a single bucket; for example if `upper_bound` = - // 89, then all values greater than 89 are replaced with the value “89+”. + // Required. Upper bound value of buckets. All values greater than upper_bound are + // grouped together into a single bucket; for example if `upper_bound` = 89, + // then all values greater than 89 are replaced with the value "89+". Value upper_bound = 2 [(google.api.field_behavior) = REQUIRED]; - // Required. Size of each bucket (except for minimum and maximum buckets). So - // if `lower_bound` = 10, `upper_bound` = 89, and `bucket_size` = 10, then the + // Required. Size of each bucket (except for minimum and maximum buckets). So if + // `lower_bound` = 10, `upper_bound` = 89, and `bucket_size` = 10, then the // following buckets would be used: -10, 10-20, 20-30, 30-40, 40-50, 50-60, // 60-70, 70-80, 80-89, 89+. Precision up to 2 decimals works. double bucket_size = 3 [(google.api.field_behavior) = REQUIRED]; @@ -2393,9 +2411,8 @@ message BucketingConfig { // Upper bound of the range, exclusive; type must match min. Value max = 2; - // Replacement value for this bucket. If not provided - // the default behavior will be to hyphenate the min-max range. - Value replacement_value = 3; + // Required. Replacement value for this bucket. + Value replacement_value = 3 [(google.api.field_behavior) = REQUIRED]; } // Set of buckets. Ranges must be non-overlapping. @@ -2562,15 +2579,14 @@ message KmsWrappedCryptoKey { // same context. See https://cloud.google.com/dlp/docs/concepts-date-shifting // to learn more. message DateShiftConfig { - // Required. Range of shift in days. Actual shift will be selected at random - // within this range (inclusive ends). Negative means shift to earlier in - // time. Must not be more than 365250 days (1000 years) each direction. + // Required. Range of shift in days. Actual shift will be selected at random within this + // range (inclusive ends). Negative means shift to earlier in time. Must not + // be more than 365250 days (1000 years) each direction. // // For example, 3 means shift date to at most 3 days into the future. int32 upper_bound_days = 1 [(google.api.field_behavior) = REQUIRED]; - // Required. For example, -5 means shift date to at most 5 days back in the - // past. + // Required. For example, -5 means shift date to at most 5 days back in the past. int32 lower_bound_days = 2 [(google.api.field_behavior) = REQUIRED]; // Points to the field that contains the context, for example, an entity id. @@ -3058,8 +3074,11 @@ message Action { // Request message for CreateInspectTemplate. message CreateInspectTemplateRequest { - // Required. The parent resource name, for example projects/my-project-id or - // organizations/my-org-id or projects/my-project-id/locations/{location-id}. + // Required. Parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:organizations/[ORGANIZATION-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] + // - Format:organizations/[ORGANIZATION-ID]/locations/[LOCATION-ID] string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { @@ -3082,8 +3101,8 @@ message CreateInspectTemplateRequest { // Request message for UpdateInspectTemplate. message UpdateInspectTemplateRequest { - // Required. Resource name of organization and inspectTemplate to be updated, - // for example `organizations/433245324/inspectTemplates/432452342` or + // Required. Resource name of organization and inspectTemplate to be updated, for + // example `organizations/433245324/inspectTemplates/432452342` or // projects/project-id/inspectTemplates/432452342. string name = 1 [ (google.api.field_behavior) = REQUIRED, @@ -3101,8 +3120,8 @@ message UpdateInspectTemplateRequest { // Request message for GetInspectTemplate. message GetInspectTemplateRequest { - // Required. Resource name of the organization and inspectTemplate to be read, - // for example `organizations/433245324/inspectTemplates/432452342` or + // Required. Resource name of the organization and inspectTemplate to be read, for + // example `organizations/433245324/inspectTemplates/432452342` or // projects/project-id/inspectTemplates/432452342. string name = 1 [ (google.api.field_behavior) = REQUIRED, @@ -3114,8 +3133,11 @@ message GetInspectTemplateRequest { // Request message for ListInspectTemplates. message ListInspectTemplatesRequest { - // Required. The parent resource name, for example projects/my-project-id or - // organizations/my-org-id or projects/my-project-id/locations/{location_id}. + // Required. Parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:organizations/[ORGANIZATION-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] + // - Format:organizations/[ORGANIZATION-ID]/locations/[LOCATION-ID] string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { @@ -3162,9 +3184,9 @@ message ListInspectTemplatesResponse { // Request message for DeleteInspectTemplate. message DeleteInspectTemplateRequest { - // Required. Resource name of the organization and inspectTemplate to be - // deleted, for example `organizations/433245324/inspectTemplates/432452342` - // or projects/project-id/inspectTemplates/432452342. + // Required. Resource name of the organization and inspectTemplate to be deleted, for + // example `organizations/433245324/inspectTemplates/432452342` or + // projects/project-id/inspectTemplates/432452342. string name = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { @@ -3175,12 +3197,13 @@ message DeleteInspectTemplateRequest { // Request message for CreateJobTrigger. message CreateJobTriggerRequest { - // Required. The parent resource name, for example projects/my-project-id - // or projects/my-project-id/locations/{location_id}. + // Required. Parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { - type: "cloudresourcemanager.googleapis.com/Project" + child_type: "dlp.googleapis.com/JobTrigger" } ]; @@ -3203,7 +3226,9 @@ message ActivateJobTriggerRequest { // `projects/dlp-test-project/jobTriggers/53234423`. string name = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { type: "dlp.googleapis.com/JobTrigger" } + (google.api.resource_reference) = { + type: "dlp.googleapis.com/JobTrigger" + } ]; } @@ -3213,7 +3238,9 @@ message UpdateJobTriggerRequest { // `projects/dlp-test-project/jobTriggers/53234423`. string name = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { type: "dlp.googleapis.com/JobTrigger" } + (google.api.resource_reference) = { + type: "dlp.googleapis.com/JobTrigger" + } ]; // New JobTrigger value. @@ -3229,7 +3256,9 @@ message GetJobTriggerRequest { // `projects/dlp-test-project/jobTriggers/53234423`. string name = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { type: "dlp.googleapis.com/JobTrigger" } + (google.api.resource_reference) = { + type: "dlp.googleapis.com/JobTrigger" + } ]; } @@ -3237,12 +3266,13 @@ message GetJobTriggerRequest { // jobs such as calculating risk metrics or inspecting Google Cloud // Storage. message CreateDlpJobRequest { - // Required. The parent resource name, for example projects/my-project-id - // or projects/my-project-id/locations/{location_id}. + // Required. Parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { - type: "cloudresourcemanager.googleapis.com/Project" + child_type: "dlp.googleapis.com/DlpJob" } ]; @@ -3267,12 +3297,13 @@ message CreateDlpJobRequest { // Request message for ListJobTriggers. message ListJobTriggersRequest { - // Required. The parent resource name, for example `projects/my-project-id` - // or projects/my-project-id/locations/{location_id}. + // Required. Parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { - type: "cloudresourcemanager.googleapis.com/Project" + child_type: "dlp.googleapis.com/JobTrigger" } ]; @@ -3347,7 +3378,9 @@ message DeleteJobTriggerRequest { // `projects/dlp-test-project/jobTriggers/53234423`. string name = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { type: "dlp.googleapis.com/JobTrigger" } + (google.api.resource_reference) = { + type: "dlp.googleapis.com/JobTrigger" + } ]; } @@ -3443,18 +3476,21 @@ message GetDlpJobRequest { // Required. The name of the DlpJob resource. string name = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { type: "dlp.googleapis.com/DlpJob" } + (google.api.resource_reference) = { + type: "dlp.googleapis.com/DlpJob" + } ]; } // The request message for listing DLP jobs. message ListDlpJobsRequest { - // Required. The parent resource name, for example projects/my-project-id - // or projects/my-project-id/locations/{location_id}. + // Required. Parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] string parent = 4 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { - type: "cloudresourcemanager.googleapis.com/Project" + child_type: "dlp.googleapis.com/DlpJob" } ]; @@ -3530,7 +3566,9 @@ message CancelDlpJobRequest { // Required. The name of the DlpJob resource to be cancelled. string name = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { type: "dlp.googleapis.com/DlpJob" } + (google.api.resource_reference) = { + type: "dlp.googleapis.com/DlpJob" + } ]; } @@ -3539,7 +3577,9 @@ message FinishDlpJobRequest { // Required. The name of the DlpJob resource to be cancelled. string name = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { type: "dlp.googleapis.com/DlpJob" } + (google.api.resource_reference) = { + type: "dlp.googleapis.com/DlpJob" + } ]; } @@ -3548,14 +3588,19 @@ message DeleteDlpJobRequest { // Required. The name of the DlpJob resource to be deleted. string name = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { type: "dlp.googleapis.com/DlpJob" } + (google.api.resource_reference) = { + type: "dlp.googleapis.com/DlpJob" + } ]; } // Request message for CreateDeidentifyTemplate. message CreateDeidentifyTemplateRequest { - // Required. The parent resource name, for example projects/my-project-id or - // organizations/my-org-id or projects/my-project-id/locations/{location_id}. + // Required. Parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:organizations/[ORGANIZATION-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] + // - Format:organizations/[ORGANIZATION-ID]/locations/[LOCATION-ID] string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { @@ -3564,8 +3609,7 @@ message CreateDeidentifyTemplateRequest { ]; // Required. The DeidentifyTemplate to create. - DeidentifyTemplate deidentify_template = 2 - [(google.api.field_behavior) = REQUIRED]; + DeidentifyTemplate deidentify_template = 2 [(google.api.field_behavior) = REQUIRED]; // The template id can contain uppercase and lowercase letters, // numbers, and hyphens; that is, it must match the regular @@ -3579,9 +3623,8 @@ message CreateDeidentifyTemplateRequest { // Request message for UpdateDeidentifyTemplate. message UpdateDeidentifyTemplateRequest { - // Required. Resource name of organization and deidentify template to be - // updated, for example - // `organizations/433245324/deidentifyTemplates/432452342` or + // Required. Resource name of organization and deidentify template to be updated, for + // example `organizations/433245324/deidentifyTemplates/432452342` or // projects/project-id/deidentifyTemplates/432452342. string name = 1 [ (google.api.field_behavior) = REQUIRED, @@ -3599,9 +3642,9 @@ message UpdateDeidentifyTemplateRequest { // Request message for GetDeidentifyTemplate. message GetDeidentifyTemplateRequest { - // Required. Resource name of the organization and deidentify template to be - // read, for example `organizations/433245324/deidentifyTemplates/432452342` - // or projects/project-id/deidentifyTemplates/432452342. + // Required. Resource name of the organization and deidentify template to be read, for + // example `organizations/433245324/deidentifyTemplates/432452342` or + // projects/project-id/deidentifyTemplates/432452342. string name = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { @@ -3612,8 +3655,11 @@ message GetDeidentifyTemplateRequest { // Request message for ListDeidentifyTemplates. message ListDeidentifyTemplatesRequest { - // Required. The parent resource name, for example projects/my-project-id or - // organizations/my-org-id or projects/my-project-id/locations/{location_id}. + // Required. Parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:organizations/[ORGANIZATION-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] + // - Format:organizations/[ORGANIZATION-ID]/locations/[LOCATION-ID] string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { @@ -3661,9 +3707,8 @@ message ListDeidentifyTemplatesResponse { // Request message for DeleteDeidentifyTemplate. message DeleteDeidentifyTemplateRequest { - // Required. Resource name of the organization and deidentify template to be - // deleted, for example - // `organizations/433245324/deidentifyTemplates/432452342` or + // Required. Resource name of the organization and deidentify template to be deleted, + // for example `organizations/433245324/deidentifyTemplates/432452342` or // projects/project-id/deidentifyTemplates/432452342. string name = 1 [ (google.api.field_behavior) = REQUIRED, @@ -3790,8 +3835,11 @@ message StoredInfoType { // Request message for CreateStoredInfoType. message CreateStoredInfoTypeRequest { - // Required. The parent resource name, for example projects/my-project-id or - // organizations/my-org-id or projects/my-project-id/locations/{location_id} + // Required. Parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:organizations/[ORGANIZATION-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] + // - Format:organizations/[ORGANIZATION-ID]/locations/[LOCATION-ID] string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { @@ -3835,8 +3883,8 @@ message UpdateStoredInfoTypeRequest { // Request message for GetStoredInfoType. message GetStoredInfoTypeRequest { - // Required. Resource name of the organization and storedInfoType to be read, - // for example `organizations/433245324/storedInfoTypes/432452342` or + // Required. Resource name of the organization and storedInfoType to be read, for + // example `organizations/433245324/storedInfoTypes/432452342` or // projects/project-id/storedInfoTypes/432452342. string name = 1 [ (google.api.field_behavior) = REQUIRED, @@ -3848,8 +3896,11 @@ message GetStoredInfoTypeRequest { // Request message for ListStoredInfoTypes. message ListStoredInfoTypesRequest { - // Required. The parent resource name, for example projects/my-project-id or - // organizations/my-org-id or projects/my-project-id/locations/{location_id}. + // Required. Parent resource name. + // - Format:projects/[PROJECT-ID] + // - Format:organizations/[ORGANIZATION-ID] + // - Format:projects/[PROJECT-ID]/locations/[LOCATION-ID] + // - Format:organizations/[ORGANIZATION-ID]/locations/[LOCATION-ID] string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { @@ -3897,8 +3948,8 @@ message ListStoredInfoTypesResponse { // Request message for DeleteStoredInfoType. message DeleteStoredInfoTypeRequest { - // Required. Resource name of the organization and storedInfoType to be - // deleted, for example `organizations/433245324/storedInfoTypes/432452342` or + // Required. Resource name of the organization and storedInfoType to be deleted, for + // example `organizations/433245324/storedInfoTypes/432452342` or // projects/project-id/storedInfoTypes/432452342. string name = 1 [ (google.api.field_behavior) = REQUIRED, @@ -3910,11 +3961,13 @@ message DeleteStoredInfoTypeRequest { // Request to search for potentially sensitive info in a custom location. message HybridInspectJobTriggerRequest { - // Required. Resource name of the trigger to execute a hybrid inspect on, for - // example `projects/dlp-test-project/jobTriggers/53234423`. + // Required. Resource name of the trigger to execute a hybrid inspect on, for example + // `projects/dlp-test-project/jobTriggers/53234423`. string name = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { type: "dlp.googleapis.com/JobTrigger" } + (google.api.resource_reference) = { + type: "dlp.googleapis.com/JobTrigger" + } ]; // The item to inspect. @@ -3923,11 +3976,13 @@ message HybridInspectJobTriggerRequest { // Request to search for potentially sensitive info in a custom location. message HybridInspectDlpJobRequest { - // Required. Resource name of the job to execute a hybrid inspect on, for - // example `projects/dlp-test-project/dlpJob/53234423`. + // Required. Resource name of the job to execute a hybrid inspect on, for example + // `projects/dlp-test-project/dlpJob/53234423`. string name = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { type: "dlp.googleapis.com/DlpJob" } + (google.api.resource_reference) = { + type: "dlp.googleapis.com/DlpJob" + } ]; // The item to inspect. @@ -4064,7 +4119,7 @@ enum MetadataType { // Unused METADATATYPE_UNSPECIFIED = 0; - // General file metadata provided by GCS. + // General file metadata provided by Cloud Storage. STORAGE_METADATA = 2; } diff --git a/google/privacy/dlp/v2/dlp_grpc_service_config.json b/google/privacy/dlp/v2/dlp_grpc_service_config.json index e2017e24..d3b037e8 100755 --- a/google/privacy/dlp/v2/dlp_grpc_service_config.json +++ b/google/privacy/dlp/v2/dlp_grpc_service_config.json @@ -81,18 +81,6 @@ { "service": "google.privacy.dlp.v2.DlpService", "method": "DeleteStoredInfoType" - }, - { - "service": "google.privacy.dlp.v2.DlpService", - "method": "FinishDlpJob" - }, - { - "service": "google.privacy.dlp.v2.DlpService", - "method": "HybridInspectDlpJob" - }, - { - "service": "google.privacy.dlp.v2.DlpService", - "method": "HybridInspectJobTrigger" } ], "timeout": "300s", @@ -152,6 +140,18 @@ { "service": "google.privacy.dlp.v2.DlpService", "method": "ActivateJobTrigger" + }, + { + "service": "google.privacy.dlp.v2.DlpService", + "method": "FinishDlpJob" + }, + { + "service": "google.privacy.dlp.v2.DlpService", + "method": "HybridInspectDlpJob" + }, + { + "service": "google.privacy.dlp.v2.DlpService", + "method": "HybridInspectJobTrigger" } ], "timeout": "300s" diff --git a/google/privacy/dlp/v2/storage.proto b/google/privacy/dlp/v2/storage.proto index 9276bb4b..b25cf4fe 100644 --- a/google/privacy/dlp/v2/storage.proto +++ b/google/privacy/dlp/v2/storage.proto @@ -18,6 +18,7 @@ package google.privacy.dlp.v2; import "google/api/resource.proto"; import "google/protobuf/timestamp.proto"; +import "google/api/annotations.proto"; option csharp_namespace = "Google.Cloud.Dlp.V2"; option go_package = "google.golang.org/genproto/googleapis/privacy/dlp/v2;dlp"; @@ -520,12 +521,17 @@ message StorageConfig { TimespanConfig timespan_config = 6; } -// Definitions of file type groups to scan. +// Definitions of file type groups to scan. New types will be added to this +// list. enum FileType { // Includes all files. FILE_TYPE_UNSPECIFIED = 0; - // Includes all file extensions not covered by text file types. + // Includes all file extensions not covered by another entry. Binary + // scanning attempts to convert the content of the file to utf_8 to scan + // the file. + // If you wish to avoid this fall back, specify one or more of the other + // FileType's in your storage scan. BINARY_FILE = 1; // Included file extensions: @@ -542,10 +548,12 @@ enum FileType { // Image inspection is restricted to 'global', 'us', 'asia', and 'europe'. IMAGE = 3; + // Word files >30 MB will be scanned as binary files. // Included file extensions: // docx, dotx, docm, dotm WORD = 5; + // PDF files >30 MB will be scanned as binary files. // Included file extensions: // pdf PDF = 6; @@ -553,6 +561,14 @@ enum FileType { // Included file extensions: // avro AVRO = 7; + + // Included file extensions: + // csv + CSV = 8; + + // Included file extensions: + // tsv + TSV = 9; } // Configuration to control jobs where the content being inspected is outside