From a9836680db5ca69ee8e3983dbf5a03414397e850 Mon Sep 17 00:00:00 2001 From: Anthony Date: Wed, 19 May 2021 18:18:43 -0700 Subject: [PATCH] docs: remove unused region tags (#108) * add securitycenter prefix to samples, wrap published samples and replace unpublished entirely. * Fix unmatched region tags * Fix more unmatched region tags * fix lint issue with function antipattern * docs: standardize new tags with most-used tag from other languages * fix conflicting tag by making more explicit to the contained function * remove obviated region tags * more Co-authored-by: gcf-merge-on-green[bot] <60162190+gcf-merge-on-green[bot]@users.noreply.github.com> --- samples/snippets/snippets_findings.py | 34 ------------------- samples/snippets/snippets_list_assets.py | 8 ----- .../snippets/snippets_notification_configs.py | 10 ------ .../snippets_notification_receiver.py | 2 -- samples/snippets/snippets_orgs.py | 4 --- samples/snippets/snippets_security_marks.py | 12 ------- 6 files changed, 70 deletions(-) diff --git a/samples/snippets/snippets_findings.py b/samples/snippets/snippets_findings.py index 92175b05..a9484653 100644 --- a/samples/snippets/snippets_findings.py +++ b/samples/snippets/snippets_findings.py @@ -20,7 +20,6 @@ def create_source(organization_id): """Create a new findings source. """ # [START securitycenter_create_source] - # [START create_source] from google.cloud import securitycenter client = securitycenter.SecurityCenterClient() @@ -38,14 +37,12 @@ def create_source(organization_id): } ) print("Created Source: {}".format(created.name)) - # [END create_source] # [END securitycenter_create_source] def get_source(source_name): """Gets an existing source.""" # [START securitycenter_get_source] - # [START get_source] from google.cloud import securitycenter client = securitycenter.SecurityCenterClient() @@ -59,7 +56,6 @@ def get_source(source_name): source = client.get_source(request={"name": source_name}) print("Source: {}".format(source)) - # [END get_source] # [END securitycenter_get_source] return source @@ -67,7 +63,6 @@ def get_source(source_name): def update_source(source_name): """Updates a source's display name.""" # [START securitycenter_update_source] - # [START update_source] from google.cloud import securitycenter from google.protobuf import field_mask_pb2 @@ -89,7 +84,6 @@ def update_source(source_name): } ) print("Updated Source: {}".format(updated)) - # [END update_source] # [END securitycenter_update_source] return updated @@ -98,7 +92,6 @@ def add_user_to_source(source_name): """Gives a user findingsEditor permission to the source.""" user_email = "csccclienttest@gmail.com" # [START securitycenter_set_source_iam] - # [START update_source_iam] from google.cloud import securitycenter from google.iam.v1 import policy_pb2 @@ -131,7 +124,6 @@ def add_user_to_source(source_name): print("Updated Policy: {}".format(updated)) - # [END update_source_iam] # [END securitycenter_set_source_iam] return binding, updated @@ -140,7 +132,6 @@ def list_source(organization_id): """Lists finding sources.""" i = -1 # [START securitycenter_list_sources] - # [START list_sources] from google.cloud import securitycenter # Create a new client. @@ -152,7 +143,6 @@ def list_source(organization_id): # Call the API and print out each existing source. for i, source in enumerate(client.list_sources(request={"parent": org_name})): print(i, source) - # [END list_sources] # [END securitycenter_list_sources] return i @@ -160,7 +150,6 @@ def list_source(organization_id): def create_finding(source_name): """Creates a new finding.""" # [START securitycenter_create_finding] - # [START create_finding] from google.cloud import securitycenter from google.cloud.securitycenter_v1 import CreateFindingRequest, Finding import datetime @@ -203,7 +192,6 @@ def create_finding(source_name): request=request ) print(created_finding) - # [END create_finding] # [END securitycenter_create_finding] return created_finding @@ -211,7 +199,6 @@ def create_finding(source_name): def create_finding_with_source_properties(source_name): """Demonstrate creating a new finding with source properties. """ # [START securitycenter_create_finding_with_source_properties] - # [START create_finding_with_properties] import datetime from google.cloud import securitycenter @@ -261,13 +248,11 @@ def create_finding_with_source_properties(source_name): } ) print(created_finding) - # [END create_finding_with_properties] # [END securitycenter_create_finding_with_source_properties] def update_finding(source_name): # [START securitycenter_update_finding_source_properties] - # [START update_finding] import datetime from google.cloud import securitycenter @@ -309,14 +294,12 @@ def update_finding(source_name): updated_finding.source_properties, updated_finding.event_time ) ) - # [END update_finding] # [END securitycenter_update_finding_source_properties] def update_finding_state(source_name): """Demonstrate updating only a finding state.""" # [START securitycenter_update_finding_state] - # [START update_finding_state] import datetime from google.cloud import securitycenter @@ -340,7 +323,6 @@ def update_finding_state(source_name): } ) print(f"New state: {new_finding.state}") - # [END update_finding_state] # [END securitycenter_update_finding_state] @@ -348,7 +330,6 @@ def trouble_shoot(source_name): """Demonstrate calling test_iam_permissions to determine if the service account has the correct permisions.""" # [START securitycenter_test_iam] - # [START test_iam_permissions] from google.cloud import securitycenter # Create a client. @@ -373,11 +354,9 @@ def trouble_shoot(source_name): len(permission_response.permissions) > 0 ) ) - # [END test_iam_permissions] # [END securitycenter_test_iam] assert len(permission_response.permissions) > 0 # [START securitycenter_test_iam] - # [START test_iam_permissions] # Check for permissions necessary to call set_finding_state. permission_response = client.test_iam_permissions( request={ @@ -388,7 +367,6 @@ def trouble_shoot(source_name): print( "Permision to update state? {}".format(len(permission_response.permissions) > 0) ) - # [END test_iam_permissions] # [END securitycenter_test_iam] return permission_response assert len(permission_response.permissions) > 0 @@ -396,7 +374,6 @@ def trouble_shoot(source_name): def list_all_findings(organization_id): # [START securitycenter_list_all_findings] - # [START list_all_findings] from google.cloud import securitycenter # Create a client. @@ -415,14 +392,12 @@ def list_all_findings(organization_id): i, finding_result.finding.name, finding_result.finding.resource_name ) ) - # [END list_all_findings] # [END securitycenter_list_all_findings] return i def list_filtered_findings(source_name): # [START securitycenter_list_filtered_findings] - # [START list_filtered_findings] from google.cloud import securitycenter # Create a new client. @@ -447,14 +422,12 @@ def list_filtered_findings(source_name): i, finding_result.finding.name, finding_result.finding.resource_name ) ) - # [END list_filtered_findings] # [END securitycenter_list_filtered_findings] return i def list_findings_at_time(source_name): # [START securitycenter_list_findings_at_time] - # [START list_findings_at_a_time] from google.cloud import securitycenter from datetime import timedelta, datetime @@ -470,11 +443,9 @@ def list_findings_at_time(source_name): # You an also use a wild-card "-" for all sources: # source_name = "organizations/111122222444/sources/-" five_days_ago = str(datetime.now() - timedelta(days=5)) - # [END list_findings_at_a_time] # [END securitycenter_list_findings_at_time] i = -1 # [START securitycenter_list_findings_at_time] - # [START list_findings_at_a_time] finding_result_iterator = client.list_findings( request={"parent": source_name, "filter": five_days_ago} @@ -485,7 +456,6 @@ def list_findings_at_time(source_name): i, finding_result.finding.name, finding_result.finding.resource_name ) ) - # [END list_findings_at_a_time] # [END securitycenter_list_findings_at_time] return i @@ -493,7 +463,6 @@ def list_findings_at_time(source_name): def get_iam_policy(source_name): """Gives a user findingsEditor permission to the source.""" # [START securitycenter_get_source_iam] - # [START get_source_iam] from google.cloud import securitycenter client = securitycenter.SecurityCenterClient() @@ -507,7 +476,6 @@ def get_iam_policy(source_name): # Get the old policy so we can do an incremental update. policy = client.get_iam_policy(request={"resource": source_name}) print("Policy: {}".format(policy)) - # [END get_source_iam] # [END securitycenter_get_source_iam] @@ -515,7 +483,6 @@ def group_all_findings(organization_id): """Demonstrates grouping all findings across an organization.""" i = 0 # [START securitycenter_group_all_findings] - # [START group_all_findings] from google.cloud import securitycenter # Create a client. @@ -532,7 +499,6 @@ def group_all_findings(organization_id): ) for i, group_result in enumerate(group_result_iterator): print((i + 1), group_result) - # [END group_all_findings] # [END securitycenter_group_all_findings] return i diff --git a/samples/snippets/snippets_list_assets.py b/samples/snippets/snippets_list_assets.py index 7665ea01..e0099e54 100644 --- a/samples/snippets/snippets_list_assets.py +++ b/samples/snippets/snippets_list_assets.py @@ -21,7 +21,6 @@ def list_all_assets(organization_id): """Demonstrate listing and printing all assets.""" i = 0 # [START securitycenter_list_all_assets] - # [START demo_list_all_assets] from google.cloud import securitycenter client = securitycenter.SecurityCenterClient() @@ -33,7 +32,6 @@ def list_all_assets(organization_id): asset_iterator = client.list_assets(request={"parent": org_name}) for i, asset_result in enumerate(asset_iterator): print(i, asset_result) - # [END demo_list_all_assets] # [END securitycenter_list_all_assets] return i @@ -42,7 +40,6 @@ def list_assets_with_filters(organization_id): """Demonstrate listing assets with a filter.""" i = 0 # [START securitycenter_list_assets_with_filter] - # [START demo_list_assets_with_filter] from google.cloud import securitycenter client = securitycenter.SecurityCenterClient() @@ -61,7 +58,6 @@ def list_assets_with_filters(organization_id): ) for i, asset_result in enumerate(asset_iterator): print(i, asset_result) - # [END demo_list_assets_with_filter] # [END securitycenter_list_assets_with_filter] return i @@ -70,7 +66,6 @@ def list_assets_with_filters_and_read_time(organization_id): """Demonstrate listing assets with a filter.""" i = 0 # [START securitycenter_list_assets_at_time] - # [START demo_list_assets_with_filter_and_time] from datetime import datetime, timedelta from google.cloud import securitycenter @@ -99,7 +94,6 @@ def list_assets_with_filters_and_read_time(organization_id): ) for i, asset_result in enumerate(asset_iterator): print(i, asset_result) - # [END demo_list_assets_with_filter_and_time] # [END securitycenter_list_assets_at_time] return i @@ -108,7 +102,6 @@ def list_point_in_time_changes(organization_id): """Demonstrate listing assets along with their state changes.""" i = 0 # [START securitycenter_list_assets_and_changes] - # [START demo_list_assets_changes] from datetime import timedelta from google.cloud import securitycenter @@ -137,7 +130,6 @@ def list_point_in_time_changes(organization_id): for i, asset in enumerate(asset_iterator): print(i, asset) - # [END demo_list_assets_changes] # [END securitycenter_list_assets_and_changes] return i diff --git a/samples/snippets/snippets_notification_configs.py b/samples/snippets/snippets_notification_configs.py index c03f927c..a0cb9413 100644 --- a/samples/snippets/snippets_notification_configs.py +++ b/samples/snippets/snippets_notification_configs.py @@ -19,7 +19,6 @@ def create_notification_config(organization_id, notification_config_id, pubsub_topic): # [START securitycenter_create_notification_config] - # [START scc_create_notification_config] from google.cloud import securitycenter as securitycenter client = securitycenter.SecurityCenterClient() @@ -44,7 +43,6 @@ def create_notification_config(organization_id, notification_config_id, pubsub_t ) print(created_notification_config) - # [END scc_create_notification_config] # [END securitycenter_create_notification_config] return created_notification_config @@ -52,7 +50,6 @@ def create_notification_config(organization_id, notification_config_id, pubsub_t def delete_notification_config(organization_id, notification_config_id): # [START securitycenter_delete_notification_config] - # [START scc_delete_notification_config] from google.cloud import securitycenter as securitycenter client = securitycenter.SecurityCenterClient() @@ -66,7 +63,6 @@ def delete_notification_config(organization_id, notification_config_id): client.delete_notification_config(request={"name": notification_config_name}) print("Deleted notification config: {}".format(notification_config_name)) - # [END scc_delete_notification_config] # [END securitycenter_delete_notification_config] return True @@ -74,7 +70,6 @@ def delete_notification_config(organization_id, notification_config_id): def get_notification_config(organization_id, notification_config_id): # [START securitycenter_get_notification_config] - # [START scc_get_notification_config] from google.cloud import securitycenter as securitycenter client = securitycenter.SecurityCenterClient() @@ -90,7 +85,6 @@ def get_notification_config(organization_id, notification_config_id): request={"name": notification_config_name} ) print("Got notification config: {}".format(notification_config)) - # [END scc_get_notification_config] # [END securitycenter_get_notification_config] return notification_config @@ -98,7 +92,6 @@ def get_notification_config(organization_id, notification_config_id): def list_notification_configs(organization_id): # [START securitycenter_list_notification_configs] - # [START scc_list_notification_configs] from google.cloud import securitycenter as securitycenter client = securitycenter.SecurityCenterClient() @@ -111,14 +104,12 @@ def list_notification_configs(organization_id): ) for i, config in enumerate(notification_configs_iterator): print("{}: notification_config: {}".format(i, config)) - # [END scc_list_notification_configs] # [END securitycenter_list_notification_configs]] return notification_configs_iterator def update_notification_config(organization_id, notification_config_id, pubsub_topic): # [START securitycenter_update_notification_config] - # [START scc_update_notification_config] from google.cloud import securitycenter as securitycenter from google.protobuf import field_mask_pb2 @@ -155,6 +146,5 @@ def update_notification_config(organization_id, notification_config_id, pubsub_t ) print(updated_notification_config) - # [END scc_update_notification_config] # [END securitycenter_update_notification_config] return updated_notification_config diff --git a/samples/snippets/snippets_notification_receiver.py b/samples/snippets/snippets_notification_receiver.py index 5e291c65..9c4368a0 100644 --- a/samples/snippets/snippets_notification_receiver.py +++ b/samples/snippets/snippets_notification_receiver.py @@ -18,7 +18,6 @@ def receive_notifications(project_id, subscription_name): # [START securitycenter_receive_notifications] - # [START scc_receive_notifications] # Requires https://cloud.google.com/pubsub/docs/quickstart-client-libraries#pubsub-client-libraries-python import concurrent @@ -55,6 +54,5 @@ def callback(message): streaming_pull_future.result(timeout=1) # Block for 1 second except concurrent.futures.TimeoutError: streaming_pull_future.cancel() - # [END scc_receive_notifications] # [END securitycenter_receive_notifications] return True diff --git a/samples/snippets/snippets_orgs.py b/samples/snippets/snippets_orgs.py index b155d768..1164b639 100644 --- a/samples/snippets/snippets_orgs.py +++ b/samples/snippets/snippets_orgs.py @@ -19,7 +19,6 @@ def get_settings(organization_id): """Example showing how to retreive current organization settings.""" # [START securitycenter_get_org_settings] - # [START get_org_settings] from google.cloud import securitycenter client = securitycenter.SecurityCenterClient() @@ -30,7 +29,6 @@ def get_settings(organization_id): org_settings = client.get_organization_settings(request={"name": org_settings_name}) print(org_settings) - # [END get_org_settings] # [END securitycenter_get_org_settings] @@ -38,7 +36,6 @@ def update_asset_discovery_org_settings(organization_id): """Example showing how to update the asset discovery configuration for an organization.""" # [START securitycenter_enable_asset_discovery] - # [START update_org_settings] from google.cloud import securitycenter from google.protobuf import field_mask_pb2 @@ -62,6 +59,5 @@ def update_asset_discovery_org_settings(organization_id): } ) print("Asset Discovery Enabled? {}".format(updated.enable_asset_discovery)) - # [END update_org_settings] # [END securitycenter_enable_asset_discovery] return updated diff --git a/samples/snippets/snippets_security_marks.py b/samples/snippets/snippets_security_marks.py index 7a3de409..3107f948 100644 --- a/samples/snippets/snippets_security_marks.py +++ b/samples/snippets/snippets_security_marks.py @@ -19,7 +19,6 @@ def add_to_asset(asset_name): """Add new security marks to an asset.""" # [START securitycenter_add_security_marks] - # [START add_marks_to_asset] from google.cloud import securitycenter from google.protobuf import field_mask_pb2 @@ -44,7 +43,6 @@ def add_to_asset(asset_name): } ) print(updated_marks) - # [END add_marks_to_asset] # [END securitycenter_add_security_marks] return updated_marks, marks @@ -54,7 +52,6 @@ def clear_from_asset(asset_name): # Make sure they are there first add_to_asset(asset_name) # [START securitycenter_delete_security_marks] - # [START clear_marks_asset] from google.cloud import securitycenter from google.protobuf import field_mask_pb2 @@ -80,7 +77,6 @@ def clear_from_asset(asset_name): } ) print(updated_marks) - # [END clear_marks_asset] # [END securitycenter_delete_security_marks] return updated_marks @@ -90,7 +86,6 @@ def delete_and_update_marks(asset_name): # Make sure they are there first add_to_asset(asset_name) # [START securitycenter_add_delete_security_marks] - # [START delete_and_update_marks] from google.cloud import securitycenter from google.protobuf import field_mask_pb2 @@ -111,7 +106,6 @@ def delete_and_update_marks(asset_name): } ) print(updated_marks) - # [END delete_and_update_marks] # [END securitycenter_add_delete_security_marks] return updated_marks @@ -119,7 +113,6 @@ def delete_and_update_marks(asset_name): def add_to_finding(finding_name): """Adds security marks to a finding. """ # [START securitycenter_add_finding_security_marks] - # [START add_marks_to_finding] from google.cloud import securitycenter from google.protobuf import field_mask_pb2 @@ -144,7 +137,6 @@ def add_to_finding(finding_name): "update_mask": field_mask, } ) - # [END add_marks_to_finding] # [END securitycenter_add_finding_security_marks] return updated_marks, marks @@ -154,7 +146,6 @@ def list_assets_with_query_marks(organization_id, asset_name): add_to_asset(asset_name) i = -1 # [START securitycenter_list_assets_with_security_marks] - # [START demo_list_assets_with_security_marks] from google.cloud import securitycenter client = securitycenter.SecurityCenterClient() @@ -175,7 +166,6 @@ def list_assets_with_query_marks(organization_id, asset_name): ) for i, asset_result in enumerate(asset_iterator): print(i, asset_result) - # [END demo_list_assets_with_security_marks] # [END securitycenter_list_assets_with_security_marks] return i @@ -186,7 +176,6 @@ def list_findings_with_query_marks(source_name, finding_name): add_to_finding(finding_name) i = -1 # [START securitycenter_list_findings_with_security_marks] - # [START demo_list_findings_with_security_marks] from google.cloud import securitycenter client = securitycenter.SecurityCenterClient() @@ -205,7 +194,6 @@ def list_findings_with_query_marks(source_name, finding_name): ) for i, finding_result in enumerate(finding_iterator): print(i, finding_result) - # [END demo_list_findings_with_security_marks] # [END securitycenter_list_findings_with_security_marks] # one finding should have been updated with keys, and one should be # untouched.