Skip to content

Commit

Permalink
fix comments
Browse files Browse the repository at this point in the history
  • Loading branch information
vinayada1 committed Mar 24, 2023
1 parent e195ee9 commit 0315f82
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
3 changes: 2 additions & 1 deletion pkg/ucp/frontend/api/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ func Register(ctx context.Context, router *mux.Router, ctrlOpts ctrl.Options) er
HandlerFactory: kubernetes_ctrl.NewDiscoveryDoc,
},
}...)

}

ctrl.ConfigureDefaultHandlers(router, ctrlOpts.Options)

logger := ucplog.FromContextOrDiscard(ctx)
logger.Info(fmt.Sprintf("Registering routes with base path: %s", baseURL))

Expand Down
18 changes: 6 additions & 12 deletions pkg/ucp/frontend/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/project-radius/radius/pkg/armrpc/frontend/server"
ucp_aws "github.com/project-radius/radius/pkg/ucp/aws"
"github.com/project-radius/radius/pkg/ucp/secret"
"github.com/project-radius/radius/pkg/validator"
)

// Options represents controller options.
Expand Down Expand Up @@ -53,18 +54,6 @@ type HandlerOptions struct {
HandlerFactory ControllerFunc
}

// BaseController is the base operation controller.
type BaseController struct {
Options Options
}

// NewBaseController creates BaseController instance.
func NewBaseController(options Options) BaseController {
return BaseController{
options,
}
}

func RegisterHandler(ctx context.Context, opts HandlerOptions, ctrlOpts Options) error {
storageClient, err := ctrlOpts.DataProvider.GetStorageClient(ctx, opts.ResourceType)
if err != nil {
Expand Down Expand Up @@ -104,3 +93,8 @@ func RegisterHandler(ctx context.Context, opts HandlerOptions, ctrlOpts Options)
}
return nil
}

func ConfigureDefaultHandlers(router *mux.Router, opts armrpc_controller.Options) {
router.NotFoundHandler = validator.APINotFoundHandler()
router.MethodNotAllowedHandler = validator.APIMethodNotAllowedHandler()
}

0 comments on commit 0315f82

Please sign in to comment.