From 1f18d85a4ec20d8807418473c2b6cb493ac7677c Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 28 Feb 2024 15:18:40 -0500 Subject: [PATCH] chore(all): Drop submodule backreferences (#1087) --- googleapis/api/apikeys/go.mod | 2 +- googleapis/api/apikeys/tidyfix.go | 23 --------------------- googleapis/api/go.mod | 1 - googleapis/api/go.sum | 2 -- googleapis/api/servicecontrol/go.mod | 2 +- googleapis/api/servicecontrol/tidyfix.go | 23 --------------------- googleapis/api/servicemanagement/go.mod | 2 +- googleapis/api/servicemanagement/tidyfix.go | 23 --------------------- googleapis/api/serviceusage/tidyfix.go | 23 --------------------- googleapis/api/tidyfix.go | 23 --------------------- googleapis/bytestream/go.mod | 1 - googleapis/bytestream/go.sum | 2 -- googleapis/bytestream/tidyfix.go | 23 --------------------- googleapis/rpc/go.mod | 5 +---- googleapis/rpc/go.sum | 2 -- googleapis/rpc/tidyfix.go | 23 --------------------- 16 files changed, 4 insertions(+), 176 deletions(-) delete mode 100644 googleapis/api/apikeys/tidyfix.go delete mode 100644 googleapis/api/servicecontrol/tidyfix.go delete mode 100644 googleapis/api/servicemanagement/tidyfix.go delete mode 100644 googleapis/api/serviceusage/tidyfix.go delete mode 100644 googleapis/api/tidyfix.go delete mode 100644 googleapis/bytestream/tidyfix.go delete mode 100644 googleapis/rpc/tidyfix.go diff --git a/googleapis/api/apikeys/go.mod b/googleapis/api/apikeys/go.mod index e5a9c2188..7aa325548 100644 --- a/googleapis/api/apikeys/go.mod +++ b/googleapis/api/apikeys/go.mod @@ -4,7 +4,6 @@ go 1.19 require ( cloud.google.com/go/apikeys v1.1.5 - google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 google.golang.org/grpc v1.61.1 ) @@ -14,6 +13,7 @@ require ( golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect + google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 // indirect google.golang.org/protobuf v1.32.0 // indirect diff --git a/googleapis/api/apikeys/tidyfix.go b/googleapis/api/apikeys/tidyfix.go deleted file mode 100644 index a15c71301..000000000 --- a/googleapis/api/apikeys/tidyfix.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file, and the {{.RootMod}} import, won't actually become part of -// the resultant binary. -//go:build modhack -// +build modhack - -package apikeys - -// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository -import _ "google.golang.org/genproto/internal" diff --git a/googleapis/api/go.mod b/googleapis/api/go.mod index 6819388ef..8170cbaff 100644 --- a/googleapis/api/go.mod +++ b/googleapis/api/go.mod @@ -3,7 +3,6 @@ module google.golang.org/genproto/googleapis/api go 1.19 require ( - google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 google.golang.org/grpc v1.61.1 google.golang.org/protobuf v1.32.0 diff --git a/googleapis/api/go.sum b/googleapis/api/go.sum index 4c5dd4403..63e24f211 100644 --- a/googleapis/api/go.sum +++ b/googleapis/api/go.sum @@ -10,8 +10,6 @@ golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= -google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 h1:hZB7eLIaYlW9qXRfCq/qDaPdbeY3757uARz5Vvfv+cY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk= google.golang.org/grpc v1.61.1 h1:kLAiWrZs7YeDM6MumDe7m3y4aM6wacLzM1Y/wiLP9XY= diff --git a/googleapis/api/servicecontrol/go.mod b/googleapis/api/servicecontrol/go.mod index b9cbddd88..3be97abb7 100644 --- a/googleapis/api/servicecontrol/go.mod +++ b/googleapis/api/servicecontrol/go.mod @@ -4,7 +4,6 @@ go 1.19 require ( cloud.google.com/go/servicecontrol v1.12.5 - google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 google.golang.org/grpc v1.61.1 @@ -16,4 +15,5 @@ require ( golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect + google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect ) diff --git a/googleapis/api/servicecontrol/tidyfix.go b/googleapis/api/servicecontrol/tidyfix.go deleted file mode 100644 index 464ec5db7..000000000 --- a/googleapis/api/servicecontrol/tidyfix.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file, and the {{.RootMod}} import, won't actually become part of -// the resultant binary. -//go:build modhack -// +build modhack - -package servicecontrol - -// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository -import _ "google.golang.org/genproto/internal" diff --git a/googleapis/api/servicemanagement/go.mod b/googleapis/api/servicemanagement/go.mod index f8728f253..f8ebc5818 100644 --- a/googleapis/api/servicemanagement/go.mod +++ b/googleapis/api/servicemanagement/go.mod @@ -4,7 +4,6 @@ go 1.19 require ( cloud.google.com/go/servicemanagement v1.9.6 - google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 google.golang.org/grpc v1.61.1 ) @@ -14,6 +13,7 @@ require ( golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect + google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 // indirect google.golang.org/protobuf v1.32.0 // indirect diff --git a/googleapis/api/servicemanagement/tidyfix.go b/googleapis/api/servicemanagement/tidyfix.go deleted file mode 100644 index 633f5a4e5..000000000 --- a/googleapis/api/servicemanagement/tidyfix.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file, and the {{.RootMod}} import, won't actually become part of -// the resultant binary. -//go:build modhack -// +build modhack - -package servicemanagement - -// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository -import _ "google.golang.org/genproto/internal" diff --git a/googleapis/api/serviceusage/tidyfix.go b/googleapis/api/serviceusage/tidyfix.go deleted file mode 100644 index edcff3971..000000000 --- a/googleapis/api/serviceusage/tidyfix.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file, and the {{.RootMod}} import, won't actually become part of -// the resultant binary. -//go:build modhack -// +build modhack - -package serviceusage - -// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository -import _ "google.golang.org/genproto/internal" diff --git a/googleapis/api/tidyfix.go b/googleapis/api/tidyfix.go deleted file mode 100644 index 1d3f1b5b7..000000000 --- a/googleapis/api/tidyfix.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file, and the {{.RootMod}} import, won't actually become part of -// the resultant binary. -//go:build modhack -// +build modhack - -package api - -// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository -import _ "google.golang.org/genproto/internal" diff --git a/googleapis/bytestream/go.mod b/googleapis/bytestream/go.mod index a1c5fdb45..22f51c555 100644 --- a/googleapis/bytestream/go.mod +++ b/googleapis/bytestream/go.mod @@ -3,7 +3,6 @@ module google.golang.org/genproto/googleapis/bytestream go 1.19 require ( - google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 google.golang.org/grpc v1.61.1 google.golang.org/protobuf v1.32.0 ) diff --git a/googleapis/bytestream/go.sum b/googleapis/bytestream/go.sum index d46625cd7..d2fa87d21 100644 --- a/googleapis/bytestream/go.sum +++ b/googleapis/bytestream/go.sum @@ -10,8 +10,6 @@ golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= -google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 h1:FSL3lRCkhaPFxqi0s9o+V4UI2WTzAVOvkgbd4kVV4Wg= google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014/go.mod h1:SaPjaZGWb0lPqs6Ittu0spdfrOArqji4ZdeP5IC/9N4= google.golang.org/grpc v1.61.1 h1:kLAiWrZs7YeDM6MumDe7m3y4aM6wacLzM1Y/wiLP9XY= diff --git a/googleapis/bytestream/tidyfix.go b/googleapis/bytestream/tidyfix.go deleted file mode 100644 index c9ff572b6..000000000 --- a/googleapis/bytestream/tidyfix.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file, and the {{.RootMod}} import, won't actually become part of -// the resultant binary. -//go:build modhack -// +build modhack - -package bytestream - -// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository -import _ "google.golang.org/genproto/internal" diff --git a/googleapis/rpc/go.mod b/googleapis/rpc/go.mod index 714a475d7..31daa5e42 100644 --- a/googleapis/rpc/go.mod +++ b/googleapis/rpc/go.mod @@ -2,9 +2,6 @@ module google.golang.org/genproto/googleapis/rpc go 1.19 -require ( - google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 - google.golang.org/protobuf v1.32.0 -) +require google.golang.org/protobuf v1.32.0 require github.com/google/go-cmp v0.5.9 // indirect diff --git a/googleapis/rpc/go.sum b/googleapis/rpc/go.sum index 51022ee8d..e2499aef3 100644 --- a/googleapis/rpc/go.sum +++ b/googleapis/rpc/go.sum @@ -1,6 +1,4 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= -google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= diff --git a/googleapis/rpc/tidyfix.go b/googleapis/rpc/tidyfix.go deleted file mode 100644 index 7c74f9bb9..000000000 --- a/googleapis/rpc/tidyfix.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file, and the {{.RootMod}} import, won't actually become part of -// the resultant binary. -//go:build modhack -// +build modhack - -package rpc - -// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository -import _ "google.golang.org/genproto/internal"