-
Notifications
You must be signed in to change notification settings - Fork 58
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[config]Support config license header comment style. #97
Merged
Merged
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
805c48b
config: support config license header comment style.
dongzl d7b293d
config: add unit test for support config license header comment style.
dongzl 1374ea2
config: add config parse unit test.
dongzl ac4c5c6
config: add config example for language comment style.
dongzl 44c1b5f
Fixes code style check problem.
dongzl b143265
Fixes code style check problem.
dongzl 7c98f16
Fixes code style check problem.
dongzl 8d99904
config: support config license header comment style, fix code logic.
dongzl 3ca930f
Fixes test config file directory.
dongzl e916383
Fixes checkstyle problem.
dongzl badd0f6
Remove unused test file.
dongzl 672c344
Fixes project config.
dongzl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,128 @@ | ||
# 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. | ||
|
||
header: # `header` section is configurations for source codes license header. | ||
license: | ||
spdx-id: Apache-2.0 # the spdx id of the license, it's convenient when your license is standard SPDX license. | ||
copyright-owner: Apache Software Foundation # the copyright owner to replace the [owner] in the `spdx-id` template. | ||
content: | # `license` will be used as the content when `fix` command needs to insert a license header. | ||
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. | ||
|
||
# `pattern` is optional regexp if all the file headers are the same as `license` or the license of `spdx-id` and `copyright-owner`. | ||
pattern: | | ||
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. | ||
|
||
paths: # `paths` are the path list that will be checked (and fixed) by license-eye, default is ['**']. | ||
- '**' | ||
|
||
paths-ignore: # `paths-ignore` are the path list that will be ignored by license-eye. | ||
- 'dist' | ||
- 'licenses' | ||
- '**/*.md' | ||
- '**/testdata/**' | ||
- '**/go.mod' | ||
- '**/go.sum' | ||
- 'LICENSE' | ||
- 'NOTICE' | ||
- '**/assets/header-templates/**' | ||
- '**/assets/lcs-templates/**' | ||
- '**/assets/languages.yaml' | ||
- '**/assets/assets.gen.go' | ||
- 'docs/**.svg' | ||
|
||
comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`. | ||
|
||
# license-location-threshold specifies the index threshold where the license header can be located, | ||
# after all, a "header" cannot be TOO far from the file start. | ||
license-location-threshold: 80 | ||
|
||
dependency: | ||
files: | ||
- go.mod | ||
|
||
language: | ||
Go: | ||
type: programming | ||
color: "#00ADD8" | ||
aliases: | ||
- golang | ||
extensions: | ||
- ".go" | ||
tm_scope: source.go | ||
ace_mode: golang | ||
codemirror_mode: go | ||
codemirror_mime_type: text/x-go | ||
language_id: 132 | ||
comment_style_id: SlashAsterisk | ||
YAML: | ||
type: data | ||
color: "#cb171e" | ||
tm_scope: source.yaml | ||
aliases: | ||
- yml | ||
extensions: | ||
- ".yml" | ||
- ".mir" | ||
- ".reek" | ||
- ".rviz" | ||
- ".sublime-syntax" | ||
- ".syntax" | ||
- ".yaml" | ||
- ".yaml-tmlanguage" | ||
- ".yaml.sed" | ||
- ".yml.mysql" | ||
filenames: | ||
- ".clang-format" | ||
- ".clang-tidy" | ||
- ".gemrc" | ||
- glide.lock | ||
- yarn.lock | ||
ace_mode: yaml | ||
codemirror_mode: yaml | ||
codemirror_mime_type: text/x-yaml | ||
language_id: 407 | ||
comment_style_id: Hashtag |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,15 +22,17 @@ import ( | |
|
||
"github.com/apache/skywalking-eyes/assets" | ||
"github.com/apache/skywalking-eyes/internal/logger" | ||
"github.com/apache/skywalking-eyes/pkg/comments" | ||
"github.com/apache/skywalking-eyes/pkg/deps" | ||
"github.com/apache/skywalking-eyes/pkg/header" | ||
|
||
"gopkg.in/yaml.v3" | ||
) | ||
|
||
type Config struct { | ||
Header header.ConfigHeader `yaml:"header"` | ||
Deps deps.ConfigDeps `yaml:"dependency"` | ||
Header header.ConfigHeader `yaml:"header"` | ||
Deps deps.ConfigDeps `yaml:"dependency"` | ||
Languages map[string]comments.Language `yaml:"language"` | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This config should be under |
||
} | ||
|
||
// Parse reads and parses the header check configurations in config file. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
// 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. | ||
|
||
package config | ||
|
||
import "testing" | ||
|
||
func TestParseConfig(t *testing.T) { | ||
config := &Config{ | ||
|
||
} | ||
configFile := ".licenserc_test.yaml" | ||
config.Parse(configFile) | ||
if len(config.Header.GetLicenseContent()) == 0 { | ||
t.Fail() | ||
} | ||
t.Logf("Parse config dependency files size = %v", len(config.Deps.Files)) | ||
if len(config.Deps.Files) == 0 { | ||
t.Fail() | ||
} | ||
t.Logf("Parse config languages size = %v", len(config.Languages)) | ||
if len(config.Languages) == 0 { | ||
t.Fail() | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please minimize the configs, we only need some of the fields, like
comment_style_id
andextensions
,There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @kezhenxu94 , Thanks for reply, I will fix it.