From f0a2781a8ed7bb2560b8a7598e2ee051ec8c1158 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Mon, 11 Mar 2024 10:52:16 -0400 Subject: [PATCH] chore: re-drop weak refs to parent modules and tag (#9545) Replay #6944 after giving 12+ months for importers to update to versions of cloud.google.com/go (>=v0.108.0) and cloud.google.com/go/compute (>=v1.13.0) that isolate the cloud.google.com/go/compute/metadata module. Related to https://togithub.com/googleapis/google-cloud-go/issues/6311 cc @codyoss @quartzmo --- compute/metadata/go.mod | 2 -- compute/metadata/go.sum | 2 -- compute/metadata/tidyfix.go | 23 ----------------------- 3 files changed, 27 deletions(-) delete mode 100644 compute/metadata/tidyfix.go diff --git a/compute/metadata/go.mod b/compute/metadata/go.mod index 5c7d49ceeeff..7276f1b60d4c 100644 --- a/compute/metadata/go.mod +++ b/compute/metadata/go.mod @@ -1,5 +1,3 @@ module cloud.google.com/go/compute/metadata go 1.19 - -require cloud.google.com/go/compute v1.24.0 diff --git a/compute/metadata/go.sum b/compute/metadata/go.sum index addeb41199b2..e69de29bb2d1 100644 --- a/compute/metadata/go.sum +++ b/compute/metadata/go.sum @@ -1,2 +0,0 @@ -cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= -cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40= diff --git a/compute/metadata/tidyfix.go b/compute/metadata/tidyfix.go deleted file mode 100644 index 4cef48500817..000000000000 --- a/compute/metadata/tidyfix.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2022 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 metadata - -// 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 _ "cloud.google.com/go/compute/internal"