Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Community merge conflicts #113

Merged
merged 100 commits into from
Apr 4, 2023
Merged

Community merge conflicts #113

merged 100 commits into from
Apr 4, 2023

Conversation

jdkandersson
Copy link
Contributor

@jdkandersson jdkandersson commented Mar 22, 2023 •
edited
Loading

This PR ensures that community contributions are not accidentally overridden by the action.

yanksyoon and others added 30 commits March 16, 2023 10:38
@yanksyoon
fix: create admin api key
5414045
@yanksyoon
fix: revert to discourse from charmhub
33421a3
@yanksyoon
fix: typo
a13becc
@yanksyoon
fix: user & api key creation flow
50f6381
@yanksyoon
fix: upgrade discourse charm
9da601f
@jdkandersson
add function that retrieves the file contents
e8bbc16
@jdkandersson
add tests for retrieving content of a file
af7fbc7
@jdkandersson
fix linting issues
7f1e328
@jdkandersson
remove unnecessary None alternative
d2ef605
@jdkandersson
make repository client available to reconcile
40fdaf3
@jdkandersson
add content from default branch to content change
fb6c853
@yanksyoon
fix: remove unlist parameter(user level api failure)
115089b
@yanksyoon
fix: update assert to pass returned content
4af70d7
@yanksyoon
fix: set hostname for successful redirect
5b1c9cc
@yanksyoon
fix: static test dependency update to bandit w/ toml
944a45d
@yanksyoon
fix: lint fixes
8317844
@yanksyoon
test: wait for idle for longer
cf35ca6
@yanksyoon
test: give enough timeout for asset compile
ed501be
@yanksyoon
fix: deploy and wait for idle before getting status
b340f36
@yanksyoon
debug
cf43316
@yanksyoon
fix: parse raw content
0b868e8
@yanksyoon
fix: lint fixes
d850a2a
@yanksyoon
fix: wait for idle not active status
2f4501d
@yanksyoon
fix: content in paragraph tag
88c7010
@yanksyoon
fix: backwards compatibility fix for e2e
83db749
@yanksyoon
fix: infinte wait fix
eb65c39
@jdkandersson
add merge conflict module
7f7d40f
@jdkandersson
add tests for content module
2815790
@yanksyoon
fix: set config after relations
0a13c92
@yanksyoon
fix: reorder deploy flow
4eafb6f
@jdkandersson jdkandersson marked this pull request as ready for review March 31, 2023 07:42
@jdkandersson jdkandersson requested a review from a team as a code owner March 31, 2023 07:42
yanksyoon
yanksyoon reviewed Apr 3, 2023
View reviewed changes
Copy link
Contributor

@yanksyoon yanksyoon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Initial review up to src/types_.py done, will start reviewing from tests/conftests.py :) Thank you!

.github/workflows/e2e_test.yaml Show resolved Hide resolved
prepare_check_cleanup/reconcile.py Outdated Show resolved Hide resolved
prepare_check_cleanup/reconcile.py Show resolved Hide resolved
prepare_check_cleanup/reconcile.py Outdated Show resolved Hide resolved
src/action.py Show resolved Hide resolved
yanksyoon
yanksyoon previously approved these changes Apr 3, 2023
View reviewed changes
Copy link
Contributor

@yanksyoon yanksyoon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you :)

tests/conftest.py Outdated Show resolved Hide resolved
tests/factories.py Outdated Show resolved Hide resolved
weiiwang01
weiiwang01 reviewed Apr 3, 2023
View reviewed changes
src/content.py Outdated Show resolved Hide resolved
src/content.py Show resolved Hide resolved
src/repository.py Show resolved Hide resolved
gregory-schiano
gregory-schiano reviewed Apr 3, 2023
View reviewed changes
src/action.py Show resolved Hide resolved
tests/unit/test_reconcile.py Outdated Show resolved Hide resolved
tests/unit/test_repository.py Outdated Show resolved Hide resolved
tests/integration/test___init__run_conflict.py Show resolved Hide resolved
@jdkandersson jdkandersson mentioned this pull request Apr 4, 2023
Open
@github-actions
Copy link

github-actions bot commented Apr 4, 2023

Test coverage for c76d5f2

Name                      Stmts   Miss Branch BrPart  Cover   Missing
---------------------------------------------------------------------
src/__init__.py              51      0      8      0   100%
src/action.py               156      0     46      0   100%
src/check.py                 29      0     10      0   100%
src/constants.py              4      0      0      0   100%
src/content.py               52      0      8      0   100%
src/discourse.py            156      0     34      0   100%
src/docs_directory.py        29      0      8      0   100%
src/exceptions.py            13      0      0      0   100%
src/index.py                 28      0      6      0   100%
src/metadata.py              28      0     12      0   100%
src/migration.py            106      0     35      0   100%
src/navigation_table.py      53      0     16      0   100%
src/pull_request.py          17      0      4      0   100%
src/reconcile.py             76      0     36      0   100%
src/repository.py            89      0     18      0   100%
src/types_.py               130      0     22      0   100%
---------------------------------------------------------------------
TOTAL                      1017      0    263      0   100%

Static code analysis report

Run started:2023-04-04 04:30:28.069005

Test results:
  No issues identified.

Code scanned:
  Total lines of code: 9386
  Total lines skipped (#nosec): 14
  Total potential issues skipped due to specifically being disabled (e.g., #nosec BXXX): 0

Run metrics:
  Total issues (by severity):
  	Undefined: 0
  	Low: 0
  	Medium: 0
  	High: 0
  Total issues (by confidence):
  	Undefined: 0
  	Low: 0
  	Medium: 0
  	High: 0
Files skipped (0):

gregory-schiano
gregory-schiano approved these changes Apr 4, 2023
View reviewed changes
Copy link

@gregory-schiano gregory-schiano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !
Finally wasn't an easy PR :)

@jdkandersson jdkandersson merged commit 69bfd6d into main Apr 4, 2023
@jdkandersson jdkandersson deleted the community-merge-conflicts branch April 17, 2023 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yanksyoon yanksyoon yanksyoon left review comments

@deusebio deusebio deusebio left review comments

@gregory-schiano gregory-schiano gregory-schiano approved these changes

@weiiwang01 weiiwang01 weiiwang01 approved these changes

@arturo-seijas arturo-seijas Awaiting requested review from arturo-seijas

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jdkandersson @deusebio @weiiwang01 @yanksyoon @arturo-seijas @gregory-schiano