Skip to content

Commit a3a80b4

Browse files
committed
v0.2.1
- Update name - Fix project owner issue
1 parent de01bcb commit a3a80b4

File tree

7 files changed

+30
-9
lines changed

7 files changed

+30
-9
lines changed

action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: 'codeql-summary-generator'
2-
description: 'CodeQL Summary Generator'
1+
name: 'codeql-summarize'
2+
description: 'CodeQL Summarize Action'
33

44
inputs:
55
project:
@@ -33,7 +33,7 @@ runs:
3333

3434
- shell: bash
3535
run: |
36-
"${{ github.action_path }}/gh-codeql-summarize" \
36+
"${{ github.action_path }}/codeql-summarize" \
3737
--input "${{ inputs.projects }}" \
3838
--format "${{ inputs.format }}" \
3939
--project-repo "${{ inputs.project }}" \
File renamed without changes.

codeqlsummarize/__main__.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
logger = logging.getLogger("main")
1818

1919

20-
parser = ArgumentParser("codeql-summarize", "CodeQL Summary Generator")
20+
parser = ArgumentParser("codeql-summarize", "CodeQL Summarize")
2121
parser.add_argument(
2222
"--debug", action="store_true", default=bool(os.environ.get("DEBUG"))
2323
)
@@ -96,6 +96,10 @@ def main(arguments):
9696
github.owner = owner
9797
github.repo = repo
9898

99+
if not arguments.project_repo:
100+
logger.debug("Setting project_repo to github_repository")
101+
arguments.project_repo = arguments.github_repository
102+
99103
if arguments.output:
100104
output = os.path.splitext(arguments.output)
101105
if output[1] != "":
@@ -146,7 +150,6 @@ def main(arguments):
146150
for lang, repos in projects.items():
147151
for repo in repos:
148152
_, name = repo.split("/")
149-
150153
db = CodeQLDatabase(name=name, language=lang, repository=repo)
151154

152155
if github.available and db.repository:

codeqlsummarize/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
__title__ = "CodeQL Summarize"
33
__name__ = "codeqlsummarize"
4-
__version__ = "0.2.0"
4+
__version__ = "0.2.1"
55

66
__description__ = "GitHub CodeQL Summaries Toolkit"
77
__summary__ = """\

codeqlsummarize/exporters/extensions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ def exportDataExtensions(database: CodeQLDatabase, output: str, github: GitHub,
3232
codeqlPack = findCodeQLPack(output, database.language)
3333
os.makedirs(os.path.join(codeqlPack, "generated"), exist_ok=True)
3434

35-
if github.owner:
36-
os.makedirs(os.path.join(codeqlPack, "generated", github.owner), exist_ok=True)
37-
extensions_file = os.path.join(codeqlPack, "generated", github.owner, f"{database.name}.yml")
35+
if database.owner:
36+
os.makedirs(os.path.join(codeqlPack, "generated", database.owner), exist_ok=True)
37+
extensions_file = os.path.join(codeqlPack, "generated", database.owner, f"{database.name}.yml")
3838
else:
3939
extensions_file = os.path.join(codeqlPack, "generated", f"{database.name}.yml")
4040

codeqlsummarize/models.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,13 @@ def display_name(self, owner: Optional[str] = None) -> str:
6969
new_name = self.name.replace("-", " ")
7070
return new_name.title().replace(" ", "")
7171

72+
@property
73+
def owner(self) -> Optional[str]:
74+
if self.repository:
75+
o, n = self.repository.split("/", 1)
76+
return o
77+
return
78+
7279
@property
7380
def target(self):
7481
return f"{self.name}.qll"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
library: true
3+
name: advanced-security/codeql-summarize-java
4+
version: 0.1.0
5+
extensionTargets:
6+
codeql/java-all: ^0.5.0
7+
codeql/java-queries: ^0.5.0
8+
dataExtensions:
9+
# generated models
10+
- 'generated/*.yml'
11+
- 'generated/**/*.yml'

0 commit comments

Comments
 (0)