You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by to...@apache.org on 2021/05/12 01:36:38 UTC
[apisix-ingress-controller] branch master updated: ci: introduce
skywalking-eyes (#430)
This is an automated email from the ASF dual-hosted git repository.
tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
The following commit(s) were added to refs/heads/master by this push:
new d269a01 ci: introduce skywalking-eyes (#430)
d269a01 is described below
commit d269a01fe69c287cf13a3574d8ce6566c18a306c
Author: Daming <zt...@foxmail.com>
AuthorDate: Wed May 12 09:36:32 2021 +0800
ci: introduce skywalking-eyes (#430)
---
.actions/ASF-Release.cfg | 90 ----------------------
.actions/ASFLicenseHeaderGo.txt | 14 ----
.github/semantic.yml | 18 +++++
.github/workflows/codeql-analysis.yml | 18 +++++
.github/workflows/e2e-test-ci.yml | 18 +++++
.github/workflows/golangci-lint.yml | 18 +++++
.github/workflows/license-checker.yml | 26 ++++++-
.github/workflows/lint-checker.yml | 18 +++++
.github/workflows/spell-checker.yml | 18 +++++
.github/workflows/unit-test-ci.yml | 18 +++++
.gitignore | 18 +++++
...ASFLicenseHeaderMarkdown.txt => .licenserc.yaml | 27 ++++++-
Makefile | 9 ---
conf/kubeconfig | 19 -----
14 files changed, 191 insertions(+), 138 deletions(-)
diff --git a/.actions/ASF-Release.cfg b/.actions/ASF-Release.cfg
deleted file mode 100644
index 54d4778..0000000
--- a/.actions/ASF-Release.cfg
+++ /dev/null
@@ -1,90 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements; and to You under the Apache License, Version 2.0.
-
-# scanCode.py configuration file
-
-# List of filenames containing the text of valid license (headers)
-# These files SHOULD be in the same directory path where scanCode.py
-# resides.
-[Licenses]
-ASFLicenseHeader.txt
-ASFLicenseHeaderGo.txt
-ASFLicenseHeaderBash.txt
-ASFLicenseHeaderMarkdown.txt
-
-# Filters (path/filename) with wildcards and associated scan checks
-# that are to be run against them. The checks are actual valid
-# function names found in scanCode.py.
-[Includes]
-*=is_not_symlink, regex_check
-*.conf=has_block_license, eol_at_eof, regex_check
-*.go=has_block_license, eol_at_eof, regex_check
-*.gradle=has_block_license, eol_at_eof, regex_check
-*.groovy=has_block_license, eol_at_eof, regex_check
-*.html=has_block_license, regex_check
-*.java=no_tabs, has_block_license, eol_at_eof, regex_check
-*.js=has_block_license, regex_check
-*.md=no_tabs, has_block_license, eol_at_eof, regex_check
-*.properties=no_tabs, has_block_license, eol_at_eof, regex_check
-*.py=no_tabs, has_block_license, eol_at_eof, regex_check
-*.scala=has_block_license, no_tabs, eol_at_eof, regex_check
-*.sh=has_block_license, eol_at_eof, regex_check
-*.swift=no_tabs, has_block_license, eol_at_eof, regex_check
-*.yaml=has_block_license, eol_at_eof, regex_check
-*.yml=has_block_license, eol_at_eof, regex_check
-*.css=has_block_license, eol_at_eof, regex_check
-*.tsx=has_block_license, eol_at_eof, regex_check
-*.ts=has_block_license, eol_at_eof, regex_check
-*.less=has_block_license, eol_at_eof, regex_check
-*.toml=has_block_license, eol_at_eof, regex_check
-*Dockerfile*=has_block_license
-
-# Sanity check files not required to have ASF headers because either they
-# are excluded or are not packaged with the Apache source release.
-*.cfg=regex_check
-*.ini=regex_check
-*.j2=regex_check
-*.json=regex_check
-*.txt=regex_check
-*.xml=regex_check
-
-# List of paths (inclusive of subdirectories) to exclude from code scanning
-[Excludes]
-pkg/kube/apisix/client
-
-# General tooling & binary file exclusions
-.bin
-.dockerignore
-.eslintrc.*
-.git
-.gitattributes
-.github
-.gitignore
-.gradle
-.idea
-.jshintrc
-.pydevproject
-.rat-excludes
-.tox
-# zz_generated.deepcopy.go is generated by tool, which has different license
-# header format.
-zz_generated.deepcopy.go
-
-# Exclude Apache standard legal files
-CREDITS.txt
-DISCLAIMER.txt
-LICENSE*.txt
-NOTICE.txt
-
-conf
-.actions/openwhisk-utilities
-
-[Options]
-# Not all code files allow licenses to appear starting at the first character
-# of the file. This option tells the scan to allow licenses to appear starting
-# within the first 'x' characters of each code file (as provided by this option's
-# value).
-LICENSE_SLACK_LENGTH=500
-
-# List of regular expressions for forbidden strings, e.g. \w+@company.com
-[Regex]
diff --git a/.actions/ASFLicenseHeaderGo.txt b/.actions/ASFLicenseHeaderGo.txt
deleted file mode 100644
index 63f7276..0000000
--- a/.actions/ASFLicenseHeaderGo.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You 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.
diff --git a/.github/semantic.yml b/.github/semantic.yml
index 5fe591e..8af0235 100644
--- a/.github/semantic.yml
+++ b/.github/semantic.yml
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
titleOnly: true
allowRevertCommits: true
types:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e0026a0..268758f 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
name: "CodeQL"
on:
diff --git a/.github/workflows/e2e-test-ci.yml b/.github/workflows/e2e-test-ci.yml
index 6faafea..88deadb 100644
--- a/.github/workflows/e2e-test-ci.yml
+++ b/.github/workflows/e2e-test-ci.yml
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
name: e2e-test-ci
on:
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index bd94d62..2cca79e 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
name: golangci-lint
on:
diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml
index 09b2cba..586c7a9 100644
--- a/.github/workflows/license-checker.yml
+++ b/.github/workflows/license-checker.yml
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
name: License checker
on:
@@ -14,7 +32,7 @@ jobs:
steps:
- uses: actions/checkout@v2
-
- - name: run license check
- run: |
- make license-check
+ - name: Check License Header
+ uses: apache/skywalking-eyes@v0.1.0
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/lint-checker.yml b/.github/workflows/lint-checker.yml
index c1f59d8..6561270 100644
--- a/.github/workflows/lint-checker.yml
+++ b/.github/workflows/lint-checker.yml
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
name: lint-checker-ci
on:
diff --git a/.github/workflows/spell-checker.yml b/.github/workflows/spell-checker.yml
index 1e6fc33..a0e3aa6 100644
--- a/.github/workflows/spell-checker.yml
+++ b/.github/workflows/spell-checker.yml
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
name: spell-checker
on:
push:
diff --git a/.github/workflows/unit-test-ci.yml b/.github/workflows/unit-test-ci.yml
index 62d03f5..e4f145b 100644
--- a/.github/workflows/unit-test-ci.yml
+++ b/.github/workflows/unit-test-ci.yml
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
name: unit-test-ci
on:
diff --git a/.gitignore b/.gitignore
index 61ba3f1..57db6d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
# Binaries for programs and plugins
*.exe
*.exe~
diff --git a/.actions/ASFLicenseHeaderMarkdown.txt b/.licenserc.yaml
similarity index 58%
rename from .actions/ASFLicenseHeaderMarkdown.txt
rename to .licenserc.yaml
index c474814..2d9b9af 100644
--- a/.actions/ASFLicenseHeaderMarkdown.txt
+++ b/.licenserc.yaml
@@ -1,4 +1,3 @@
-<!--
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -15,4 +14,28 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
--->
+header:
+ license:
+ spdx-id: Apache-2.0
+ copyright-owner: Apache Software Foundation
+
+ paths-ignore:
+ - 'dist'
+ - 'licenses'
+ - '**/*.md'
+ - '**/testdata/**'
+ - '**/go.mod'
+ - '**/go.sum'
+ - 'LICENSE'
+ - 'NOTICE'
+ - '**/assets/header-templates/**'
+ - '**/assets/lcs-templates/**'
+ - '**/assets/languages.yaml'
+ - '**/assets/assets.gen.go'
+ - '**/*.json'
+ - '.github/ISSUE_TEMPLATE'
+ - '.github/PULL_REQUEST_TEMPLATE'
+ - 'pkg/kube/apisix/client/**'
+ - '**/zz_generated.deepcopy.go'
+
+ comment: on-failure
diff --git a/Makefile b/Makefile
index 2a6c7e7..92ef8b6 100644
--- a/Makefile
+++ b/Makefile
@@ -112,15 +112,6 @@ kind-up:
kind-reset:
kind delete cluster --name apisix
-### license-check: Do Apache License Header check
-.PHONY: license-check
-license-check:
-ifeq ("$(wildcard .actions/openwhisk-utilities/scancode/scanCode.py)", "")
- git clone https://github.com/apache/openwhisk-utilities.git .actions/openwhisk-utilities
- cp .actions/ASF* .actions/openwhisk-utilities/scancode/
-endif
- .actions/openwhisk-utilities/scancode/scanCode.py --config .actions/ASF-Release.cfg ./
-
### help: Show Makefile rules
.PHONY: help
help:
diff --git a/conf/kubeconfig b/conf/kubeconfig
deleted file mode 100644
index 8927a39..0000000
--- a/conf/kubeconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-clusters:
-- cluster:
- certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1UQXlPREV3TlRNek5sb1hEVEk1TVRBeU5URXdOVE16Tmxvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTjNUCkVidWVaVDE5bEd4WXljMXRKcmZDdHRTRHQ0bzBoSUsrVHBaSzVWTGRBaVVkQ3hvQnhPMXhKYjBRM1NJcFRqd24Kd1VvdjhtUWhIQTJPc056MyttMkFWZnkveTlvbUlxeTVnT0hmeXM5eDQxOExKNGlhdy9vZXlMVFND [...]
- server: https://172.16.20.90:6443
- name: kubernetes
-contexts:
-- context:
- cluster: kubernetes
- user: kubernetes-admin
- name: kubernetes-admin@kubernetes
-current-context: kubernetes-admin@kubernetes
-kind: Config
-preferences: {}
-users:
-- name: kubernetes-admin
- user:
- client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJT0FNV2lqRlpwNEV3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RFd01qZ3hNRFV6TXpaYUZ3MHlNREV3TWpjeE1EVXpNemxhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQTEvRGUrWVFGS2pKZUJQQTIKQzJVWFA0MWo0YW9DeXBVVFhWK004aXZacWZFQWw5c085alQyR3puaWVaRWQ1UFlRN2FrYzhSSlp4Sk5 [...]
- client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBMS9EZStZUUZLakplQlBBMkMyVVhQNDFqNGFvQ3lwVVRYVitNOGl2WnFmRUFsOXNPCjlqVDJHem5pZVpFZDVQWVE3YWtjOFJKWnhKTk9FZ0orM3hVRlhGVnJ2akVYdnBEWFRxQVpNTVNUWlZvNkcvWkkKczF2UVR6U3NLMGVuam1PS0hOSDA2VW04K0NSUHl6YjNObllSTDFnTjRLRU4xblJVYXBKZ1dsbXpMRHZMcExRRQowUWwvajZ1MmxuYngvM3MxWFQwaDVmMkt0ckNleExXeXNMaXVjcVRqMGN5M3B3cDNZcmVlQkxVNzUwUE9ZZE42CmxWcENCbVZnRTM0V213d3lzTjVZV2VqZGZsdGEwZTVneHEreC8zMDViUFBDM2RWclhxVmpMUWpZQXJUbnZ [...]