Merge branch 'main' into optimize

apigee · Apr 3, 2023 · 2001278 · 2001278
2 parents f867fa0 + 4749230
commit 2001278
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/cmd/registry-connect/discover/apigee/products/products.go b/cmd/registry-connect/discover/apigee/products/products.go
@@ -53,15 +53,19 @@ func Command() *cobra.Command {
 }
 
 func exportProducts(ctx context.Context, client apigee.Client) error {
+	log.FromContext(ctx).Infof("retrieving products")
 	products, err := client.Products(ctx)
 	if err != nil {
 		return err
 	}
+	log.FromContext(ctx).Infof("%d products discovered", len(products))
 
+	log.FromContext(ctx).Infof("retrieving proxies")
 	proxies, err := client.Proxies(ctx)
 	if err != nil {
 		return err
 	}
+	log.FromContext(ctx).Infof("%d proxies discovered", len(proxies))
 	proxyByName := map[string]*api.GoogleCloudApigeeV1ApiProxy{}
 	for _, p := range proxies {
 		proxyByName[p.Name] = p
@@ -70,6 +74,7 @@ func exportProducts(ctx context.Context, client apigee.Client) error {
 	var apis []interface{}
 	apisByProxyName := map[string][]*encoding.Api{}
 	for _, product := range products {
+		log.FromContext(ctx).Infof("encoding product %q", product.Name)
 		access := ""
 		for _, a := range product.Attributes {
 			if a.Name == "access" {
@@ -113,6 +118,7 @@ func exportProducts(ctx context.Context, client apigee.Client) error {
 
 		proxyNames := boundProxies(product)
 		if len(proxyNames) > 0 {
+			log.FromContext(ctx).Infof("encoding bound proxies %q", proxyNames)
 			related := &apihub.ReferenceList{
 				DisplayName: "Related resources",
 				Description: "Links to resources in the registry.",
@@ -180,32 +186,29 @@ func exportProducts(ctx context.Context, client apigee.Client) error {
 		Header: encoding.Header{ApiVersion: encoding.RegistryV1},
 		Items:  apis,
 	}
-	return yaml.NewEncoder(os.Stdout).Encode(items)
+	log.FromContext(ctx).Infof("encoding yaml output")
+	err = yaml.NewEncoder(os.Stdout).Encode(items)
+	log.FromContext(ctx).Infof("products export complete")
+	return err
 }
 
 // product -> proxies -> deployments
 func addDeployments(ctx context.Context, client apigee.Client, apisByProxyName map[string][]*encoding.Api) error {
 	if len(apisByProxyName) == 0 {
 		return nil
 	}
-	ps, err := client.Proxies(ctx)
-	if err != nil {
-		return err
-	}
-	proxiesByName := map[string]*api.GoogleCloudApigeeV1ApiProxy{}
-	for _, p := range ps {
-		proxiesByName[p.Name] = p
-	}
-
+	log.FromContext(ctx).Infof("retrieving envmap")
 	envMap, err := client.EnvMap(ctx)
 	if err != nil {
 		return err
 	}
 
+	log.FromContext(ctx).Infof("retrieving deployments")
 	deps, err := client.Deployments(ctx)
 	if err != nil {
 		return err
 	}
+	log.FromContext(ctx).Infof("%d deployments discovered", len(deps))
 
 	for _, dep := range deps {
 		hostnames, ok := envMap.Hostnames(dep.Environment)

diff --git a/cmd/registry-connect/discover/apigee/proxies/proxies.go b/cmd/registry-connect/discover/apigee/proxies/proxies.go
@@ -48,14 +48,17 @@ func Command() *cobra.Command {
 }
 
 func exportProxies(ctx context.Context, client apigee.Client) error {
+	log.FromContext(ctx).Infof("retrieving proxies")
 	proxies, err := client.Proxies(ctx)
 	if err != nil {
 		return err
 	}
+	log.FromContext(ctx).Infof("%d proxies discovered", len(proxies))
 
 	var apis []interface{}
 	apisByProxyName := map[string]*encoding.Api{}
 	for _, proxy := range proxies {
+		log.FromContext(ctx).Infof("encoding proxy %q", proxy.Name)
 		api := &encoding.Api{
 			Header: encoding.Header{
 				ApiVersion: encoding.RegistryV1,
@@ -77,6 +80,7 @@ func exportProxies(ctx context.Context, client apigee.Client) error {
 		}
 
 		for _, r := range proxy.Revision {
+			log.FromContext(ctx).Infof("encoding revision %q", r)
 			v := &encoding.ApiVersion{
 				Header: encoding.Header{
 					ApiVersion: encoding.RegistryV1,
@@ -135,35 +139,41 @@ func exportProxies(ctx context.Context, client apigee.Client) error {
 		Header: encoding.Header{ApiVersion: encoding.RegistryV1},
 		Items:  apis,
 	}
-	return yaml.NewEncoder(os.Stdout).Encode(items)
+	log.FromContext(ctx).Infof("encoding yaml output")
+	err = yaml.NewEncoder(os.Stdout).Encode(items)
+	log.FromContext(ctx).Infof("proxies export complete")
+	return err
 }
 
 func addDeployments(ctx context.Context, client apigee.Client, apisByProxyName map[string]*encoding.Api) error {
 	if len(apisByProxyName) == 0 {
 		return nil
 	}
 
+	log.FromContext(ctx).Infof("retrieving envmap")
 	envMap, err := client.EnvMap(ctx)
 	if err != nil {
 		return err
 	}
 
+	log.FromContext(ctx).Infof("retrieving deployments")
 	deps, err := client.Deployments(ctx)
 	if err != nil {
 		return err
 	}
+	log.FromContext(ctx).Infof("%d deployments discovered", len(deps))
 
 	for _, dep := range deps {
 		hostnames, ok := envMap.Hostnames(dep.Environment)
 		if !ok {
-			log.Warnf(ctx, "Failed to find hostnames for environment %s", dep.Environment)
+			log.FromContext(ctx).Warnf("failed to find hostnames for environment %s", dep.Environment)
 			continue
 		}
 
 		for _, hostname := range hostnames {
 			api, ok := apisByProxyName[dep.ApiProxy]
 			if !ok {
-				log.Warnf(ctx, "Unknown proxy: %q for deployment: %#v", dep.ApiProxy, dep)
+				log.FromContext(ctx).Warnf("unknown proxy: %q for deployment: %#v", dep.ApiProxy, dep)
 				continue
 			}