Fix static checks

projectcalico · May 20, 2024 · e7f8874 · e7f8874
1 parent 7dfe3eb
commit e7f8874
Show file tree

Hide file tree

Showing 18 changed files with 135 additions and 36 deletions.
diff --git a/felix/generictables/actions.go b/felix/generictables/actions.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2016-2024 Tigera, Inc. All rights reserved.
+//
+// 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 generictables
 
 import "github.com/projectcalico/calico/felix/environment"

diff --git a/felix/generictables/ipt_renderer.go b/felix/generictables/ipt_renderer.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2016-2024 Tigera, Inc. All rights reserved.
+//
+// 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 generictables
 
 import (

diff --git a/felix/generictables/match_builder.go b/felix/generictables/match_builder.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2016-2024 Tigera, Inc. All rights reserved.
+//
+// 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 generictables
 
 import (

diff --git a/felix/generictables/nft_renderer.go b/felix/generictables/nft_renderer.go
@@ -1,11 +1,26 @@
+// Copyright (c) 2016-2024 Tigera, Inc. All rights reserved.
+//
+// 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 generictables
 
 import (
 	"fmt"
 	"strings"
 
-	"github.com/projectcalico/calico/felix/environment"
 	"sigs.k8s.io/knftables"
+
+	"github.com/projectcalico/calico/felix/environment"
 )
 
 func NewNFTRenderer(hashCommentPrefix string) NFTRenderer {

diff --git a/felix/generictables/table.go b/felix/generictables/table.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2016-2024 Tigera, Inc. All rights reserved.
+//
+// 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 generictables
 
 import (

diff --git a/felix/iptables/match_builder.go b/felix/iptables/match_builder.go
@@ -17,7 +17,6 @@ package iptables
 import (
 	"fmt"
 	"math/bits"
-	"regexp"
 	"strings"
 
 	log "github.com/sirupsen/logrus"
@@ -26,34 +25,8 @@ import (
 	"github.com/projectcalico/calico/felix/proto"
 )
 
-// TODO: this is duplicated in generictables. Commonize the comment stuff.
-var shellUnsafe = regexp.MustCompile(`[^\w @%+=:,./-]`)
-
 var Wildcard string = "+"
 
-// escapeComment replaces anything other than "safe" shell characters with an
-// underscore (_).  This is a lossy conversion, but the expected use case
-// for this stuff getting all the way to iptables are either
-//   - hashes/IDs generated by higher layer systems
-//   - comments on what the rules do
-//
-// which should be fine with this limitation.
-// There just isn't a good way to escape this stuff in a way that iptables-restore
-// will respect.  strconv.Quote() leaves actual quote characters in the output,
-// which break iptables-restore.
-func escapeComment(s string) string {
-	return shellUnsafe.ReplaceAllString(s, "_")
-}
-
-const maxCommentLen = 256
-
-func truncateComment(s string) string {
-	if len(s) > maxCommentLen {
-		return s[0:maxCommentLen]
-	}
-	return s
-}
-
 var _ generictables.MatchCriteria = matchCriteria{}
 
 type matchCriteria []string

diff --git a/felix/nftables/actions_test.go b/felix/nftables/actions_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2022 Tigera, Inc. All rights reserved.
+// Copyright (c) 2024 Tigera, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/felix/nftables/fake_test.go b/felix/nftables/fake_test.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2024 Tigera, Inc. All rights reserved.
+//
+// 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 nftables_test
 
 import (

diff --git a/felix/nftables/ipsets.go b/felix/nftables/ipsets.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2024 Tigera, Inc. All rights reserved.
+//
+// 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 nftables
 
 import (

diff --git a/felix/nftables/match_builder.go b/felix/nftables/match_builder.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Tigera, Inc. All rights reserved.
+// Copyright (c) 2016-2024 Tigera, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/felix/nftables/match_builder_test.go b/felix/nftables/match_builder_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2018 Tigera, Inc. All rights reserved.
+// Copyright (c) 2024 Tigera, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/felix/nftables/matchers_test.go b/felix/nftables/matchers_test.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2024 Tigera, Inc. All rights reserved.
+//
+// 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 nftables
 
 import (

diff --git a/felix/nftables/nftables_ut_suite_test.go b/felix/nftables/nftables_ut_suite_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2017 Tigera, Inc. All rights reserved.
+// Copyright (c) 2016-2014 Tigera, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/felix/nftables/rule_renderer.go b/felix/nftables/rule_renderer.go
diff --git a/felix/nftables/rules_test.go b/felix/nftables/rules_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2022 Tigera, Inc. All rights reserved.
+// Copyright (c) 2016-2024 Tigera, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/felix/nftables/table.go b/felix/nftables/table.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2022 Tigera, Inc. All rights reserved.
+// Copyright (c) 2016-2024 Tigera, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/felix/nftables/table_layer.go b/felix/nftables/table_layer.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2024 Tigera, Inc. All rights reserved.
+//
+// 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 nftables
 
 import (

diff --git a/felix/nftables/table_test.go b/felix/nftables/table_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022 Tigera, Inc. All rights reserved.
+// Copyright (c) 2017-2024 Tigera, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.