chore: move vision v2 to in-place module strategy (#7941)

This change moves the sources from the v2 folder up a dir and changes the name of the module in vision. The v2 client is now just up a directory and we are no longer storing the source for v1 of the module.

Updates: #7348

.github/.OwlBot.yaml

@@ -432,8 +432,8 @@ deep-remove-regex:
   - /videointelligence/apiv1/
   - /videointelligence/apiv1beta2/
   - /videointelligence/apiv1p3beta1/
-  - /vision/v2/apiv1/
-  - /vision/v2/apiv1p1beta1/
+  - /vision/apiv1/
+  - /vision/apiv1p1beta1/
   - /vmmigration/apiv1/
   - /vmwareengine/apiv1/
   - /vpcaccess/apiv1/
@@ -906,10 +906,14 @@ deep-copy-regex:
     dest: /
   - source: /google/cloud/videointelligence/v1p3beta1/cloud.google.com/go
     dest: /
-  - source: /google/cloud/vision/v1/cloud.google.com/go
-    dest: /
-  - source: /google/cloud/vision/v1p1beta1/cloud.google.com/go
-    dest: /
+  - source: /google/cloud/vision/v1/cloud.google.com/go/vision/v2/apiv1
+    dest: /vision/apiv1
+  - source: /google/cloud/vision/v1/cloud.google.com/go/internal/generated/snippets/vision/v2/apiv1
+    dest: /internal/generated/snippets/vision/apiv1
+  - source: /google/cloud/vision/v1p1beta1/cloud.google.com/go/vision/v2/apiv1p1beta1
+    dest: /vision/apiv1p1beta1
+  - source: /google/cloud/vision/v1p1beta1/cloud.google.com/go/internal/generated/snippets/vision/v2/apiv1p1beta1
+    dest: /internal/generated/snippets/vision/apiv1p1beta1
   - source: /google/cloud/vmmigration/v1/cloud.google.com/go
     dest: /
   - source: /google/cloud/vmwareengine/v1/cloud.google.com/go

.release-please-manifest-submodules.json

@@ -112,7 +112,7 @@
   "translate": "1.7.1",
   "video": "1.16.1",
   "videointelligence": "1.10.1",
-  "vision/v2": "2.7.1",
+  "vision": "2.7.1",
   "vmmigration": "1.6.1",
   "vmwareengine": "0.3.1",
   "vpcaccess": "1.6.1",

go.work

@@ -137,7 +137,6 @@ use (
 	./video
 	./videointelligence
 	./vision
-	./vision/v2
 	./vmmigration
 	./vmwareengine
 	./vpcaccess

internal/generated/snippets/go.mod

@@ -6,7 +6,9 @@ require (
 	cloud.google.com/go v0.110.2
 	cloud.google.com/go/accessapproval v1.6.0
 	cloud.google.com/go/accesscontextmanager v1.7.1
+	cloud.google.com/go/advisorynotifications v0.0.0-00010101000000-000000000000
 	cloud.google.com/go/aiplatform v1.37.0
+	cloud.google.com/go/alloydb v0.0.0-00010101000000-000000000000
 	cloud.google.com/go/analytics v0.19.0
 	cloud.google.com/go/apigateway v1.5.0
 	cloud.google.com/go/apigeeconnect v1.5.0
@@ -46,6 +48,7 @@ require (
 	cloud.google.com/go/datastream v1.7.0
 	cloud.google.com/go/deploy v1.8.0
 	cloud.google.com/go/dialogflow v1.32.0
+	cloud.google.com/go/discoveryengine v0.0.0-00010101000000-000000000000
 	cloud.google.com/go/dlp v1.9.0
 	cloud.google.com/go/documentai v1.18.0
 	cloud.google.com/go/domains v0.8.0
@@ -72,6 +75,7 @@ require (
 	cloud.google.com/go/logging v1.7.0
 	cloud.google.com/go/longrunning v0.4.2
 	cloud.google.com/go/managedidentities v1.5.0
+	cloud.google.com/go/maps v0.7.0
 	cloud.google.com/go/mediatranslation v0.7.0
 	cloud.google.com/go/memcache v1.9.0
 	cloud.google.com/go/metastore v1.10.0
@@ -91,6 +95,7 @@ require (
 	cloud.google.com/go/pubsub v1.30.1
 	cloud.google.com/go/pubsublite v1.7.0
 	cloud.google.com/go/recaptchaenterprise v1.3.1
+	cloud.google.com/go/recaptchaenterprise/v2 v2.7.1
 	cloud.google.com/go/recommendationengine v0.7.0
 	cloud.google.com/go/recommender v1.9.0
 	cloud.google.com/go/redis v1.11.0
@@ -120,28 +125,19 @@ require (
 	cloud.google.com/go/video v1.15.0
 	cloud.google.com/go/videointelligence v1.10.0
 	cloud.google.com/go/vision v1.2.0
+	cloud.google.com/go/vision/v2 v2.7.1
 	cloud.google.com/go/vmmigration v1.6.0
+	cloud.google.com/go/vmwareengine v0.3.0
 	cloud.google.com/go/vpcaccess v1.6.0
 	cloud.google.com/go/webrisk v1.8.0
 	cloud.google.com/go/websecurityscanner v1.5.0
 	cloud.google.com/go/workflows v1.10.0
+	cloud.google.com/go/workstations v0.0.0-00010101000000-000000000000
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	google.golang.org/api v0.122.0
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
 )
 
-require (
-	cloud.google.com/go/advisorynotifications v0.0.0-00010101000000-000000000000
-	cloud.google.com/go/alloydb v0.0.0-00010101000000-000000000000
-	cloud.google.com/go/discoveryengine v0.0.0-00010101000000-000000000000
-	cloud.google.com/go/maps v0.7.0
-	cloud.google.com/go/recaptchaenterprise/v2 v2.7.1
-	cloud.google.com/go/storage v1.30.1
-	cloud.google.com/go/vision/v2 v2.7.1
-	cloud.google.com/go/vmwareengine v0.3.0
-	cloud.google.com/go/workstations v0.0.0-00010101000000-000000000000
-)
-
 require (
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/dataproc v1.12.0 // indirect
@@ -311,7 +307,7 @@ replace cloud.google.com/go/translate => ../../../translate
 
 replace cloud.google.com/go/videointelligence => ../../../videointelligence
 
-replace cloud.google.com/go/vision => ../../../vision
+replace cloud.google.com/go/vision/v2 => ../../../vision
 
 replace cloud.google.com/go/vpcaccess => ../../../vpcaccess
 
@@ -395,8 +391,6 @@ replace cloud.google.com/go/gkemulticloud => ../../../gkemulticloud
 
 replace cloud.google.com/go/recaptchaenterprise/v2 => ../../../recaptchaenterprise/v2
 
-replace cloud.google.com/go/vision/v2 => ../../../vision/v2
-
 replace cloud.google.com/go/baremetalsolution => ../../../baremetalsolution
 
 replace cloud.google.com/go/batch => ../../../batch

internal/generated/snippets/go.sum

@@ -2,6 +2,8 @@ cloud.google.com/go/dataproc v1.7.0/go.mod h1:CKAlMjII9H90RXaMpSxQ8EU6dQx6iAYNPc
 cloud.google.com/go/dataproc v1.8.0/go.mod h1:5OW+zNAH0pMpw14JVrPONsxMQYMBqJuzORhIBfBn9uI=
 cloud.google.com/go/dataproc v1.12.0 h1:W47qHL3W4BPkAIbk4SWmIERwsWBaNnWm0P2sdx3YgGU=
 cloud.google.com/go/dataproc v1.12.0/go.mod h1:zrF3aX0uV3ikkMz6z4uBbIKyhRITnxvr4i3IjKsKrw4=
+cloud.google.com/go/vision v1.2.0 h1:/CsSTkbmO9HC8iQpxbK8ATms3OQaX3YQUeTMGCxlaK4=
+cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
@@ -365,6 +367,7 @@ golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -450,6 +453,7 @@ google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEn
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
 google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
 google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA=
 google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8=
 google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs=
 google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw=
@@ -480,6 +484,8 @@ google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEc
 google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
 google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
 google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
+google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
 google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
 google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
 google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=

internal/postprocessor/config.yaml

@@ -124,7 +124,6 @@ modules:
   - video
   - videointelligence
   - vision
-  - vision/v2
   - vmmigration
   - vmwareengine
   - vpcaccess

release-please-config-yoshi-submodules.json

@@ -342,7 +342,7 @@
         "videointelligence": {
             "component": "videointelligence"
         },
-        "vision/v2": {
+        "vision": {
             "component": "vision"
         },
         "vmmigration": {
@@ -367,5 +367,7 @@
             "component": "workstations"
         }
     },
-    "plugins": ["sentence-case"]
-}
+    "plugins": [
+        "sentence-case"
+    ]
+}

vision/CHANGES.md

@@ -1,5 +1,83 @@
 # Changes
 
+## [2.7.1](https://github.com/googleapis/google-cloud-go/compare/vision/v2.7.0...vision/v2.7.1) (2023-05-08)
+
+
+### Bug Fixes
+
+* **vision/v2:** Update grpc to v1.55.0 ([1147ce0](https://github.com/googleapis/google-cloud-go/commit/1147ce02a990276ca4f8ab7a1ab65c14da4450ef))
+* **vision:** Update grpc to v1.55.0 ([1147ce0](https://github.com/googleapis/google-cloud-go/commit/1147ce02a990276ca4f8ab7a1ab65c14da4450ef))
+
+## [2.7.0](https://github.com/googleapis/google-cloud-go/compare/vision/v2.6.0...vision/v2.7.0) (2023-03-15)
+
+
+### Features
+
+* **vision:** Update iam and longrunning deps ([91a1f78](https://github.com/googleapis/google-cloud-go/commit/91a1f784a109da70f63b96414bba8a9b4254cddd))
+
+## [2.6.0](https://github.com/googleapis/google-cloud-go/compare/vision/v2.5.0...vision/v2.6.0) (2023-01-04)
+
+
+### Features
+
+* **vision/v2:** Add REST client ([06a54a1](https://github.com/googleapis/google-cloud-go/commit/06a54a16a5866cce966547c51e203b9e09a25bc0))
+
+## [2.5.0](https://github.com/googleapis/google-cloud-go/compare/vision/v2.4.0...vision/v2.5.0) (2022-11-03)
+
+
+### Features
+
+* **vision/v2:** rewrite signatures in terms of new location ([3c4b2b3](https://github.com/googleapis/google-cloud-go/commit/3c4b2b34565795537aac1661e6af2442437e34ad))
+
+## [2.4.0](https://github.com/googleapis/google-cloud-go/compare/vision/v2.3.0...vision/v2.4.0) (2022-10-25)
+
+
+### Features
+
+* **vision/v2:** start generating stubs dir ([de2d180](https://github.com/googleapis/google-cloud-go/commit/de2d18066dc613b72f6f8db93ca60146dabcfdcc))
+
+## [2.3.0](https://github.com/googleapis/google-cloud-go/compare/vision/v2.2.0...vision/v2.3.0) (2022-09-21)
+
+
+### Features
+
+* **vision:** rewrite signatures in terms of new types for betas ([9f303f9](https://github.com/googleapis/google-cloud-go/commit/9f303f9efc2e919a9a6bd828f3cdb1fcb3b8b390))
+
+## [2.2.0](https://github.com/googleapis/google-cloud-go/compare/vision/v2.1.1...vision/v2.2.0) (2022-09-20)
+
+
+### Features
+
+* **vision/v2:** start generating apiv1p1beta1 ([4aa2f48](https://github.com/googleapis/google-cloud-go/commit/4aa2f48eeb2b37124b207d3567f2b66f567797a8))
+
+## [2.1.1](https://github.com/googleapis/google-cloud-go/compare/vision/v2.1.0...vision/v2.1.1) (2022-09-15)
+
+
+### Documentation
+
+* **vision/v2:** update comments for image annotator OCR models ([ec1a190](https://github.com/googleapis/google-cloud-go/commit/ec1a190abbc4436fcaeaa1421c7d9df624042752))
+
+## [2.1.0](https://github.com/googleapis/google-cloud-go/compare/vision/v2.0.0...vision/v2.1.0) (2022-08-09)
+
+
+### Features
+
+* **vision/v2:** Add TextDetectionParams.advanced_ocr_options ([076c35b](https://github.com/googleapis/google-cloud-go/commit/076c35b18f80fa14cb3941b294feb829a5c92103))
+
+## [2.0.0](https://github.com/googleapis/google-cloud-go/compare/vision/v1.2.0...vision/v2.0.0) (2022-05-24)
+
+
+### ⚠ BREAKING CHANGES
+
+* **vision/v2:** removed fields from SafeSearchAnnotation in googleapis/go-genproto#809
+
+### Features
+
+* **vision/v2:** Release breaking changes as v2 module ([#6072](https://github.com/googleapis/google-cloud-go/issues/6072)) ([9a4ff7f](https://github.com/googleapis/google-cloud-go/commit/9a4ff7f694c6ff53c36c6eb9d52ceb9ec118f12c))
+
+## [1.2.0](https://github.com/googleapis/google-cloud-go/compare/vision/v1.1.0...vision/v1.2.0) (2022-02-23)
+
+
 ## [1.2.0](https://github.com/googleapis/google-cloud-go/compare/vision/v1.1.0...vision/v1.2.0) (2022-02-23)