Skip to content

Commit 22cc254

Browse files
authored
feat: replace protobuf with new module (#453)
Signed-off-by: Nathanael Liechti <[email protected]>
1 parent a43c9a2 commit 22cc254

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ require (
1010
github.com/argoproj/pkg v0.13.7-0.20230627120311-a4dd357b057e
1111
github.com/cristalhq/jwt/v3 v3.1.0
1212
github.com/elliotchance/pie/v2 v2.8.0
13-
github.com/golang/protobuf v1.5.4
1413
github.com/hashicorp/terraform-plugin-docs v0.19.4
1514
github.com/hashicorp/terraform-plugin-framework v1.10.0
1615
github.com/hashicorp/terraform-plugin-framework-validators v0.13.0
@@ -22,6 +21,7 @@ require (
2221
github.com/robfig/cron/v3 v3.0.1
2322
github.com/stretchr/testify v1.9.0
2423
golang.org/x/crypto v0.26.0
24+
google.golang.org/protobuf v1.35.1
2525
k8s.io/apiextensions-apiserver v0.24.17
2626
k8s.io/apimachinery v0.24.17
2727
k8s.io/client-go v0.24.17
@@ -117,6 +117,7 @@ require (
117117
github.com/gogo/protobuf v1.3.2 // indirect
118118
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
119119
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
120+
github.com/golang/protobuf v1.5.4 // indirect
120121
github.com/google/btree v1.1.2 // indirect
121122
github.com/google/gnostic v0.6.9 // indirect
122123
github.com/google/go-cmp v0.6.0 // indirect
@@ -252,7 +253,6 @@ require (
252253
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
253254
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
254255
google.golang.org/grpc v1.63.2 // indirect
255-
google.golang.org/protobuf v1.34.0 // indirect
256256
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
257257
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
258258
gopkg.in/inf.v0 v0.9.1 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,8 +1499,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
14991499
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
15001500
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
15011501
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
1502-
google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
1503-
google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
1502+
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
1503+
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
15041504
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
15051505
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
15061506
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

internal/provider/server_interface.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import (
2121
"github.com/argoproj/argo-cd/v2/pkg/apiclient/session"
2222
"github.com/argoproj/argo-cd/v2/pkg/apiclient/version"
2323
"github.com/argoproj/argo-cd/v2/util/io"
24-
"github.com/golang/protobuf/ptypes/empty"
2524
"github.com/hashicorp/terraform-plugin-framework/diag"
2625
"github.com/hashicorp/terraform-plugin-framework/types"
2726
"github.com/hashicorp/terraform-plugin-log/tflog"
2827
"github.com/oboukili/terraform-provider-argocd/internal/diagnostics"
2928
"github.com/oboukili/terraform-provider-argocd/internal/features"
29+
"google.golang.org/protobuf/types/known/emptypb"
3030
)
3131

3232
var runtimeErrorHandlers []func(error)
@@ -134,7 +134,7 @@ func (si *ServerInterface) InitClients(ctx context.Context) diag.Diagnostics {
134134
} else {
135135
defer io.Close(acCloser)
136136

137-
serverVersionMessage, err := versionClient.Version(ctx, &empty.Empty{})
137+
serverVersionMessage, err := versionClient.Version(ctx, &emptypb.Empty{})
138138
if err != nil {
139139
return diagnostics.Error("failed to read server version", err)
140140
}

0 commit comments

Comments
 (0)