fix(dart): Move HTTP client creation to _gax (#2672)

Paired with googleapis/google-cloud-dart#56

Author: brianquinlan

internal/sidekick/internal/dart/annotate.go

@@ -500,7 +500,6 @@ func calculateImports(imports map[string]bool) []string {
 func (annotate *annotateModel) annotateService(s *api.Service) {
 	// Add a package:http import if we're generating a service.
 	annotate.imports[httpImport] = true
-	annotate.imports[authImport] = true
 
 	// Some methods are skipped.
 	methods := language.FilterSlice(s.Methods, func(m *api.Method) bool {

internal/sidekick/internal/dart/annotate_test.go

@@ -27,7 +27,6 @@ var (
 	requiredConfig = map[string]string{
 		"api-keys-environment-variables": "GOOGLE_API_KEY,GEMINI_API_KEY",
 		"issue-tracker-url":              "http://www.example.com/issues",
-		"package:googleapis_auth":        "^2.0.0",
 		"package:google_cloud_gax":       "^1.2.3",
 		"package:http":                   "^4.5.6",
 		"package:google_cloud_protobuf":  "^7.8.9",
@@ -153,7 +152,6 @@ func TestAnnotateModel_Options(t *testing.T) {
 				if diff := cmp.Diff(map[string]string{
 					"google_cloud_gax":      "^1.2.3",
 					"google_cloud_protobuf": "^7.8.9",
-					"googleapis_auth":       "^2.0.0",
 					"http":                  "1.2.0"},
 					am.dependencyConstraints); diff != "" {
 					t.Errorf("mismatch in annotateModel.dependencyConstraints (-want, +got)\n:%s", diff)

internal/sidekick/internal/dart/dart.go

@@ -26,7 +26,6 @@ import (
 )
 
 var typedDataImport = "dart:typed_data"
-var authImport = "package:googleapis_auth/auth_io.dart as auth"
 var httpImport = "package:http/http.dart as http"
 var gaxImport = "package:google_cloud_gax/gax.dart"
 var encodingImport = "package:google_cloud_protobuf/src/encoding.dart"

internal/sidekick/internal/dart/generate_test.go

@@ -53,7 +53,6 @@ func TestFromProtobuf(t *testing.T) {
 			"not-for-publication":            "true",
 			"version":                        "0.1.0",
 			"skip-format":                    "true",
-			"package:googleapis_auth":        "^2.0.0",
 			"package:google_cloud_gax":       "^1.2.3",
 			"package:http":                   "^4.5.6",
 			"package:google_cloud_location":  "^7.8.9",

internal/sidekick/internal/dart/templates/lib/service.mustache

@@ -44,12 +44,7 @@ final class {{Codec.Name}} {
   ///
   /// See [API Keys Overview](https://cloud.google.com/api-keys/docs/overview).
   factory {{Codec.Name}}.fromApiKey([String? apiKey]) {
-    apiKey ??= _apiKeys.map(environmentVariable).nonNulls.firstOrNull;
-    if (apiKey == null) {
-      throw ArgumentError('apiKey or one of these environment variables must '
-        'be set to an API key: ${_apiKeys.join(', ')}');
-    }
-    return {{Codec.Name}}(client: auth.clientViaApiKey(apiKey));
+    return {{Codec.Name}}(client: httpClientFromApiKey(apiKey, _apiKeys));
   }
 
   {{#Codec.Methods}}