google-cloud-debugger 0.36.0 → 0.41.0

data/lib/google/cloud/debugger.rb

@@ -67,8 +67,6 @@ module Google
       #   * `https://www.googleapis.com/auth/logging.admin`
       #
       # @param [Integer] timeout Default timeout to use in requests. Optional.
-      # @param [Hash] client_config A hash of values to override the default
-      #   behavior of the API client. Optional.
       # @param [String] endpoint Override of the endpoint host name. Optional.
       #   If the param is nil, uses the default endpoint.
       # @param [String] project Project identifier for the Stackdriver Debugger
@@ -84,15 +82,20 @@ module Google
       #   debugger = Google::Cloud::Debugger.new
       #   debugger.start
       #
-      def self.new project_id: nil, credentials: nil, service_name: nil,
-                   service_version: nil, scope: nil, timeout: nil,
-                   client_config: nil, endpoint: nil, project: nil, keyfile: nil
+      def self.new project_id: nil,
+                   credentials: nil,
+                   service_name: nil,
+                   service_version: nil,
+                   scope: nil,
+                   timeout: nil,
+                   endpoint: nil,
+                   project: nil,
+                   keyfile: nil
         project_id      ||= (project || default_project_id)
         service_name    ||= default_service_name
         service_version ||= default_service_version
         scope           ||= configure.scope
         timeout         ||= configure.timeout
-        client_config   ||= configure.client_config
         endpoint        ||= configure.endpoint
 
         service_name = service_name.to_s
@@ -114,14 +117,8 @@ module Google
         project_id = project_id.to_s # Always cast to a string
         raise ArgumentError, "project_id is missing" if project_id.empty?
 
-        Debugger::Project.new(
-          Debugger::Service.new(
-            project_id, credentials,
-            host: endpoint, timeout: timeout, client_config: client_config
-          ),
-          service_name: service_name,
-          service_version: service_version
-        )
+        service = Debugger::Service.new project_id, credentials, host: endpoint, timeout: timeout
+        Debugger::Project.new service, service_name: service_name, service_version: service_version
       end
 
       # rubocop:enable all
@@ -147,8 +144,6 @@ module Google
       # * `scope` - (String, Array<String>) The OAuth 2.0 scopes controlling
       #   the set of resources and operations that the connection can access.
       # * `timeout` - (Integer) Default timeout to use in requests.
-      # * `client_config` - (Hash) A hash of values to override the default
-      #   behavior of the API client.
       # * `endpoint` - (String) Override of the endpoint host name, or `nil`
       #   to use the default endpoint.
       # * `allow_mutating_methods` - (boolean) Whether expressions and
@@ -254,4 +249,11 @@ module Google
       end
     end
   end
+
+  # Aliases for compatibility with older spellings.
+  # @private
+  module Devtools
+    # @private
+    Clouddebugger = ::Google::Cloud::Debugger unless const_defined? :Clouddebugger
+  end
 end

data/lib/google/cloud/debugger/breakpoint.rb

@@ -30,7 +30,7 @@ module Google
       #
       # Abstract class that represents a breakpoint, which can be set and
       # triggered in a debuggee application. Maps to gRPC struct
-      # {Google::Devtools::Clouddebugger::V2::Breakpoint}.
+      # {Google::Cloud::Debugger::V2::Breakpoint}.
       #
       class Breakpoint
         include MonitorMixin
@@ -174,7 +174,7 @@ module Google
 
         ##
         # @private New Google::Cloud::Debugger::Breakpoint
-        # from a Google::Devtools::Clouddebugger::V2::Breakpoint object.
+        # from a Google::Cloud::Debugger::V2::Breakpoint object.
         def self.from_grpc grpc
           return new if grpc.nil?
 
@@ -337,9 +337,9 @@ module Google
 
         ##
         # @private Exports the Breakpoint to a
-        # Google::Devtools::Clouddebugger::V2::Breakpoint object.
+        # Google::Cloud::Debugger::V2::Breakpoint object.
         def to_grpc
-          Google::Devtools::Clouddebugger::V2::Breakpoint.new(
+          Google::Cloud::Debugger::V2::Breakpoint.new(
             id: id.to_s,
             location: location.to_grpc,
             condition: condition.to_s,
@@ -398,7 +398,7 @@ module Google
 
         ##
         # @private Formats the labels so they can be saved to a
-        # Google::Devtools::Clouddebugger::V2::Breakpoint object.
+        # Google::Cloud::Debugger::V2::Breakpoint object.
         def labels_to_grpc
           # Coerce symbols to strings
           Hash[labels.map do |k, v|
@@ -408,21 +408,21 @@ module Google
 
         ##
         # @private Exports the Breakpoint stack_frames to an array of
-        # Google::Devtools::Clouddebugger::V2::StackFrame objects.
+        # Google::Cloud::Debugger::V2::StackFrame objects.
         def stack_frames_to_grpc
           stack_frames.nil? ? [] : stack_frames.map(&:to_grpc)
         end
 
         ##
         # @private Exports the Breakpoint stack_frames to an array of
-        # Google::Devtools::Clouddebugger::V2::Variable objects.
+        # Google::Cloud::Debugger::V2::Variable objects.
         def evaluated_expressions_to_grpc
           evaluated_expressions.nil? ? [] : evaluated_expressions.map(&:to_grpc)
         end
 
         ##
         # @private Exports Breakpoint status to
-        # Google::Devtools::Clouddebugger::V2::StatusMessage object
+        # Google::Cloud::Debugger::V2::StatusMessage object
         def status_to_grpc
           status.nil? ? nil : status.to_grpc
         end

data/lib/google/cloud/debugger/breakpoint/evaluator.rb

@@ -89,7 +89,7 @@ module Google
           ##
           # @private Predefined regex. Saves time during runtime.
           FUNC_CALL_FLAG_BLACKLIST_REGEX =
-            /<callinfo!.+#{FUNC_CALL_FLAG_BLACKLIST.join '|'}/.freeze
+            /<call(info|data)!.+#{FUNC_CALL_FLAG_BLACKLIST.join '|'}/.freeze
 
           ##
           # @private Predefined regex. Saves time during runtime.

data/lib/google/cloud/debugger/breakpoint/source_location.rb

@@ -41,7 +41,7 @@ module Google
 
           ##
           # @private New Google::Cloud::Debugger::Breakpoint::SourceLocation
-          # from a Google::Devtools::Clouddebugger::V2::SourceLocation object.
+          # from a Google::Cloud::Debugger::V2::SourceLocation object.
           def self.from_grpc grpc
             return new if grpc.nil?
             new.tap do |o|
@@ -59,10 +59,10 @@ module Google
 
           ##
           # @private Exports the SourceLocation to a
-          # Google::Devtools::Clouddebugger::V2::SourceLocation object.
+          # Google::Cloud::Debugger::V2::SourceLocation object.
           def to_grpc
             return nil if empty?
-            Google::Devtools::Clouddebugger::V2::SourceLocation.new(
+            Google::Cloud::Debugger::V2::SourceLocation.new(
               path: path.to_s,
               line: line
             )

data/lib/google/cloud/debugger/breakpoint/stack_frame.rb

@@ -55,7 +55,7 @@ module Google
 
           ##
           # @private New Google::Cloud::Debugger::Breakpoint::SourceLocation
-          # from a Google::Devtools::Clouddebugger::V2::SourceLocation object.
+          # from a Google::Cloud::Debugger::V2::SourceLocation object.
           def self.from_grpc grpc
             new.tap do |o|
               o.function = grpc.function
@@ -76,10 +76,10 @@ module Google
 
           ##
           # @private Exports the StackFrame to a
-          # Google::Devtools::Clouddebugger::V2::StackFrame object.
+          # Google::Cloud::Debugger::V2::StackFrame object.
           def to_grpc
             return nil if empty?
-            Google::Devtools::Clouddebugger::V2::StackFrame.new(
+            Google::Cloud::Debugger::V2::StackFrame.new(
               function: function.to_s,
               location: location.to_grpc,
               arguments: arguments_to_grpc,
@@ -91,14 +91,14 @@ module Google
 
           ##
           # @private Exports the StackFrame arguments to an array of
-          # Google::Devtools::Clouddebugger::V2::Variable objects.
+          # Google::Cloud::Debugger::V2::Variable objects.
           def arguments_to_grpc
             arguments.nil? ? [] : arguments.map(&:to_grpc)
           end
 
           ##
           # @private Exports the StackFrame locals to an array of
-          # Google::Devtools::Clouddebugger::V2::Variable objects.
+          # Google::Cloud::Debugger::V2::Variable objects.
           def locals_to_grpc
             locals.nil? ? [] : locals.map(&:to_grpc)
           end

data/lib/google/cloud/debugger/breakpoint/status_message.rb

@@ -50,7 +50,7 @@ module Google
 
           ##
           # New Google::Cloud::Debugger::Breakpoint::StatusMessage
-          # from a Google::Devtools::Clouddebugger::V2::StatusMessage object.
+          # from a Google::Cloud::Debugger::V2::StatusMessage object.
           def self.from_grpc grpc
             return nil if grpc.nil?
             new.tap do |s|
@@ -76,14 +76,12 @@ module Google
 
           ##
           # Exports the StatusMessage to a
-          # Google::Devtools::Clouddebugger::V2::StatusMessage object.
+          # Google::Cloud::Debugger::V2::StatusMessage object.
           def to_grpc
             return nil if empty?
-            description_grpc =
-              Google::Devtools::Clouddebugger::V2::FormatMessage.new \
-                format: description.to_s
+            description_grpc = Google::Cloud::Debugger::V2::FormatMessage.new format: description.to_s
 
-            Google::Devtools::Clouddebugger::V2::StatusMessage.new \
+            Google::Cloud::Debugger::V2::StatusMessage.new \
               is_error: true,
               refers_to: refers_to,
               description: description_grpc

data/lib/google/cloud/debugger/breakpoint/variable.rb

@@ -408,7 +408,7 @@ module Google
 
           ##
           # @private New Google::Cloud::Debugger::Breakpoint::Variable
-          # from a Google::Devtools::Clouddebugger::V2::Variable object.
+          # from a Google::Cloud::Debugger::V2::Variable object.
           def self.from_grpc grpc
             return new if grpc.nil?
             new.tap do |o|
@@ -423,7 +423,7 @@ module Google
 
           ##
           # @private New array of Google::Cloud::Debugger::Breakpoint::Variable
-          # from an array of Google::Devtools::Clouddebugger::V2::Variable
+          # from an array of Google::Cloud::Debugger::V2::Variable
           # objects.
           def self.from_grpc_list grpc_list
             return [] if grpc_list.nil?
@@ -458,10 +458,10 @@ module Google
 
           ##
           # Exports the Variable to a
-          # Google::Devtools::Clouddebugger::V2::Variable object.
+          # Google::Cloud::Debugger::V2::Variable object.
           def to_grpc
             return nil if empty?
-            Google::Devtools::Clouddebugger::V2::Variable.new(
+            Google::Cloud::Debugger::V2::Variable.new(
               name: name.to_s,
               value: value.to_s,
               type: type.to_s,
@@ -584,7 +584,7 @@ module Google
 
           ##
           # @private Exports the Variable members to an array of
-          # Google::Devtools::Clouddebugger::V2::Variable objects.
+          # Google::Cloud::Debugger::V2::Variable objects.
           def members_to_grpc
             members.nil? ? nil : members.map(&:to_grpc)
           end

data/lib/google/cloud/debugger/credentials.rb

@@ -12,9 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-require "google/cloud/debugger/v2/credentials"
-require "google/cloud/logging/credentials"
+require "google/cloud/debugger/v2/debugger/credentials"
 
 module Google
   module Cloud
@@ -38,9 +36,14 @@ module Google
       #
       #   debugger.project_id #=> "my-project"
       #
-      class Credentials < Google::Cloud::Debugger::V2::Credentials
-        SCOPE = (Google::Cloud::Debugger::V2::Credentials::SCOPE +
-                 Google::Cloud::Logging::Credentials::SCOPE).uniq.freeze
+      class Credentials < Google::Cloud::Debugger::V2::Debugger::Credentials
+        self.scope = [
+          "https://www.googleapis.com/auth/cloud-platform",
+          "https://www.googleapis.com/auth/cloud_debugger",
+          "https://www.googleapis.com/auth/logging.admin",
+          "https://www.googleapis.com/auth/logging.read",
+          "https://www.googleapis.com/auth/logging.write"
+        ]
       end
     end
   end

data/lib/google/cloud/debugger/debuggee.rb

@@ -28,7 +28,7 @@ module Google
       #
       # Represent a debuggee application. Contains information that identifies
       # debuggee applications from each other. Maps to gRPC struct
-      # {Google::Devtools::Clouddebugger::V2::Debuggee}.
+      # Google::Cloud::Debugger::V2::Debuggee.
       #
       # It also automatically loads source context information generated from
       # Cloud SDK. See [Stackdriver Debugger
@@ -111,10 +111,10 @@ module Google
 
         ##
         # Convert this debuggee into a gRPC
-        # Google::Devtools::Clouddebugger::V2::Debuggee struct.
+        # Google::Cloud::Debugger::V2::Debuggee struct.
         def to_grpc
           source_context = source_context_from_json_file "source-context.json"
-          Google::Devtools::Clouddebugger::V2::Debuggee.new(
+          Google::Cloud::Debugger::V2::Debuggee.new(
             id: id.to_s,
             project: project_id_for_request_arg.to_s,
             description: description.to_s,
@@ -179,7 +179,7 @@ module Google
         # project ID if available (and if it matches the project set in the
         # configuration). Otherwise, use the configured project.
         def project_id_for_request_arg
-          if project_id == @env.project_id
+          if project_id == @env.lookup_metadata("project", "project-id")
             numeric_id = @env.numeric_project_id
             return numeric_id.to_s if numeric_id
           end

data/lib/google/cloud/debugger/service.rb

@@ -16,7 +16,6 @@
 require "google/cloud/errors"
 require "google/cloud/debugger/version"
 require "google/cloud/debugger/v2"
-require "google/gax/errors"
 require "uri"
 
 module Google
@@ -26,103 +25,63 @@ module Google
       # @private Represents the gRPC Debugger service, including all the API
       # methods.
       class Service
-        attr_accessor :project, :credentials, :timeout, :client_config, :host
+        attr_accessor :project, :credentials, :timeout, :host
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, timeout: nil, client_config: nil,
-                       host: nil
+        def initialize project, credentials, timeout: nil, host: nil
           @project = project
           @credentials = credentials
           @timeout = timeout
-          @client_config = client_config || {}
-          @host = host || V2::Debugger2Client::SERVICE_ADDRESS
+          @host = host
         end
 
         def cloud_debugger
           return mocked_debugger if mocked_debugger
           @cloud_debugger ||=
-            V2::Controller2Client.new(
-              credentials: credentials,
-              timeout: timeout,
-              client_config: client_config,
-              service_address: service_address,
-              service_port: service_port,
-              lib_name: "gccl",
-              lib_version: Google::Cloud::Debugger::VERSION
-            )
+            V2::Controller::Client.new do |config|
+              config.credentials = credentials if credentials
+              config.timeout = timeout if timeout
+              config.endpoint = host if host
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::Debugger::VERSION
+              config.metadata = { "google-cloud-resource-prefix" => "projects/#{@project}" }
+            end
         end
         attr_accessor :mocked_debugger
 
         def transmitter
           return mocked_transmitter if mocked_transmitter
           @transmitter ||=
-            V2::Controller2Client.new(
-              credentials: credentials,
-              timeout: timeout,
-              client_config: client_config,
-              service_address: service_address,
-              service_port: service_port,
-              lib_name: "gccl",
-              lib_version: Google::Cloud::Debugger::VERSION
-            )
+            V2::Controller::Client.new do |config|
+              config.credentials = credentials if credentials
+              config.timeout = timeout if timeout
+              config.endpoint = host if host
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::Debugger::VERSION
+              config.metadata = { "google-cloud-resource-prefix" => "projects/#{@project}" }
+            end
         end
         attr_accessor :mocked_transmitter
 
         def register_debuggee debuggee_grpc
-          execute do
-            cloud_debugger.register_debuggee debuggee_grpc,
-                                             options: default_options
-          end
+          cloud_debugger.register_debuggee debuggee: debuggee_grpc
         end
 
         def list_active_breakpoints debuggee_id, wait_token
-          execute do
-            cloud_debugger.list_active_breakpoints debuggee_id.to_s,
-                                                   wait_token: wait_token.to_s,
-                                                   success_on_timeout: true,
-                                                   options: default_options
-          end
+          cloud_debugger.list_active_breakpoints debuggee_id: debuggee_id.to_s,
+                                                 wait_token: wait_token.to_s,
+                                                 success_on_timeout: true
         end
 
         def update_active_breakpoint debuggee_id, breakpoint
-          execute do
-            transmitter.update_active_breakpoint debuggee_id.to_s,
-                                                 breakpoint.to_grpc,
-                                                 options: default_options
-          end
+          transmitter.update_active_breakpoint debuggee_id: debuggee_id.to_s,
+                                               breakpoint: breakpoint.to_grpc
         end
 
         def inspect
           "#{self.class}(#{@project})"
         end
-
-        protected
-
-        def service_address
-          return nil if host.nil?
-          URI.parse("//#{host}").host
-        end
-
-        def service_port
-          return nil if host.nil?
-          URI.parse("//#{host}").port
-        end
-
-        def default_headers
-          { "google-cloud-resource-prefix" => "projects/#{@project}" }
-        end
-
-        def default_options
-          Google::Gax::CallOptions.new kwargs: default_headers
-        end
-
-        def execute
-          yield
-        rescue Google::Gax::GaxError => e
-          # GaxError wraps BadStatus, but exposes it as #cause
-          raise Google::Cloud::Error.from_error(e.cause)
-        end
       end
     end
   end