diff --git a/google/privacy/dlp/v2beta2/dlp.proto b/google/privacy/dlp/v2beta2/dlp.proto index 1331b381..ea4efab2 100644 --- a/google/privacy/dlp/v2beta2/dlp.proto +++ b/google/privacy/dlp/v2beta2/dlp.proto @@ -1,4 +1,4 @@ -// Copyright 2017 Google Inc. +// Copyright 2018 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -76,7 +76,7 @@ service DlpService { } // Schedules a job to compute risk analysis metrics over content in a Google - // Cloud Platform repository. [How-to guide}(/dlp/docs/compute-risk-analysis) + // Cloud Platform repository. [How-to guide](/dlp/docs/compute-risk-analysis) rpc AnalyzeDataSourceRisk(AnalyzeDataSourceRiskRequest) returns (DlpJob) { option (google.api.http) = { post: "/v2beta2/{parent=projects/*}/dataSource:analyze" body: "*" }; } @@ -88,54 +88,119 @@ service DlpService { // Creates an inspect template for re-using frequently used configuration // for inspecting content, images, and storage. - rpc CreateInspectTemplate(CreateInspectTemplateRequest) returns (InspectTemplate) { - option (google.api.http) = { post: "/v2beta2/{parent=organizations/*}/inspectTemplates" body: "*" }; + rpc CreateInspectTemplate(CreateInspectTemplateRequest) + returns (InspectTemplate) { + option (google.api.http) = { + post: "/v2beta2/{parent=organizations/*}/inspectTemplates" + body: "*" + additional_bindings { + post: "/v2beta2/{parent=projects/*}/inspectTemplates" + body: "*" + } + }; } // Updates the inspect template. - rpc UpdateInspectTemplate(UpdateInspectTemplateRequest) returns (InspectTemplate) { - option (google.api.http) = { patch: "/v2beta2/{name=organizations/*/inspectTemplates/*}" body: "*" }; + rpc UpdateInspectTemplate(UpdateInspectTemplateRequest) + returns (InspectTemplate) { + option (google.api.http) = { + patch: "/v2beta2/{name=organizations/*/inspectTemplates/*}" + body: "*" + additional_bindings: + { patch: "/v2beta2/{name=projects/*/inspectTemplates/*}" body: "*" } + }; } // Gets an inspect template. rpc GetInspectTemplate(GetInspectTemplateRequest) returns (InspectTemplate) { - option (google.api.http) = { get: "/v2beta2/{name=organizations/*/inspectTemplates/*}" }; + option (google.api.http) = { + get: "/v2beta2/{name=organizations/*/inspectTemplates/*}" + additional_bindings { + get: "/v2beta2/{name=projects/*/inspectTemplates/*}" + } + }; } // Lists inspect templates. - rpc ListInspectTemplates(ListInspectTemplatesRequest) returns (ListInspectTemplatesResponse) { - option (google.api.http) = { get: "/v2beta2/{parent=organizations/*}/inspectTemplates" }; + rpc ListInspectTemplates(ListInspectTemplatesRequest) + returns (ListInspectTemplatesResponse) { + option (google.api.http) = { + get: "/v2beta2/{parent=organizations/*}/inspectTemplates" + additional_bindings { + get: "/v2beta2/{parent=projects/*}/inspectTemplates" + } + }; } // Deletes inspect templates. - rpc DeleteInspectTemplate(DeleteInspectTemplateRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { delete: "/v2beta2/{name=organizations/*/inspectTemplates/*}" }; + rpc DeleteInspectTemplate(DeleteInspectTemplateRequest) + returns (google.protobuf.Empty) { + option (google.api.http) = { + delete: "/v2beta2/{name=organizations/*/inspectTemplates/*}" + additional_bindings { + delete: "/v2beta2/{name=projects/*/inspectTemplates/*}" + } + }; } // Creates an Deidentify template for re-using frequently used configuration // for Deidentifying content, images, and storage. - rpc CreateDeidentifyTemplate(CreateDeidentifyTemplateRequest) returns (DeidentifyTemplate) { - option (google.api.http) = { post: "/v2beta2/{parent=organizations/*}/deidentifyTemplates" body: "*" }; + rpc CreateDeidentifyTemplate(CreateDeidentifyTemplateRequest) + returns (DeidentifyTemplate) { + option (google.api.http) = { + post: "/v2beta2/{parent=organizations/*}/deidentifyTemplates" + body: "*" + additional_bindings { + post: "/v2beta2/{parent=projects/*}/deidentifyTemplates" + body: "*" + } + }; } // Updates the inspect template. - rpc UpdateDeidentifyTemplate(UpdateDeidentifyTemplateRequest) returns (DeidentifyTemplate) { - option (google.api.http) = { patch: "/v2beta2/{name=organizations/*/deidentifyTemplates/*}" body: "*" }; + rpc UpdateDeidentifyTemplate(UpdateDeidentifyTemplateRequest) + returns (DeidentifyTemplate) { + option (google.api.http) = { + patch: "/v2beta2/{name=organizations/*/deidentifyTemplates/*}" + body: "*" + additional_bindings: { + patch: "/v2beta2/{name=projects/*/deidentifyTemplates/*}" + body: "*" + } + }; } // Gets an inspect template. - rpc GetDeidentifyTemplate(GetDeidentifyTemplateRequest) returns (DeidentifyTemplate) { - option (google.api.http) = { get: "/v2beta2/{name=organizations/*/deidentifyTemplates/*}" }; + rpc GetDeidentifyTemplate(GetDeidentifyTemplateRequest) + returns (DeidentifyTemplate) { + option (google.api.http) = { + get: "/v2beta2/{name=organizations/*/deidentifyTemplates/*}" + additional_bindings { + get: "/v2beta2/{name=projects/*/deidentifyTemplates/*}" + } + }; } // Lists inspect templates. - rpc ListDeidentifyTemplates(ListDeidentifyTemplatesRequest) returns (ListDeidentifyTemplatesResponse) { - option (google.api.http) = { get: "/v2beta2/{parent=organizations/*}/deidentifyTemplates" }; + rpc ListDeidentifyTemplates(ListDeidentifyTemplatesRequest) + returns (ListDeidentifyTemplatesResponse) { + option (google.api.http) = { + get: "/v2beta2/{parent=organizations/*}/deidentifyTemplates" + additional_bindings { + get: "/v2beta2/{parent=projects/*}/deidentifyTemplates" + } + }; } // Deletes inspect templates. - rpc DeleteDeidentifyTemplate(DeleteDeidentifyTemplateRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { delete: "/v2beta2/{name=organizations/*/deidentifyTemplates/*}" }; + rpc DeleteDeidentifyTemplate(DeleteDeidentifyTemplateRequest) + returns (google.protobuf.Empty) { + option (google.api.http) = { + delete: "/v2beta2/{name=organizations/*/deidentifyTemplates/*}" + additional_bindings { + delete: "/v2beta2/{name=projects/*/deidentifyTemplates/*}" + } + }; } // Lists DlpJobs that match the specified filter in the request. @@ -262,7 +327,9 @@ message InspectResult { message Finding { // The content that was found. Even if the content is not textual, it // may be converted to a textual representation here. - // Provided if requested by the `InspectConfig`. + // Provided if requested by the `InspectConfig` and the finding is + // less than or equal to 4096 bytes long. If the finding exceeds 4096 bytes + // in length, the quote may be omitted. string quote = 1; // The type of content that might have been found. @@ -701,6 +768,8 @@ message PrivacyMetric { // A column can be tagged with a InfoType to use the relevant public // dataset as a statistical model of population, if available. We // currently support US ZIP codes, region codes, ages and genders. + // To programmatically obtain the list of supported InfoTypes, use + // ListInfoTypes with the supported_by=RISK_ANALYSIS filter. InfoType info_type = 2; // A column can be tagged with a custom tag. In this case, the user must @@ -1588,7 +1657,8 @@ message CreateInspectTemplateRequest { // Request message for UpdateInspectTemplate. message UpdateInspectTemplateRequest { // Resource name of organization and inspectTemplate to be updated, for - // example `organizations/433245324/inspectTemplates/432452342`. + // example `organizations/433245324/inspectTemplates/432452342` or + // projects/project-id/inspectTemplates/432452342. string name = 1; // New InspectTemplate value. @@ -1601,7 +1671,8 @@ message UpdateInspectTemplateRequest { // Request message for GetInspectTemplate. message GetInspectTemplateRequest { // Resource name of the organization and inspectTemplate to be read, for - // example `organizations/433245324/inspectTemplates/432452342`. + // example `organizations/433245324/inspectTemplates/432452342` or + // projects/project-id/inspectTemplates/432452342. string name = 1; } @@ -1633,7 +1704,8 @@ message ListInspectTemplatesResponse { // Request message for DeleteInspectTemplate. message DeleteInspectTemplateRequest { // Resource name of the organization and inspectTemplate to be deleted, for - // example `organizations/433245324/inspectTemplates/432452342`. + // example `organizations/433245324/inspectTemplates/432452342` or + // projects/project-id/inspectTemplates/432452342. string name = 1; } @@ -1789,7 +1861,8 @@ message CreateDeidentifyTemplateRequest { // Request message for UpdateDeidentifyTemplate. message UpdateDeidentifyTemplateRequest { // Resource name of organization and deidentify template to be updated, for - // example `organizations/433245324/deidentifyTemplates/432452342`. + // example `organizations/433245324/deidentifyTemplates/432452342` or + // projects/project-id/deidentifyTemplates/432452342. string name = 1; // New DeidentifyTemplate value. @@ -1802,7 +1875,8 @@ message UpdateDeidentifyTemplateRequest { // Request message for GetDeidentifyTemplate. message GetDeidentifyTemplateRequest { // Resource name of the organization and deidentify template to be read, for - // example `organizations/433245324/deidentifyTemplates/432452342`. + // example `organizations/433245324/deidentifyTemplates/432452342` or + // projects/project-id/deidentifyTemplates/432452342. string name = 1; } @@ -1835,7 +1909,8 @@ message ListDeidentifyTemplatesResponse { // Request message for DeleteDeidentifyTemplate. message DeleteDeidentifyTemplateRequest { // Resource name of the organization and deidentify template to be deleted, - // for example `organizations/433245324/deidentifyTemplates/432452342`. + // for example `organizations/433245324/deidentifyTemplates/432452342` or + // projects/project-id/deidentifyTemplates/432452342. string name = 1; } diff --git a/google/privacy/dlp/v2beta2/dlp_gapic.yaml b/google/privacy/dlp/v2beta2/dlp_gapic.yaml index c6cda255..6d6caad7 100644 --- a/google/privacy/dlp/v2beta2/dlp_gapic.yaml +++ b/google/privacy/dlp/v2beta2/dlp_gapic.yaml @@ -22,12 +22,12 @@ license_header: collection_oneofs: - oneof_name: deidentify_template_oneof collection_names: - - deidentify_template - - deidentify_template_2 + - organization_deidentify_template + - project_deidentify_template - oneof_name: inspect_template_oneof collection_names: - - inspect_template - - inspect_template_2 + - organization_inspect_template + - project_inspect_template # A list of API interface configurations. interfaces: - name: google.privacy.dlp.v2beta2.DlpService @@ -45,13 +45,13 @@ interfaces: - name_pattern: organizations/{organization} entity_name: organization - name_pattern: organizations/{organization}/deidentifyTemplates/{deidentify_template} - entity_name: deidentify_template + entity_name: organization_deidentify_template - name_pattern: projects/{project}/deidentifyTemplates/{deidentify_template} - entity_name: deidentify_template_2 + entity_name: project_deidentify_template - name_pattern: organizations/{organization}/inspectTemplates/{inspect_template} - entity_name: inspect_template + entity_name: organization_inspect_template - name_pattern: projects/{project}/inspectTemplates/{inspect_template} - entity_name: inspect_template_2 + entity_name: project_inspect_template - name_pattern: projects/{project} entity_name: project - name_pattern: projects/{project}/dlpJobs/{dlp_job} @@ -216,7 +216,7 @@ interfaces: retry_codes_name: non_idempotent retry_params_name: default field_name_patterns: - name: inspect_template + name: inspect_template_oneof timeout_millis: 300000 - name: GetInspectTemplate request_object_method: true @@ -224,7 +224,7 @@ interfaces: retry_codes_name: idempotent retry_params_name: default field_name_patterns: - name: inspect_template + name: inspect_template_oneof timeout_millis: 300000 - name: ListInspectTemplates required_fields: @@ -251,7 +251,7 @@ interfaces: retry_codes_name: idempotent retry_params_name: default field_name_patterns: - name: inspect_template + name: inspect_template_oneof timeout_millis: 300000 - name: CreateDeidentifyTemplate required_fields: @@ -271,7 +271,7 @@ interfaces: retry_codes_name: non_idempotent retry_params_name: default field_name_patterns: - name: deidentify_template + name: deidentify_template_oneof timeout_millis: 300000 - name: GetDeidentifyTemplate required_fields: @@ -281,7 +281,7 @@ interfaces: retry_codes_name: idempotent retry_params_name: default field_name_patterns: - name: deidentify_template + name: deidentify_template_oneof timeout_millis: 300000 - name: ListDeidentifyTemplates required_fields: @@ -308,7 +308,7 @@ interfaces: retry_codes_name: idempotent retry_params_name: default field_name_patterns: - name: deidentify_template + name: deidentify_template_oneof timeout_millis: 300000 - name: ListDlpJobs required_fields: diff --git a/google/privacy/dlp/v2beta2/storage.proto b/google/privacy/dlp/v2beta2/storage.proto index 729fd672..4ef092bb 100644 --- a/google/privacy/dlp/v2beta2/storage.proto +++ b/google/privacy/dlp/v2beta2/storage.proto @@ -1,4 +1,4 @@ -// Copyright 2017 Google Inc. +// Copyright 2018 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.