cc-placed
diff --git a/‎google-cloud-bigquery/lib/google/cloud/bigquery.rb‎
Lines changed: 16 additions & 6 deletions b/‎google-cloud-bigquery/lib/google/cloud/bigquery.rb‎
Lines changed: 16 additions & 6 deletions
diff --git a/‎google-cloud-bigquery/test/google/cloud/bigquery_test.rb‎
Lines changed: 1 addition & 5 deletions b/‎google-cloud-bigquery/test/google/cloud/bigquery_test.rb‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎google-cloud-core/.rubocop.yml‎
Lines changed: 0 additions & 3 deletions b/‎google-cloud-core/.rubocop.yml‎
Lines changed: 0 additions & 3 deletions
@@ -15,7 +15,7 @@
 
 require "google-cloud-bigquery"
 require "google/cloud/bigquery/project"
-require "google/cloud/configuration"
+require "google/cloud/config"
 require "google/cloud/env"
 
 module Google
@@ -543,10 +543,20 @@ def self.new project_id: nil, credentials: nil, scope: nil, retries: nil,
         )
       end
 
-      # Initialize :debugger as a nested Configuration under Google::Cloud if
-      # haven't already
-      unless Google::Cloud.configure.option? :bigquery
-        Google::Cloud.configure.add_options :bigquery
+      # Initialize :bigquery as a nested Configuration under Google::Cloud if
+      # we haven't already
+      unless Google::Cloud.configure.valid_config_name? :bigquery
+        Google::Cloud.configure.add_config! :bigquery do |config|
+          config.add_field! :project_id, nil, match: String
+          config.add_field! :project, nil, match: String
+          config.add_field! :credentials, nil,
+                            match: [String, Hash, Google::Auth::Credentials]
+          config.add_field! :keyfile, nil,
+                            match: [String, Hash, Google::Auth::Credentials]
+          config.add_field! :scope, nil, match: [String, Array]
+          config.add_field! :retries, nil, match: Integer
+          config.add_field! :timeout, nil, match: Integer
+        end
       end
 
       ##
@@ -566,7 +576,7 @@ def self.new project_id: nil, credentials: nil, scope: nil, retries: nil,
       #   error.
       # * `timeout` - (Integer) Default timeout to use in requests.
       #
-      # @return [Google::Cloud::Configuration] The configuration object the
+      # @return [Google::Cloud::Config] The configuration object the
       #   Google::Cloud::Bigquery library uses.
       #
       def self.configure
 
@@ -215,11 +215,7 @@ def creds.is_a? target
     let(:found_credentials) { "{}" }
 
     after do
-      Google::Cloud.configure.delete :project_id
-      Google::Cloud.configure.delete :project
-      Google::Cloud.configure.delete :credentials
-      Google::Cloud.configure.delete :keyfile
-      Google::Cloud.configure.bigquery.clear
+      Google::Cloud.configure.reset!
     end
 
     it "uses shared config for project and keyfile" do
 
@@ -17,9 +17,6 @@ Style/RescueModifier:
 Style/MutableConstant:
   Exclude:
     - "lib/google/cloud/credentials.rb"
-Style/MethodMissing:
-  Exclude:
-    - "lib/google/cloud/configuration.rb"
 Metrics/CyclomaticComplexity:
   Max: 10
 Metrics/PerceivedComplexity: