Add staticcheck fixes (#3221)
* Add staticcheck fixes Signed-off-by: Sanket Sudake <sanketsudake@gmail.com> * update golangci-lint version Signed-off-by: Sanket Sudake <sanketsudake@gmail.com> --------- Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
@@ -39,7 +39,7 @@ func GetRouterWithAuth() *mux.Router {
|
||||
w.WriteHeader(http.StatusOK)
|
||||
_, err := io.WriteString(w, "OK")
|
||||
if err != nil {
|
||||
fmt.Println(fmt.Errorf("Error in writing string: %s", err))
|
||||
fmt.Println(fmt.Errorf("error in writing string: %s", err))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -383,7 +383,7 @@ func (roundTripper *RetryingRoundTripper) RoundTrip(req *http.Request) (*http.Re
|
||||
executingTimeout = executingTimeout * time.Duration(roundTripper.funcHandler.tsRoundTripperParams.timeoutExponent)
|
||||
}
|
||||
|
||||
e := errors.New("Unable to get service url for connection")
|
||||
e := errors.New("unable to get service url for connection")
|
||||
logger.Error(e.Error())
|
||||
return nil, e
|
||||
}
|
||||
@@ -510,11 +510,7 @@ func findCeil(randomNumber int, wtDistrList []functionWeightDistribution) string
|
||||
low := 0
|
||||
high := len(wtDistrList) - 1
|
||||
|
||||
for {
|
||||
if low >= high {
|
||||
break
|
||||
}
|
||||
|
||||
for low < high {
|
||||
mid := low + high/2
|
||||
if randomNumber >= wtDistrList[mid].sumPrefix {
|
||||
low = mid + 1
|
||||
|
||||
@@ -83,7 +83,7 @@ func makeFunctionReferenceResolver(logger *zap.Logger, funcInformer map[string]k
|
||||
func (frr *functionReferenceResolver) resolve(trigger fv1.HTTPTrigger) (*resolveResult, error) {
|
||||
nfr := namespacedTriggerReference{
|
||||
namespace: trigger.ObjectMeta.Namespace,
|
||||
triggerName: trigger.ObjectMeta.Name,
|
||||
triggerName: trigger.Name,
|
||||
triggerResourceVersion: trigger.ObjectMeta.ResourceVersion,
|
||||
}
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ func deleteIngress(ctx context.Context, logger *zap.Logger, trigger *fv1.HTTPTri
|
||||
return
|
||||
}
|
||||
|
||||
ingress, err := kubeClient.NetworkingV1().Ingresses(podNamespace).Get(ctx, trigger.ObjectMeta.Name, v1.GetOptions{})
|
||||
ingress, err := kubeClient.NetworkingV1().Ingresses(podNamespace).Get(ctx, trigger.Name, v1.GetOptions{})
|
||||
if err != nil && !k8serrors.IsNotFound(err) {
|
||||
logger.Error("failed to get ingress when deleting trigger", zap.Error(err), zap.String("trigger", trigger.ObjectMeta.Name))
|
||||
return
|
||||
|
||||
@@ -55,11 +55,11 @@ func GetIngressSpec(namespace string, trigger *fv1.HTTPTrigger) *v1.Ingress {
|
||||
}
|
||||
}
|
||||
|
||||
var pathType v1.PathType = v1.PathTypeImplementationSpecific
|
||||
var pathType = v1.PathTypeImplementationSpecific
|
||||
ing := &v1.Ingress{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Labels: GetDeployLabels(trigger),
|
||||
Name: trigger.ObjectMeta.Name,
|
||||
Name: trigger.Name,
|
||||
// The Ingress NS MUST be same as Router NS, check long discussion:
|
||||
// https://github.com/kubernetes/kubernetes/issues/17088
|
||||
// We need to revisit this in future, once Kubernetes supports cross namespace ingress
|
||||
@@ -99,7 +99,7 @@ func GetIngressSpec(namespace string, trigger *fv1.HTTPTrigger) *v1.Ingress {
|
||||
func GetDeployLabels(trigger *fv1.HTTPTrigger) map[string]string {
|
||||
// TODO: support function weight
|
||||
return map[string]string{
|
||||
"triggerName": trigger.ObjectMeta.Name,
|
||||
"triggerName": trigger.Name,
|
||||
"functionName": trigger.Spec.FunctionReference.Name,
|
||||
"triggerNamespace": trigger.ObjectMeta.Namespace,
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ func TestGetIngressSpec(t *testing.T) {
|
||||
ingressNS string
|
||||
trigger *fv1.HTTPTrigger
|
||||
}
|
||||
var pathType v1.PathType = v1.PathTypeImplementationSpecific
|
||||
var pathType = v1.PathTypeImplementationSpecific
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
|
||||
Reference in New Issue
Block a user