1833359013

Committed 23 May 2025 01:25PM UTC coverage: 66.318% (+0.5%) from 65.861%

Build # 1833359013

Build Type

Pull #674

gitlab-ci

Committed by

mzedel

Commit Message

fix(gui): prevented device tag editor to be shown when no tags exist

- this is to reduce confusion about tags defined async to the current session not being visible

Ticket: ME-528
Signed-off-by: Manuel Zedel <manuel.zedel@northern.tech>

Pull Request Pull Request #674: ME-529, ME-528 - adjustments to device tag editing

Run Details

29554 of 44564 relevant lines covered (66.32%)

1.45 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

88.89

/backend/pkg/routing/routing.go

// Copyright 2024 Northern.tech AS
//
//        Licensed under the Apache License, Version 2.0 (the "License");
//        you may not use this file except in compliance with the License.
//        You may obtain a copy of the License at
//
//            http://www.apache.org/licenses/LICENSE-2.0
//
//        Unless required by applicable law or agreed to in writing, software
//        distributed under the License is distributed on an "AS IS" BASIS,
//        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//        See the License for the specific language governing permissions and
//        limitations under the License.
package routing

import (
        "net/http"

        "github.com/ant0ine/go-json-rest/rest"

        "github.com/mendersoftware/mender-server/pkg/strings"
)

type HttpOptionsGenerator func(methods []string) rest.HandlerFunc

func AllowHeaderOptionsGenerator(methods []string) rest.HandlerFunc {
        // return a dummy handler for now
        return func(w rest.ResponseWriter, r *rest.Request) {
                for _, m := range methods {
                        w.Header().Add("Allow", m)
                }
        }
}

func supportsMethod(method string, methods []string) bool {
        return strings.ContainsString(method, methods)
}

// Automatically add OPTIONS method support for each defined route,
// only if there's no OPTIONS handler for that route yet
func AutogenOptionsRoutes(routes []*rest.Route, gen HttpOptionsGenerator) []*rest.Route {

        methodGroups := make(map[string][]string, len(routes))

        for _, route := range routes {
                methods, ok := methodGroups[route.PathExp]
                if !ok {
                        methods = make([]string, 0)
                }

                methodGroups[route.PathExp] = append(methods, route.HttpMethod)
        }

        options := make([]*rest.Route, 0, len(methodGroups))
        for route, methods := range methodGroups {
                // skip if there's a handler for OPTIONS already
                if !supportsMethod(http.MethodOptions, methods) {
                        options = append(options,
                                rest.Options(route, gen(methods)))
                }
        }

        return append(routes, options...)
}

1	// Copyright 2024 Northern.tech AS
2	//
3	// Licensed under the Apache License, Version 2.0 (the "License");
4	// you may not use this file except in compliance with the License.
5	// You may obtain a copy of the License at
6	//
7	// http://www.apache.org/licenses/LICENSE-2.0
8	//
9	// Unless required by applicable law or agreed to in writing, software
10	// distributed under the License is distributed on an "AS IS" BASIS,
11	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12	// See the License for the specific language governing permissions and
13	// limitations under the License.
14	package routing
15
16	import (
17	"net/http"
18
19	"github.com/ant0ine/go-json-rest/rest"
20
21	"github.com/mendersoftware/mender-server/pkg/strings"
22	)
23
24	type HttpOptionsGenerator func(methods []string) rest.HandlerFunc
25
26	func AllowHeaderOptionsGenerator(methods []string) rest.HandlerFunc {	2✔
27	// return a dummy handler for now	2✔
28	return func(w rest.ResponseWriter, r *rest.Request) {	2✔
29	for _, m := range methods {	×
30	w.Header().Add("Allow", m)	×
31	}	×
32	}
33	}
34
35	func supportsMethod(method string, methods []string) bool {	2✔
36	return strings.ContainsString(method, methods)	2✔
37	}	2✔
38
39	// Automatically add OPTIONS method support for each defined route,
40	// only if there's no OPTIONS handler for that route yet
41	func AutogenOptionsRoutes(routes []rest.Route, gen HttpOptionsGenerator) []rest.Route {	2✔
42		2✔
43	methodGroups := make(map[string][]string, len(routes))	2✔
44		2✔
45	for _, route := range routes {	4✔
46	methods, ok := methodGroups[route.PathExp]	2✔
47	if !ok {	4✔
48	methods = make([]string, 0)	2✔
49	}	2✔
50
51	methodGroups[route.PathExp] = append(methods, route.HttpMethod)	2✔
52	}
53
54	options := make([]*rest.Route, 0, len(methodGroups))	2✔
55	for route, methods := range methodGroups {	4✔
56	// skip if there's a handler for OPTIONS already	2✔
57	if !supportsMethod(http.MethodOptions, methods) {	4✔
58	options = append(options,	2✔
59	rest.Options(route, gen(methods)))	2✔
60	}	2✔
61	}
62
63	return append(routes, options...)	2✔
64	}

mendersoftware / mender-server / 1833359013

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous