google-cloud-bigtable 0.6.1 → 1.0.1

data/lib/google-cloud-bigtable.rb

@@ -26,6 +26,7 @@ require "google/cloud/config"
 
 module Google
   module Cloud
+    ##
     # Creates a new object for connecting to the Cloud Bigtable service.
     #
     # For more information on connecting to Google Cloud Platform, see the
@@ -39,7 +40,8 @@ module Google
     #   updater_proc is supplied.
     # @param timeout [Integer]
     #   The default timeout, in seconds, for calls made through this client.
-    # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]
+    # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel,
+    #   GRPC::Core::ChannelCredentials, Proc]
     #   Provides the means for authenticating requests made by the client. This parameter can
     #   be one of the following types.
     #   `Google::Auth::Credentials` uses the properties of its represented keyfile for
@@ -61,23 +63,23 @@ module Google
     # @return [Google::Cloud::Bigtable::Project]
     #
     # @example
-    #   require "google/cloud"
+    #   require "google/cloud/bigtable"
     #
     #   gcloud  = Google::Cloud.new
     #
     #   bigtable = gcloud.bigtable
     #
-
     def bigtable scope: nil, timeout: nil, credentials: nil, client_config: nil
       Google::Cloud.bigtable(
-        project_id: @project,
-        credentials: (credentials || @keyfile),
-        scope: scope,
-        timeout: (timeout || @timeout),
+        project_id:    @project,
+        credentials:   (credentials || @keyfile),
+        scope:         scope,
+        timeout:       (timeout || @timeout),
         client_config: client_config
       )
     end
 
+    ##
     # Creates a Cloud Bigtable client instance for data, table admin and instance admin
     # operations.
     #
@@ -85,7 +87,8 @@ module Google
     #   Project identifier for the Bigtable service you
     #   are connecting to. If not present, the default project for the
     #   credentials is used.
-    # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]
+    # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel,
+    #   GRPC::Core::ChannelCredentials, Proc]
     #   The means for authenticating requests made by the client. This parameter can
     #   be one of the following types.
     #   `Google::Auth::Credentials` uses the properties of its represented keyfile for
@@ -99,7 +102,6 @@ module Google
     #   should already be composed with a `GRPC::Core::CallCredentials` object.
     #   `Proc` will be used as an updater_proc for the gRPC channel. The proc transforms the
     #   metadata for requests, generally, to give OAuth credentials.
-    # @param timeout [Integer]
     # @param scope [Array<String>]
     #   The OAuth 2.0 scopes controlling the set of resources and operations
     #   that the connection can access. See [Using OAuth 2.0 to Access Google
@@ -116,22 +118,17 @@ module Google
     # @return [Google::Cloud::Bigtable::Project]
     #
     # @example
-    #   require "google/cloud"
+    #   require "google/cloud/bigtable"
     #
     #   bigtable = Google::Cloud.bigtable
-
-    def self.bigtable \
-        project_id: nil,
-        credentials: nil,
-        scope: nil,
-        timeout: nil,
-        client_config: nil
+    #
+    def self.bigtable project_id: nil, credentials: nil, scope: nil, timeout: nil, client_config: nil
       require "google/cloud/bigtable"
       Google::Cloud::Bigtable.new(
-        project_id: project_id,
-        credentials: credentials,
-        scope: scope,
-        timeout: timeout,
+        project_id:    project_id,
+        credentials:   credentials,
+        scope:         scope,
+        timeout:       timeout,
         client_config: client_config
       )
     end
@@ -156,7 +153,7 @@ Google::Cloud.configure.add_config! :bigtable do |config|
   config.add_field! :project_id, default_project, match: String, allow_nil: true
   config.add_alias! :project, :project_id
   config.add_field! :credentials, default_creds,
-                    match: [
+                    match:     [
                       String,
                       Hash,
                       Google::Auth::Credentials,

data/lib/google/bigtable/admin/v2/bigtable_table_admin_services_pb.rb

@@ -109,7 +109,7 @@ module Google
             # recommended for production use. It is not subject to any SLA or deprecation
             # policy.
             rpc :DeleteSnapshot, DeleteSnapshotRequest, Google::Protobuf::Empty
-            # Gets the access control policy for an instance resource. Returns an empty
+            # Gets the access control policy for a table resource. Returns an empty
             # policy if an table exists but does not have a policy set.
             rpc :GetIamPolicy, Google::Iam::V1::GetIamPolicyRequest, Google::Iam::V1::Policy
             # Sets the access control policy on a table resource. Replaces any existing

data/lib/google/bigtable/v2/bigtable_pb.rb

@@ -5,6 +5,9 @@
 require 'google/protobuf'
 
 require 'google/api/annotations_pb'
+require 'google/api/client_pb'
+require 'google/api/field_behavior_pb'
+require 'google/api/resource_pb'
 require 'google/bigtable/v2/data_pb'
 require 'google/protobuf/wrappers_pb'
 require 'google/rpc/status_pb'

data/lib/google/bigtable/v2/bigtable_services_pb.rb

@@ -1,7 +1,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # Source: google/bigtable/v2/bigtable.proto for package 'google.bigtable.v2'
 # Original file comments:
-# Copyright 2018 Google Inc.
+# Copyright 2019 Google LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/google/cloud/bigtable.rb

@@ -21,18 +21,21 @@ require "google/cloud/bigtable/project"
 
 module Google
   module Cloud
+    ##
     # Cloud Bigtable
     #
     # See {file:OVERVIEW.md Bigtable Overview}.
     #
     module Bigtable
+      ##
       # Service for managing Cloud Bigtable instances and tables and for reading from and
       # writing to Bigtable tables.
       #
       # @param project_id [String]
       #   Project identifier for the Bigtable service you are connecting to.
       #   If not present, the default project for the credentials is used.
-      # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]
+      # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel,
+      #   GRPC::Core::ChannelCredentials, Proc]
       #   Provides the means for authenticating requests made by the client. This parameter can
       #   be one of the following types:
       #   `Google::Auth::Credentials` uses the properties of its represented keyfile for
@@ -70,14 +73,8 @@ module Google
       #
       #   client = Google::Cloud::Bigtable.new
       #
-      def self.new \
-          project_id: nil,
-          credentials: nil,
-          emulator_host: nil,
-          scope: nil,
-          client_config: nil,
-          endpoint: nil,
-          timeout: nil
+      def self.new project_id: nil, credentials: nil, emulator_host: nil, scope: nil, client_config: nil, endpoint: nil,
+                   timeout: nil
         project_id    ||= default_project_id
         scope         ||= configure.scope
         timeout       ||= configure.timeout
@@ -98,9 +95,10 @@ module Google
           project_id, credentials,
           host: endpoint, timeout: timeout, client_config: client_config
         )
-        Bigtable::Project.new(service)
+        Bigtable::Project.new service
       end
 
+      ##
       # Configure the Google Cloud Bigtable library.
       #
       # The following Bigtable configuration parameters are supported:
@@ -151,10 +149,8 @@ module Google
       #
       def self.resolve_credentials given_credentials, scope
         credentials = given_credentials || default_credentials(scope: scope)
-        unless credentials.is_a? Google::Auth::Credentials
-          credentials = Bigtable::Credentials.new credentials, scope: scope
-        end
-        credentials
+        return credentials if credentials.is_a? Google::Auth::Credentials
+        Bigtable::Credentials.new credentials, scope: scope
       end
 
       # @private
@@ -162,9 +158,7 @@ module Google
       #
       def self.resolve_project_id given_project_id, credentials
         project_id = given_project_id || default_project_id
-        if credentials.respond_to? :project_id
-          project_id ||= credentials.project_id
-        end
+        project_id ||= credentials.project_id if credentials.respond_to? :project_id
         project_id.to_s # Always cast to a string
       end
 

data/lib/google/cloud/bigtable/admin.rb

@@ -22,7 +22,7 @@ module Google
       # rubocop:disable LineLength
 
       ##
-      # # Ruby Client for Cloud Bigtable Admin API ([Beta](https://github.com/googleapis/google-cloud-ruby#versioning))
+      # # Ruby Client for Cloud Bigtable Admin API ([GA](https://github.com/googleapis/google-cloud-ruby#versioning))
       #
       # [Cloud Bigtable Admin API][Product Documentation]:
       #

data/lib/google/cloud/bigtable/admin/v2.rb

@@ -25,7 +25,7 @@ module Google
         # rubocop:disable LineLength
 
         ##
-        # # Ruby Client for Cloud Bigtable Admin API ([Beta](https://github.com/googleapis/google-cloud-ruby#versioning))
+        # # Ruby Client for Cloud Bigtable Admin API ([GA](https://github.com/googleapis/google-cloud-ruby#versioning))
         #
         # [Cloud Bigtable Admin API][Product Documentation]:
         #

data/lib/google/cloud/bigtable/admin/v2/bigtable_table_admin_client.rb

@@ -870,7 +870,7 @@ module Google
               @check_consistency.call(req, options, &block)
             end
 
-            # Gets the access control policy for an instance resource. Returns an empty
+            # Gets the access control policy for a table resource. Returns an empty
             # policy if an table exists but does not have a policy set.
             #
             # @param resource [String]

data/lib/google/cloud/bigtable/admin/v2/doc/google/iam/v1/policy.rb

@@ -20,27 +20,36 @@ module Google
       # specify access control policies for Cloud Platform resources.
       #
       #
-      # A `Policy` consists of a list of `bindings`. A `binding` binds a list of
-      # `members` to a `role`, where the members can be user accounts, Google groups,
-      # Google domains, and service accounts. A `role` is a named list of permissions
-      # defined by IAM.
+      # A `Policy` is a collection of `bindings`. A `binding` binds one or more
+      # `members` to a single `role`. Members can be user accounts, service accounts,
+      # Google groups, and domains (such as G Suite). A `role` is a named list of
+      # permissions (defined by IAM or configured by users). A `binding` can
+      # optionally specify a `condition`, which is a logic expression that further
+      # constrains the role binding based on attributes about the request and/or
+      # target resource.
       #
       # **JSON Example**
       #
       #     {
       #       "bindings": [
       #         {
-      #           "role": "roles/owner",
+      #           "role": "roles/resourcemanager.organizationAdmin",
       #           "members": [
       #             "user:mike@example.com",
       #             "group:admins@example.com",
       #             "domain:google.com",
-      #             "serviceAccount:my-other-app@appspot.gserviceaccount.com"
+      #             "serviceAccount:my-project-id@appspot.gserviceaccount.com"
       #           ]
       #         },
       #         {
-      #           "role": "roles/viewer",
-      #           "members": ["user:sean@example.com"]
+      #           "role": "roles/resourcemanager.organizationViewer",
+      #           "members": ["user:eve@example.com"],
+      #           "condition": {
+      #             "title": "expirable access",
+      #             "description": "Does not grant access after Sep 2020",
+      #             "expression": "request.time <
+      #             timestamp('2020-10-01T00:00:00.000Z')",
+      #           }
       #         }
       #       ]
       #     }
@@ -52,15 +61,18 @@ module Google
       #   * user:mike@example.com
       #     * group:admins@example.com
       #       * domain:google.com
-      #       * serviceAccount:my-other-app@appspot.gserviceaccount.com
-      #         role: roles/owner
+      #       * serviceAccount:my-project-id@appspot.gserviceaccount.com
+      #         role: roles/resourcemanager.organizationAdmin
       #       * members:
-      #       * user:sean@example.com
-      #         role: roles/viewer
-      #
-      #
-      #     For a description of IAM and its features, see the
-      #     [IAM developer's guide](https://cloud.google.com/iam/docs).
+      #       * user:eve@example.com
+      #         role: roles/resourcemanager.organizationViewer
+      #         condition:
+      #         title: expirable access
+      #         description: Does not grant access after Sep 2020
+      #         expression: request.time < timestamp('2020-10-01T00:00:00.000Z')
+      #
+      #       For a description of IAM and its features, see the
+      #       [IAM developer's guide](https://cloud.google.com/iam/docs).
       # @!attribute [rw] version
       #   @return [Integer]
       #     Specifies the format of the policy.
@@ -68,12 +80,19 @@ module Google
       #     Valid values are 0, 1, and 3. Requests specifying an invalid value will be
       #     rejected.
       #
-      #     Policies with any conditional bindings must specify version 3. Policies
-      #     without any conditional bindings may specify any valid value or leave the
-      #     field unset.
+      #     Operations affecting conditional bindings must specify version 3. This can
+      #     be either setting a conditional policy, modifying a conditional binding,
+      #     or removing a binding (conditional or unconditional) from the stored
+      #     conditional policy.
+      #     Operations on non-conditional policies may specify any valid value or
+      #     leave the field unset.
+      #
+      #     If no etag is provided in the call to `setIamPolicy`, version compliance
+      #     checks against the stored policy is skipped.
       # @!attribute [rw] bindings
       #   @return [Array<Google::Iam::V1::Binding>]
-      #     Associates a list of `members` to a `role`.
+      #     Associates a list of `members` to a `role`. Optionally may specify a
+      #     `condition` that determines when binding is in effect.
       #     `bindings` with no members will result in an error.
       # @!attribute [rw] etag
       #   @return [String]
@@ -86,7 +105,9 @@ module Google
       #     ensure that their change will be applied to the same version of the policy.
       #
       #     If no `etag` is provided in the call to `setIamPolicy`, then the existing
-      #     policy is overwritten.
+      #     policy is overwritten. Due to blind-set semantics of an etag-less policy,
+      #     'setIamPolicy' will not fail even if the incoming policy version does not
+      #     meet the requirements for modifying the stored policy.
       class Policy; end
 
       # Associates `members` with a `role`.

data/lib/google/cloud/bigtable/app_profile.rb

@@ -17,10 +17,12 @@
 
 require "google/cloud/bigtable/app_profile/list"
 require "google/cloud/bigtable/app_profile/job"
+require "google/cloud/bigtable/routing_policy"
 
 module Google
   module Cloud
     module Bigtable
+      ##
       # # AppProfile
       #
       # A configuration object describing how Cloud Bigtable should treat traffic
@@ -33,7 +35,7 @@ module Google
       #
       #   instance = bigtable.instance("my-instance")
       #
-      #   app_profile = bigtable.app_profile("my-instance", "my-app-profile")
+      #   app_profile = instance.app_profile("my-app-profile")
       #
       #   # Update
       #   app_profile.description = "User data instance app profile"
@@ -58,88 +60,115 @@ module Google
           @changed_fields = {}
         end
 
-        # The unique identifier for the project.
+        ##
+        # The unique identifier for the project to which the app profile belongs.
         #
         # @return [String]
+        #
         def project_id
           @grpc.name.split("/")[1]
         end
 
-        # The unique identifier for the instance.
+        ##
+        # The unique identifier for the instance to which the app profile belongs.
         #
         # @return [String]
+        #
         def instance_id
           @grpc.name.split("/")[3]
         end
 
+        ##
         # The unique identifier for the app profile.
         #
         # @return [String]
+        #
         def name
           @grpc.name.split("/")[5]
         end
 
-        # The full path for the instance resource. Values are of the form
-        # `projects/<project_id>/instances/<instance_id>`.
+        ##
+        # The full path for the app profile resource. Values are of the form:
+        # `projects/<project_id>/instances/<instance_id>/appProfiles/<app_profile_name>`.
         #
         # @return [String]
+        #
         def path
           @grpc.name
         end
 
+        ##
         # Etag for optimistic concurrency control.
         #
         # @return [String]
+        #
         def etag
           @grpc.etag
         end
 
-        # Description of the AppProfile.
+        ##
+        # Description of the app profile.
         #
         # @return [String]
+        #
         def description
           @grpc.description
         end
 
-        # Set description of the AppProfile.
+        ##
+        # Sets the description of the app profile.
         #
         # @param text [String] Description text
+        #
         def description= text
           @grpc.description = text
           @changed_fields["description"] = "description"
         end
 
-        # Get value of multi-cluster routing policy.
+        ##
+        # Gets the multi-cluster routing policy, if present.
+        #
+        # @return [Google::Cloud::Bigtable::MultiClusterRoutingUseAny, nil]
         #
-        # @return [Google::Bigtable::Admin::V2::AppProfile::MultiClusterRoutingUseAny]
         def multi_cluster_routing
-          @grpc.multi_cluster_routing_use_any
+          return nil unless @grpc.multi_cluster_routing_use_any
+
+          Google::Cloud::Bigtable::MultiClusterRoutingUseAny.new
         end
 
-        # Get value of single cluster routing policy.
+        ##
+        # Gets the single cluster routing policy, if present.
+        #
+        # @return [Google::Cloud::Bigtable::SingleClusterRouting, nil]
         #
-        # @return [Google::Bigtable::Admin::V2::AppProfile::SingleClusterRouting]
         def single_cluster_routing
-          @grpc.single_cluster_routing
+          return nil unless @grpc.single_cluster_routing
+
+          Google::Cloud::Bigtable::SingleClusterRouting.new(
+            @grpc.single_cluster_routing.cluster_id,
+            @grpc.single_cluster_routing.allow_transactional_writes
+          )
         end
 
-        # Set routing policy.
+        ##
+        # Sets the routing policy for the app profile.
         #
-        # @param policy [Google::Bigtable::Admin::V2::AppProfile::SingleClusterRouting | Google::Bigtable::Admin::V2::AppProfile::MultiClusterRoutingUseAny]
-        #   The routing policy for all read/write requests that use this app profile.
-        #   A value must be explicitly set.
+        # @param policy [Google::Cloud::Bigtable::RoutingPolicy]
+        #   The routing policy for all read/write requests that use this app profile. A value must be explicitly set.
         #
         #   Routing Policies:
-        #   * `multi_cluster_routing` - Read/write requests may be routed to any
-        #     cluster in the instance and will fail over to another cluster in the event
-        #     of transient errors or delays. Choosing this option sacrifices
-        #     read-your-writes consistency to improve availability.
-        #   * `single_cluster_routing` - Unconditionally routes all read/write requests
-        #     to a specific cluster. This option preserves read-your-writes consistency
-        #     but does not improve availability.
-        #     The value contains `cluster_id` and optional field `allow_transactional_writes`.
-        #
-        # @example Set multi cluster routing policy
+        #   * {Google::Cloud::Bigtable::MultiClusterRoutingUseAny} - Read/write
+        #     requests may be routed to any cluster in the instance and will
+        #     fail over to another cluster in the event of transient errors or
+        #     delays. Choosing this option sacrifices read-your-writes
+        #     consistency to improve availability.
+        #   * {Google::Cloud::Bigtable::SingleClusterRouting} - Unconditionally
+        #     routes all read/write requests to a specific cluster. This option
+        #     preserves read-your-writes consistency but does not improve
+        #     availability. Value contains `cluster_id` and optional field
+        #     `allow_transactional_writes`.
+        #
+        # @example Set multi cluster routing policy.
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
@@ -149,7 +178,7 @@ module Google
         #   routing_policy = Google::Cloud::Bigtable::AppProfile.multi_cluster_routing
         #   app_profile.routing_policy = routing_policy
         #
-        # @example Set single cluster routing policy
+        # @example Set single cluster routing policy.
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
@@ -157,31 +186,62 @@ module Google
         #   app_profile = instance.app_profile("my-app-profile")
         #
         #   routing_policy = Google::Cloud::Bigtable::AppProfile.single_cluster_routing(
-        #     "my-instance-cluster-1"
+        #     "my-instance-cluster-1",
         #     allow_transactional_writes: true
         #   )
         #   app_profile.routing_policy = routing_policy
         #
         def routing_policy= policy
-          if policy.is_a?(Google::Bigtable::Admin::V2::AppProfile:: \
-              SingleClusterRouting)
-            @grpc.single_cluster_routing = policy
+          routing_policy_grpc = policy.to_grpc
+          if routing_policy_grpc.is_a? Google::Bigtable::Admin::V2::AppProfile::SingleClusterRouting
+            @grpc.single_cluster_routing = routing_policy_grpc
             @changed_fields["routing_policy"] = "single_cluster_routing"
           else
-            @grpc.multi_cluster_routing_use_any = policy
+            @grpc.multi_cluster_routing_use_any = routing_policy_grpc
             @changed_fields["routing_policy"] = "multi_cluster_routing_use_any"
           end
         end
 
-        # Get routing policy.
+        ##
+        # Gets the routing policy for all read/write requests that use the app
+        # profile.
+        #
+        # Routing Policies:
+        # * {Google::Cloud::Bigtable::MultiClusterRoutingUseAny} - Read/write
+        #   requests may be routed to any cluster in the instance and will
+        #   fail over to another cluster in the event of transient errors or
+        #   delays. Choosing this option sacrifices read-your-writes
+        #   consistency to improve availability.
+        # * {Google::Cloud::Bigtable::SingleClusterRouting} - Unconditionally
+        #   routes all read/write requests to a specific cluster. This option
+        #   preserves read-your-writes consistency but does not improve
+        #   availability. Value contains `cluster_id` and optional field
+        #   `allow_transactional_writes`.
+        #
+        # @return [Google::Cloud::Bigtable::RoutingPolicy]
+        #
+        # @example
+        #   require "google/cloud/bigtable"
+        #
+        #   bigtable = Google::Cloud::Bigtable.new
+        #
+        #   instance = bigtable.instance("my-instance")
+        #
+        #   routing_policy = Google::Cloud::Bigtable::AppProfile.multi_cluster_routing
         #
-        # @return [Google::Bigtable::Admin::V2::AppProfile::SingleClusterRouting, Google::Bigtable::Admin::V2::AppProfile::MultiClusterRoutingUseAny]
+        #   app_profile = instance.create_app_profile(
+        #     "my-app-profile",
+        #     routing_policy,
+        #     description: "App profile for user data instance"
+        #   )
+        #   puts app_profile.routing_policy
         #
         def routing_policy
-          @grpc.single_cluster_routing || @grpc.multi_cluster_routing_use_any
+          single_cluster_routing || multi_cluster_routing
         end
 
-        # Delete app profile.
+        ##
+        # Deletes the app profile.
         #
         # @param ignore_warnings [Boolean]
         #   Default value is false. If true, ignore safety checks when deleting
@@ -194,7 +254,8 @@ module Google
         #   bigtable = Google::Cloud::Bigtable.new
         #
         #   instance = bigtable.instance("my-instance")
-        #   app_profile = bigtable.instance("my-app-profile")
+        #
+        #   app_profile = instance.app_profile("my-app-profile")
         #
         #   app_profile.delete(ignore_warnings: true) # Ignore warnings.
         #
@@ -203,27 +264,26 @@ module Google
         #
         def delete ignore_warnings: false
           ensure_service!
-          service.delete_app_profile(
-            instance_id,
-            name,
-            ignore_warnings: ignore_warnings
-          )
+          service.delete_app_profile instance_id, name, ignore_warnings: ignore_warnings
           true
         end
 
-        # Update app profile.
+        ##
+        # Updates the app profile.
         #
         # @param ignore_warnings [Boolean]
         #   Default value is false. If true, ignore safety checks when updating
         #   the app profile.
         # @return [Google::Cloud::Bigtable::AppProfile::Job]
         #
-        # @example Update
+        # @example
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   app_profile = bigtable.app_profile("my-app-profile")
+        #   instance = bigtable.instance("my-instance")
+        #
+        #   app_profile = instance.app_profile("my-app-profile")
         #
         #   app_profile.description = "User data instance app profile"
         #   app_profile.routing_policy = \
@@ -238,17 +298,13 @@ module Google
         #     app_profile = job.app_profile
         #   end
         #
-        #   # OR - Update with ignoring warnings.
-        #   job = app_profile.save(ignore_warnings: true)
-        #   job.wait_until_done!
-        #
-        # @example Update with single cluster routing
+        # @example Update with single cluster routing.
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
         #   instance = bigtable.instance("my-instance")
-        #   app_profile = bigtable.instance("my-app-profile")
+        #   app_profile = instance.app_profile("my-app-profile")
         #
         #   app_profile.description = "User data instance app profile"
         #   routing_policy = Google::Cloud::Bigtable::AppProfile.single_cluster_routing(
@@ -261,10 +317,6 @@ module Google
         #
         #   job.done? #=> false
         #   job.reload!
-        #   job.done? #=> false
-        #
-        #   # Reload job until completion.
-        #   job.wait_until_done!
         #   job.done? #=> true
         #
         #   if job.error?
@@ -273,52 +325,62 @@ module Google
         #     app_profile = job.app_profile
         #     puts app_profile.name
         #   end
-
+        #
         def save ignore_warnings: false
           ensure_service!
-          update_mask = Google::Protobuf::FieldMask.new(
-            paths: @changed_fields.values
-          )
-          grpc = service.update_app_profile(
-            @grpc,
-            update_mask,
-            ignore_warnings: ignore_warnings
-          )
+          update_mask = Google::Protobuf::FieldMask.new paths: @changed_fields.values
+          grpc = service.update_app_profile @grpc, update_mask, ignore_warnings: ignore_warnings
           @changed_fields.clear
-          AppProfile::Job.from_grpc(grpc, service)
+          AppProfile::Job.from_grpc grpc, service
         end
         alias update save
 
-        # Reload app profile information.
+        ##
+        # Reloads the app profile data.
         #
         # @return [Google::Cloud::Bigtable::AppProfile]
-
+        #
         def reload!
-          @grpc = service.get_app_profile(instance_id, name)
+          @grpc = service.get_app_profile instance_id, name
           self
         end
 
-        # Create instance of multi cluster routing policy.
+        ##
+        # Creates an instance of the multi cluster routing policy.
+        #
+        # Read/write requests may be routed to any cluster in the instance and
+        # will fail over to another cluster in the event of transient errors or
+        # delays. Choosing this option sacrifices read-your-writes consistency
+        # to improve availability.
         #
-        # Read/write requests may be routed to any cluster in the instance and will
-        # fail over to another cluster in the event of transient errors or delays.
-        # Choosing this option sacrifices read-your-writes consistency to improve
-        # availability.
-        # @return [Google::Bigtable::Admin::V2::AppProfile::MultiClusterRoutingUseAny]
+        # @return [Google::Cloud::Bigtable::MultiClusterRoutingUseAny]
+        #
+        # @example
+        #   require "google/cloud/bigtable"
         #
-        # @example Create instance of multi cluster routing
+        #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   Google::Cloud::Bigtable::AppProfile.multi_cluster_routing
+        #   instance = bigtable.instance("my-instance")
+        #
+        #   routing_policy = Google::Cloud::Bigtable::AppProfile.multi_cluster_routing
+        #
+        #   app_profile = instance.create_app_profile(
+        #     "my-app-profile",
+        #     routing_policy,
+        #     description: "App profile for user data instance"
+        #   )
+        #   puts app_profile.routing_policy
         #
         def self.multi_cluster_routing
-          Google::Bigtable::Admin::V2::AppProfile::MultiClusterRoutingUseAny.new
+          Google::Cloud::Bigtable::MultiClusterRoutingUseAny.new
         end
 
-        # Create instance of single cluster routing.
+        ##
+        # Creates an instance of the single cluster routing policy.
         #
         # Unconditionally routes all read/write requests to a specific cluster.
-        # This option preserves read-your-writes consistency but does not improve
-        # availability.
+        # This option preserves read-your-writes consistency but does not
+        # improve availability.
         #
         # @param cluster_id [String]
         #   The cluster to which read/write requests should be routed.
@@ -327,25 +389,29 @@ module Google
         #   allowed by this app profile. It is unsafe to send these requests to
         #   the same table/row/column in multiple clusters.
         #   Default value is false.
-        # @return [Google::Bigtable::Admin::V2::AppProfile::SingleClusterRouting]
+        # @return [Google::Cloud::Bigtable::SingleClusterRouting]
         #
-        # @example Create instance of single cluster routing
+        # @example
+        #   require "google/cloud/bigtable"
         #
-        #   Google::Cloud::Bigtable::AppProfile.single_cluster_routing("my-cluster")
+        #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   # With allowed transactional writes
-        #   Google::Cloud::Bigtable::AppProfile.single_cluster_routing(
-        #     "my-cluster",
+        #   instance = bigtable.instance("my-instance")
+        #
+        #   routing_policy = Google::Cloud::Bigtable::AppProfile.single_cluster_routing(
+        #     "my-instance-cluster-1",
         #     allow_transactional_writes: true
         #   )
-
-        def self.single_cluster_routing \
-            cluster_id,
-            allow_transactional_writes: false
-          Google::Bigtable::Admin::V2::AppProfile::SingleClusterRouting.new(
-            cluster_id: cluster_id,
-            allow_transactional_writes: allow_transactional_writes
-          )
+        #
+        #   app_profile = instance.create_app_profile(
+        #     "my-app-profile",
+        #     routing_policy,
+        #     description: "App profile for user data instance"
+        #   )
+        #   puts app_profile.routing_policy
+        #
+        def self.single_cluster_routing cluster_id, allow_transactional_writes: false
+          Google::Cloud::Bigtable::SingleClusterRouting.new cluster_id, allow_transactional_writes
         end
 
         # @private
@@ -356,7 +422,7 @@ module Google
         # @param service [Google::Cloud::Bigtable::Service]
         # @return [Google::Cloud::Bigtable::Table]
         def self.from_grpc grpc, service
-          new(grpc, service)
+          new grpc, service
         end
 
         protected