diff --git a/cmd/cli/app/provider/provider_enroll.go b/cmd/cli/app/provider/provider_enroll.go
index cd37a3a863..3b2a42107f 100644
--- 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
index 4eed168cac..89cb15a277 100644
--- a/docs/docs/ref/proto.md
+++ b/docs/docs/ref/proto.md
@@ -959,7 +959,6 @@ Namespace: is the namespace for the GHCR provider.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| cli | bool | | |
-| port | int32 | | |
| owner | string | optional | |
| context | Context | | |
| redirect_url | string | optional | |
diff --git a/internal/controlplane/handlers_oauth_test.go b/internal/controlplane/handlers_oauth_test.go
index d70440e016..eb0237c4a8 100644
--- 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
index b48ad09074..fecaf9f809 100644
--- a/pkg/api/openapi/minder/v1/minder.swagger.json
+++ b/pkg/api/openapi/minder/v1/minder.swagger.json
@@ -282,13 +282,6 @@
"required": false,
"type": "boolean"
},
- {
- "name": "port",
- "in": "query",
- "required": false,
- "type": "integer",
- "format": "int32"
- },
{
"name": "owner",
"in": "query",
diff --git a/pkg/api/protobuf/go/minder/v1/minder.pb.go b/pkg/api/protobuf/go/minder/v1/minder.pb.go
index e3e24c2ee2..4cb7f1ab85 100644
--- a/pkg/api/protobuf/go/minder/v1/minder.pb.go
+++ b/pkg/api/protobuf/go/minder/v1/minder.pb.go
@@ -1888,7 +1888,6 @@ type GetAuthorizationURLRequest struct {
unknownFields protoimpl.UnknownFields
Cli bool `protobuf:"varint,3,opt,name=cli,proto3" json:"cli,omitempty"`
- Port int32 `protobuf:"varint,4,opt,name=port,proto3" json:"port,omitempty"`
Owner *string `protobuf:"bytes,5,opt,name=owner,proto3,oneof" json:"owner,omitempty"`
Context *Context `protobuf:"bytes,6,opt,name=context,proto3" json:"context,omitempty"`
RedirectUrl *string `protobuf:"bytes,7,opt,name=redirect_url,json=redirectUrl,proto3,oneof" json:"redirect_url,omitempty"`
@@ -1934,13 +1933,6 @@ func (x *GetAuthorizationURLRequest) GetCli() bool {
return false
}
-func (x *GetAuthorizationURLRequest) GetPort() int32 {
- if x != nil {
- return x.Port
- }
- return 0
-}
-
func (x *GetAuthorizationURLRequest) GetOwner() string {
if x != nil && x.Owner != nil {
return *x.Owner
@@ -13027,24 +13019,24 @@ var file_minder_v1_minder_proto_rawDesc = []byte{
0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0xc0, 0x02, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x41,
0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x52, 0x4c, 0x52,
0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x6c, 0x69, 0x18, 0x03, 0x20,
- 0x01, 0x28, 0x08, 0x52, 0x03, 0x63, 0x6c, 0x69, 0x12, 0x20, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74,
- 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x42, 0x0c, 0xba, 0x48, 0x09, 0x1a, 0x07, 0x18, 0xff, 0xff,
- 0x03, 0x28, 0xe8, 0x07, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x19, 0x0a, 0x05, 0x6f, 0x77,
- 0x6e, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x6f, 0x77, 0x6e,
- 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
- 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x69, 0x6e, 0x64, 0x65, 0x72, 0x2e,
- 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74,
- 0x65, 0x78, 0x74, 0x12, 0x26, 0x0a, 0x0c, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f,
- 0x75, 0x72, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0b, 0x72, 0x65, 0x64,
- 0x69, 0x72, 0x65, 0x63, 0x74, 0x55, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x06, 0x63,
- 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f,
- 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74,
- 0x72, 0x75, 0x63, 0x74, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x25, 0x0a, 0x0e,
- 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x18, 0x09,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x43, 0x6c,
- 0x61, 0x73, 0x73, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x42, 0x0f, 0x0a,
- 0x0d, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x75, 0x72, 0x6c, 0x4a, 0x04,
- 0x08, 0x01, 0x10, 0x02, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0x45, 0x0a, 0x1b, 0x47, 0x65,
+ 0x01, 0x28, 0x08, 0x52, 0x03, 0x63, 0x6c, 0x69, 0x12, 0x19, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65,
+ 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72,
+ 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x06,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x69, 0x6e, 0x64, 0x65, 0x72, 0x2e, 0x76, 0x31,
+ 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78,
+ 0x74, 0x12, 0x26, 0x0a, 0x0c, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x75, 0x72,
+ 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x72,
+ 0x65, 0x63, 0x74, 0x55, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6e,
+ 0x66, 0x69, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+ 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75,
+ 0x63, 0x74, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x25, 0x0a, 0x0e, 0x70, 0x72,
+ 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x18, 0x09, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x73,
+ 0x73, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x42, 0x0f, 0x0a, 0x0d, 0x5f,
+ 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x75, 0x72, 0x6c, 0x4a, 0x04, 0x08, 0x01,
+ 0x10, 0x02, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x52, 0x08,
+ 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63,
+ 0x74, 0x5f, 0x69, 0x64, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x45, 0x0a, 0x1b, 0x47, 0x65,
0x74, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x52,
0x4c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x73,
diff --git a/proto/minder/v1/minder.proto b/proto/minder/v1/minder.proto
index 49ed688391..9fd68a1595 100644
--- 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 {