Merge branch 'main' into dependabot/go_modules/github.com/gin-gonic/g…

…in-1.9.1
apigee · Sep 5, 2023 · f5f6204 · f5f6204
2 parents 1df33f9 + b3683dd
commit f5f6204
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -42,12 +42,6 @@ jobs:
         -   image: ${{github.repository_owner}}/registry-spec-renderer
             context: "containers/registry-spec-renderer"
             dockerfile: "containers/registry-spec-renderer/Dockerfile"
-        -   image: ${{github.repository_owner}}/registry-prism-mock-server
-            context: "containers/registry-mock-server/openapi"
-            dockerfile: containers/registry-mock-server/openapi/Dockerfile
-        -   image: ${{github.repository_owner}}/registry-graphql-mock-server
-            context: "containers/registry-mock-server/graphql"
-            dockerfile: containers/registry-mock-server/graphql/Dockerfile
         -   image: ${{github.repository_owner}}/registry-linters
             context: "."
             dockerfile: "containers/registry-linters/Dockerfile"
@@ -85,4 +79,4 @@ jobs:
         file: ${{ matrix.dockerfile }}
         push: ${{ github.event_name != 'pull_request' }}
         tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
+        labels: ${{ steps.meta.outputs.labels }}
diff --git a/cmd/registry-connect/discover/apigee/export.go b/cmd/registry-connect/discover/apigee/export.go
@@ -69,6 +69,8 @@ func export(ctx context.Context, client apigee.Client) error {
 					},
 					Labels: map[string]string{
 						"apihub-kind":          "product",
+						"apihub-source":        "registry-connect",
+						"apihub-provider":      "apigee",
 						"apihub-business-unit": label(client.Org()),
 						"apihub-target-users":  access,
 					},
@@ -181,6 +183,8 @@ func addProxies(ctx context.Context, client apigee.Client, proxies []*api.Google
 					},
 					Labels: map[string]string{
 						"apihub-kind":          "proxy",
+						"apihub-source":        "registry-connect",
+						"apihub-provider":      "apigee",
 						"apihub-business-unit": label(client.Org()),
 					},
 				},

diff --git a/consistency/analysis/requirements.txt b/consistency/analysis/requirements.txt
@@ -1,5 +1,5 @@
 cachetools==5.2.0
-certifi==2022.6.15
+certifi==2023.7.22
 charset-normalizer==2.1.0
 google-api-core==2.8.2
 google-auth==2.10.0

diff --git a/consistency/tool/requirements.txt b/consistency/tool/requirements.txt
@@ -1,17 +1,17 @@
 black==22.6.0
 cachetools==5.2.0
-certifi==2022.6.15
+certifi==2023.7.22
 charset-normalizer==2.1.0
 click==8.1.3
 google-api-core==2.8.2
 google-auth==2.9.1
 google-cloud-apigeeregistry==0.0.0
 googleapis-common-protos==1.56.4
-grpcio==1.47.0
+grpcio==1.53.0
 grpcio-status==1.47.0
 grpcio-tools==1.47.0
 idna==3.3
-joblib==1.1.0
+joblib==1.2.0
 mock==4.0.3
 mypy-extensions==0.4.3
 numpy==1.23.1
@@ -25,10 +25,10 @@ pyasn1-modules==0.2.8
 python-dateutil==2.8.2
 pytictoc==1.5.2
 pytz==2022.1
-requests==2.28.1
+requests==2.31.0
 rsa==4.8
 scikit-learn==1.1.1
-scipy==1.8.1
+scipy==1.10.0
 six==1.16.0
 sklearn==0.0
 strsimpy==0.2.1