Deprecate the port proto message (#4881)

Signed-off-by: Radoslav Dimitrov <[email protected]>
mindersec · Nov 5, 2024 · 0b2c412 · 0b2c412
1 parent 95d3666
commit 0b2c412
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 45 deletions.
diff --git a/cmd/cli/app/provider/provider_enroll.go b/cmd/cli/app/provider/provider_enroll.go
@@ -203,7 +203,6 @@ func enrollUsingOAuth2Flow(
 	resp, err := oauthClient.GetAuthorizationURL(ctx, &minderv1.GetAuthorizationURLRequest{
 		Context:       &minderv1.Context{Provider: &providerName, Project: &project},
 		Cli:           true,
-		Port:          port,
 		Owner:         &owner,
 		Config:        providerConfig,
 		ProviderClass: providerClass,

diff --git a/docs/docs/ref/proto.md b/docs/docs/ref/proto.md
diff --git a/internal/controlplane/handlers_oauth_test.go b/internal/controlplane/handlers_oauth_test.go
@@ -212,8 +212,7 @@ func TestGetAuthorizationURL(t *testing.T) {
 					Provider: &githubProviderClass,
 					Project:  &projectIdStr,
 				},
-				Port: 8080,
-				Cli:  true,
+				Cli: true,
 			},
 			buildStubs: func(store *mockdb.MockStore) {
 				store.EXPECT().
@@ -248,8 +247,7 @@ func TestGetAuthorizationURL(t *testing.T) {
 					Provider: &githubAppProviderClass,
 					Project:  &projectIdStr,
 				},
-				Port: 8080,
-				Cli:  true,
+				Cli: true,
 			},
 			buildStubs: func(store *mockdb.MockStore) {
 				store.EXPECT().
@@ -283,8 +281,7 @@ func TestGetAuthorizationURL(t *testing.T) {
 					Provider: &nonGithubProviderName,
 					Project:  &projectIdStr,
 				},
-				Port: 8080,
-				Cli:  true,
+				Cli: true,
 			},
 			buildStubs: func(_ *mockdb.MockStore) {},
 
@@ -303,8 +300,7 @@ func TestGetAuthorizationURL(t *testing.T) {
 					Provider: &githubProviderClass,
 					Project:  &projectIdStr,
 				},
-				Port: 8080,
-				Cli:  true,
+				Cli: true,
 			},
 			buildStubs: func(store *mockdb.MockStore) {
 				store.EXPECT().

diff --git a/pkg/api/openapi/minder/v1/minder.swagger.json b/pkg/api/openapi/minder/v1/minder.swagger.json
diff --git a/pkg/api/protobuf/go/minder/v1/minder.pb.go b/pkg/api/protobuf/go/minder/v1/minder.pb.go
diff --git a/proto/minder/v1/minder.proto b/proto/minder/v1/minder.proto
@@ -991,7 +991,6 @@ message CheckHealthResponse {
 
 message GetAuthorizationURLRequest {
     bool cli = 3;
-    int32 port = 4 [(buf.validate.field).int32 = { gte: 1000, lte: 65535 }];
     optional string owner = 5;
     Context context = 6;
     optional string redirect_url = 7;
@@ -1001,7 +1000,8 @@ message GetAuthorizationURLRequest {
 
     string provider_class = 9;
 
-    reserved 1, 2; // deprecated provider and project_id
+    reserved 1, 2, 4;
+    reserved "provider", "project_id", "port";
 }
 
 message GetAuthorizationURLResponse {