fix: consistent func naming

go-vela · Feb 25, 2025 · bf4c656 · bf4c656
1 parent d74cc09
commit bf4c656
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/cmd/vela-server/metadata.go b/cmd/vela-server/metadata.go
@@ -110,7 +110,7 @@ func metadataVela(c *cli.Context) (*internal.Vela, error) {
 	}
 
 	if len(c.StringSlice("cors-allow-origins")) > 0 {
-		vela.CORSAllowOrigins = c.StringSlice("cors-allow-origins")
+		vela.CorsAllowOrigins = c.StringSlice("cors-allow-origins")
 	}
 
 	if len(c.String("webui-oauth-callback")) > 0 {

diff --git a/internal/metadata.go b/internal/metadata.go
@@ -32,7 +32,7 @@ type (
 		AccessTokenDuration  time.Duration `json:"access_token_duration"`
 		RefreshTokenDuration time.Duration `json:"refresh_token_duration"`
 		OpenIDIssuer         string        `json:"oidc_issuer"`
-		CORSAllowOrigins     []string      `json:"cors_allow_origins"`
+		CorsAllowOrigins     []string      `json:"cors_allow_origins"`
 	}
 
 	// Metadata is the extra set of data passed to the compiler for

diff --git a/router/middleware/header.go b/router/middleware/header.go
@@ -32,7 +32,7 @@ func Options(c *gin.Context) {
 	} else {
 		c.Header("Access-Control-Allow-Origin", "*")
 
-		origin := CORSAllowOrigin(c, m)
+		origin := CorsAllowOrigin(c, m)
 		if len(origin) > 0 {
 			c.Header("Access-Control-Allow-Origin", origin)
 			c.Header("Access-Control-Allow-Credentials", "true")
@@ -66,7 +66,7 @@ func Cors(c *gin.Context) {
 
 	c.Header("Access-Control-Allow-Origin", "*")
 
-	origin := CORSAllowOrigin(c, m)
+	origin := CorsAllowOrigin(c, m)
 	if len(origin) > 0 {
 		c.Header("Access-Control-Allow-Origin", origin)
 		c.Header("Access-Control-Allow-Credentials", "true")
@@ -75,13 +75,13 @@ func Cors(c *gin.Context) {
 	c.Header("Access-Control-Expose-Headers", "link, x-total-count")
 }
 
-// CORSAllowOrigin is a helper function that returns the
+// CorsAllowOrigin is a helper function that returns the
 // allowed origin for CORS requests by checking the
 // request origin against the allowed origins in the
 // Vela metadata.
-func CORSAllowOrigin(c *gin.Context, m *internal.Metadata) string {
+func CorsAllowOrigin(c *gin.Context, m *internal.Metadata) string {
 	origin := c.Request.Header.Get("Origin")
-	for _, domain := range m.Vela.CORSAllowOrigins {
+	for _, domain := range m.Vela.CorsAllowOrigins {
 		if domain == origin {
 			return domain
 		}

diff --git a/router/middleware/header_test.go b/router/middleware/header_test.go
@@ -189,7 +189,7 @@ func TestMiddleware_Cors(t *testing.T) {
 			m: &internal.Metadata{
 				Vela: &internal.Vela{
 					Address:          "http://localhost:8080",
-					CORSAllowOrigins: []string{},
+					CorsAllowOrigins: []string{},
 				},
 			},
 			origin:                "http://localhost:8888",
@@ -202,7 +202,7 @@ func TestMiddleware_Cors(t *testing.T) {
 			m: &internal.Metadata{
 				Vela: &internal.Vela{
 					WebAddress:       "http://localhost:8888",
-					CORSAllowOrigins: []string{},
+					CorsAllowOrigins: []string{},
 				},
 			},
 			origin:                "http://localhost:8888",
@@ -215,7 +215,7 @@ func TestMiddleware_Cors(t *testing.T) {
 			m: &internal.Metadata{
 				Vela: &internal.Vela{
 					WebAddress:       "http://localhost:8888",
-					CORSAllowOrigins: []string{"http://localhost:3000", "http://localhost:3001"},
+					CorsAllowOrigins: []string{"http://localhost:3000", "http://localhost:3001"},
 				},
 			},
 			origin:                "http://localhost:8888",
@@ -228,7 +228,7 @@ func TestMiddleware_Cors(t *testing.T) {
 			m: &internal.Metadata{
 				Vela: &internal.Vela{
 					WebAddress:       "",
-					CORSAllowOrigins: []string{"http://localhost:3000", "http://localhost:3001", "http://localhost:8888"},
+					CorsAllowOrigins: []string{"http://localhost:3000", "http://localhost:3001", "http://localhost:8888"},
 				},
 			},
 			origin:                "http://localhost:8888",