test(sidekick): test only with Compute (#2255)

This is the only service we are interested in, and we can make some
simplifications if we use it.

Author: coryan

internal/sidekick/internal/parser/discovery/discovery_test.go

@@ -27,33 +27,7 @@ import (
 )
 
 func TestInfo(t *testing.T) {
-	got, err := PublicCaDisco(t, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	wantName := "publicca"
-	wantTitle := "Public Certificate Authority API"
-	wantDescription := "The Public Certificate Authority API may be used to create and manage ACME external account binding keys associated with Google Trust Services' publicly trusted certificate authority. "
-	if got.Name != wantName {
-		t.Errorf("want = %q; got = %q", wantName, got.Name)
-	}
-	if got.Title != wantTitle {
-		t.Errorf("want = %q; got = %q", wantTitle, got.Title)
-	}
-	if diff := cmp.Diff(wantDescription, got.Description); diff != "" {
-		t.Errorf("mismatch (-want +got):\n%s", diff)
-	}
-	if got.PackageName != "" {
-		t.Errorf("expected empty package name")
-	}
-}
-
-func TestComputeParses(t *testing.T) {
-	contents, err := os.ReadFile("../../../testdata/disco/compute.v1.json")
-	if err != nil {
-		t.Fatal(err)
-	}
-	got, err := NewAPI(nil, contents)
+	got, err := ComputeDisco(t, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -80,7 +54,7 @@ func TestServiceConfigOverridesInfo(t *testing.T) {
 	sc.Documentation.Summary = "Change the description for testing"
 	sc.Name = "not-secretmanager"
 
-	got, err := PublicCaDisco(t, sc)
+	got, err := ComputeDisco(t, sc)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -136,41 +110,42 @@ func TestBadParse(t *testing.T) {
 }
 
 func TestMessage(t *testing.T) {
-	model, err := PublicCaDisco(t, nil)
+	model, err := ComputeDisco(t, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
-	id := "..ExternalAccountKey"
+	id := "..WeightedBackendService"
 	got, ok := model.State.MessageByID[id]
 	if !ok {
 		t.Fatalf("expected message %s in the API model", id)
 	}
 	want := &api.Message{
-		Name:          "ExternalAccountKey",
+		Name:          "WeightedBackendService",
 		ID:            id,
 		Package:       "",
-		Documentation: "A representation of an ExternalAccountKey used for [external account binding](https://tools.ietf.org/html/rfc8555#section-7.3.4) within ACME.",
+		Documentation: "In contrast to a single BackendService in HttpRouteAction to which all matching traffic is directed to, WeightedBackendService allows traffic to be split across multiple backend services. The volume of traffic for each backend service is proportional to the weight specified in each WeightedBackendService",
 		Fields: []*api.Field{
 			{
-				Name:          "b64MacKey",
-				JSONName:      "b64MacKey",
-				Documentation: "Output only. Base64-URL-encoded HS256 key. It is generated by the PublicCertificateAuthorityService when the ExternalAccountKey is created",
-				Typez:         api.BYTES_TYPE,
-				TypezID:       "bytes",
-			},
-			{
-				Name:          "keyId",
-				JSONName:      "keyId",
-				Documentation: "Output only. Key ID. It is generated by the PublicCertificateAuthorityService when the ExternalAccountKey is created",
+				Name:          "backendService",
+				JSONName:      "backendService",
+				Documentation: "The full or partial URL to the default BackendService resource. Before forwarding the request to backendService, the load balancer applies any relevant headerActions specified as part of this backendServiceWeight.",
 				Typez:         api.STRING_TYPE,
 				TypezID:       "string",
 			},
+			// TODO(#1850) - parse object fields.
+			// {
+			// 	Name:          "headerAction",
+			// 	JSONName:      "headerAction",
+			// 	Documentation: "Specifies changes to request and response headers that need to take effect for the selected backendService. headerAction specified here take effect before headerAction in the enclosing HttpRouteRule, PathMatcher and UrlMap. headerAction is not supported for load balancers that have their loadBalancingScheme set to EXTERNAL. Not supported when the URL map is bound to a target gRPC proxy that has validateForProxyless field set to true.",
+			// 	Typez:         api.MESSAGE_TYPE,
+			// 	TypezID:       "..HttpHeaderAction",
+			// },
 			{
-				Name:          "name",
-				JSONName:      "name",
-				Documentation: "Output only. Resource name. projects/{project}/locations/{location}/externalAccountKeys/{key_id}",
-				Typez:         api.STRING_TYPE,
-				TypezID:       "string",
+				Name:          "weight",
+				JSONName:      "weight",
+				Documentation: "Specifies the fraction of traffic sent to a backend service, computed as weight / (sum of all weightedBackendService weights in routeAction) . The selection of a backend service is determined only for new traffic. Once a user's request has been directed to a backend service, subsequent requests are sent to the same backend service as determined by the backend service's session affinity policy. Don't configure session affinity if you're using weighted traffic splitting. If you do, the weighted traffic splitting configuration takes precedence. The value must be from 0 to 1000.",
+				Typez:         api.UINT32_TYPE,
+				TypezID:       "uint32",
 			},
 		},
 	}
@@ -205,9 +180,9 @@ func TestServiceErrors(t *testing.T) {
 	}
 }
 
-func PublicCaDisco(t *testing.T, sc *serviceconfig.Service) (*api.API, error) {
+func ComputeDisco(t *testing.T, sc *serviceconfig.Service) (*api.API, error) {
 	t.Helper()
-	contents, err := os.ReadFile("../../../testdata/disco/publicca.v1.json")
+	contents, err := os.ReadFile("../../../testdata/disco/compute.v1.json")
 	if err != nil {
 		return nil, err
 	}

internal/sidekick/internal/parser/discovery/methods_test.go

@@ -17,7 +17,7 @@ package discovery
 import "testing"
 
 func TestMakeServiceMethodsError(t *testing.T) {
-	model, err := PublicCaDisco(t, nil)
+	model, err := ComputeDisco(t, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -36,7 +36,7 @@ func TestMakeServiceMethodsError(t *testing.T) {
 }
 
 func TestMakeMethodError(t *testing.T) {
-	model, err := PublicCaDisco(t, nil)
+	model, err := ComputeDisco(t, nil)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/sidekick/internal/parser/discovery/services_test.go

@@ -22,39 +22,43 @@ import (
 )
 
 func TestService(t *testing.T) {
-	model, err := PublicCaDisco(t, nil)
+	model, err := ComputeDisco(t, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, ok := model.State.ServiceByID["..projects"]; ok {
-		t.Errorf("expected no service for `projects` resource as it has no methods")
-	}
 
-	id := "..externalAccountKeys"
+	id := "..zones"
 	got, ok := model.State.ServiceByID[id]
 	if !ok {
 		t.Fatalf("expected service %s in the API model", id)
 	}
 	want := &api.Service{
-		Name:          "externalAccountKeys",
+		Name:          "zones",
 		ID:            id,
 		Package:       "",
-		Documentation: "Service for the `externalAccountKeys` resource.",
+		Documentation: "Service for the `zones` resource.",
 		Methods: []*api.Method{
 			{
-				ID:            "..externalAccountKeys.create",
-				Name:          "create",
-				Documentation: "Creates a new ExternalAccountKey bound to the project.",
-				InputTypeID:   "..ExternalAccountKey",
-				OutputTypeID:  "..ExternalAccountKey",
+				ID:            "..zones.get",
+				Name:          "get",
+				Documentation: "Returns the specified Zone resource.",
+				InputTypeID:   ".google.protobuf.Empty",
+				OutputTypeID:  "..Zone",
+			},
+			{
+				ID:            "..zones.list",
+				Name:          "list",
+				Documentation: "Retrieves the list of Zone resources available to the specified project.",
+				InputTypeID:   ".google.protobuf.Empty",
+				OutputTypeID:  "..ZoneList",
 			},
 		},
 	}
 	apitest.CheckService(t, got, want)
 }
 
 func TestServiceTopLevelMethodErrors(t *testing.T) {
-	model, err := PublicCaDisco(t, nil)
+	model, err := ComputeDisco(t, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -69,7 +73,7 @@ func TestServiceTopLevelMethodErrors(t *testing.T) {
 }
 
 func TestServiceChildMethodErrors(t *testing.T) {
-	model, err := PublicCaDisco(t, nil)
+	model, err := ComputeDisco(t, nil)
 	if err != nil {
 		t.Fatal(err)
 	}