Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Use correct service key for security proxy auth #5020

Merged
merged 1 commit into from
Dec 9, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions internal/security/proxyauth/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright 2020 Dell Inc.
* Copyright 2022-2023 IOTech Ltd.
* Copyright 2022-2024 IOTech Ltd.
* Copyright 2023 Intel Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
Expand Down Expand Up @@ -35,10 +35,8 @@ import (
"github.com/labstack/echo/v4"
)

const SecurityProxyAuthServiceKey = "security-proxy-auth"

func Main(ctx context.Context, cancel context.CancelFunc, router *echo.Echo, args []string) {
startupTimer := startup.NewStartUpTimer(common.CoreCommandServiceKey)
startupTimer := startup.NewStartUpTimer(common.SecurityProxyAuthServiceKey)

// All common command-line flags have been moved to DefaultCommonFlags. Service specific flags can be added here,
// by inserting service specific flag prior to call to commonFlags.Parse().
Expand All @@ -63,17 +61,17 @@ func Main(ctx context.Context, cancel context.CancelFunc, router *echo.Echo, arg
ctx,
cancel,
f,
SecurityProxyAuthServiceKey,
common.SecurityProxyAuthServiceKey,
common.ConfigStemSecurity,
configuration,
startupTimer,
dic,
true,
bootstrapConfig.ServiceTypeOther,
[]interfaces.BootstrapHandler{
NewBootstrap(router, SecurityProxyAuthServiceKey).BootstrapHandler,
NewBootstrap(router, common.SecurityProxyAuthServiceKey).BootstrapHandler,
httpServer.BootstrapHandler,
handlers.NewStartMessage(SecurityProxyAuthServiceKey, edgex.Version).BootstrapHandler,
handlers.NewStartMessage(common.SecurityProxyAuthServiceKey, edgex.Version).BootstrapHandler,
})

// code here!
Expand Down
Loading