Skip to content

Commit 9c24ab6

Browse files
authored
chore: Remove preempted deprecation warnings (#1655)
Signed-off-by: Evans Mungai <[email protected]>
1 parent 289102f commit 9c24ab6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ require (
4141
github.com/vmware-tanzu/velero v1.14.1
4242
go.opentelemetry.io/otel v1.31.0
4343
go.opentelemetry.io/otel/sdk v1.31.0
44+
go.opentelemetry.io/otel/trace v1.31.0
4445
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
4546
golang.org/x/mod v0.21.0
4647
golang.org/x/sync v0.8.0
@@ -123,7 +124,6 @@ require (
123124
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
124125
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
125126
go.opentelemetry.io/otel/metric v1.31.0 // indirect
126-
go.opentelemetry.io/otel/trace v1.31.0 // indirect
127127
go.uber.org/multierr v1.11.0 // indirect
128128
golang.org/x/tools v0.22.0 // indirect
129129
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect

pkg/supportbundle/load.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func GetSupportBundleFromURI(bundleURI string) (*troubleshootv1beta2.SupportBund
3838
}
3939

4040
// ParseSupportBundle parses a support bundle from a byte array into a SupportBundle object
41-
// Deprecated: use loader.LoadSpecs instead
41+
// We will deprecate this in favour of use loader.LoadSpecs once the new API is stable
4242
func ParseSupportBundle(doc []byte, followURI bool) (*troubleshootv1beta2.SupportBundle, error) {
4343
doc, err := docrewrite.ConvertToV1Beta2(doc)
4444
if err != nil {
@@ -102,13 +102,13 @@ func ParseSupportBundle(doc []byte, followURI bool) (*troubleshootv1beta2.Suppor
102102
}
103103

104104
// ParseSupportBundle parses a support bundle from a byte array into a SupportBundle object
105-
// Deprecated: use loader.LoadSpecs instead
105+
// We will deprecate this in favour of use loader.LoadSpecs once the new API is stable
106106
func ParseSupportBundleFromDoc(doc []byte) (*troubleshootv1beta2.SupportBundle, error) {
107107
return ParseSupportBundle(doc, true)
108108
}
109109

110110
// GetRedactorFromURI parses a redactor from a URI into a Redactor object
111-
// Deprecated: use loader.LoadSpecs instead
111+
// We will deprecate this in favour of use loader.LoadSpecs once the new API is stable
112112
func GetRedactorFromURI(redactorURI string) (*troubleshootv1beta2.Redactor, error) {
113113
redactorContent, err := LoadRedactorSpec(redactorURI)
114114
if err != nil {
@@ -127,7 +127,7 @@ func GetRedactorFromURI(redactorURI string) (*troubleshootv1beta2.Redactor, erro
127127
}
128128

129129
// GetRedactorsFromURIs parses redactors from a URIs Redactor objects
130-
// Deprecated: use loader.LoadSpecs instead
130+
// We will deprecate this in favour of use loader.LoadSpecs once the new API is stable
131131
func GetRedactorsFromURIs(redactorURIs []string) ([]*troubleshootv1beta2.Redact, error) {
132132
redactors := []*troubleshootv1beta2.Redact{}
133133
for _, redactor := range redactorURIs {
@@ -263,7 +263,7 @@ func loadSpecFromURL(arg string) ([]byte, error) {
263263
}
264264

265265
// ParseRedactorsFromDocs parses a slice of YAML docs and returns a slice of Redactors
266-
// Deprecated: use loader.LoadSpecs instead
266+
// We will deprecate this in favour of use loader.LoadSpecs once the new API is stable
267267
func ParseRedactorsFromDocs(docs []string) ([]*troubleshootv1beta2.Redact, error) {
268268
var redactors []*troubleshootv1beta2.Redact
269269

0 commit comments

Comments
 (0)