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

New plugin - Confluence #558

Merged
merged 31 commits into from
Aug 8, 2024
Merged

New plugin - Confluence #558

merged 31 commits into from
Aug 8, 2024

Conversation

fjudith
Copy link
Contributor

@fjudith fjudith commented Jun 19, 2024

Hey, I just made a Pull Request!

This PR is migrating the old and, sadly, unmaintained confluence plugin (https://github.com/K-Phoen/backstage-plugin-confluence) to be part of the community-plugins.
We opened this issue to ask the original author for the handover, but he does not seem to respond anymore.

This plugin is a copy from a fork we have (https://github.com/alithya-oss/backstage-plugins), which is up to date and has a couple features added which were suggested in the old repo. We successfully tested the plugin with both Confluence Cloud and On-Premise internally and successfully deployed it to few companies.

The README.md file I'm mentioning the original owner and repo, so that we keep a history about the plugin.

✔️ Checklist

  • A changeset describing the change and affected packages. (more info)
  • Tests for new functionality and regression tests for bug fixes
  • Screenshots attached (for UI changes)
  • All your commits have a Signed-off-by line in the message. (more info)

@fjudith fjudith requested review from backstage-service and a team as code owners June 19, 2024 17:15
@fjudith fjudith requested a review from vinzscam June 19, 2024 17:15
@backstage-goalie
Copy link
Contributor

backstage-goalie bot commented Jun 19, 2024 •
edited
Loading

Changed Packages

Package Name Package Path Changeset Bump Current Version
app workspaces/confluence/packages/app none v0.0.0
backend workspaces/confluence/packages/backend none v0.0.0
@backstage-community/plugin-confluence workspaces/confluence/plugins/confluence minor v0.0.0
@backstage-community/plugin-search-backend-module-confluence-collator workspaces/confluence/plugins/search-backend-module-confluence-collator minor v0.0.0

ggkoning
ggkoning suggested changes Jun 26, 2024
View reviewed changes
Copy link
Contributor

@ggkoning ggkoning left a comment •
edited
Loading

Choose a reason for hiding this comment

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

@fjudith Could you update this plugin to the latest backstage version 1.28.3?

@fjudith fjudith force-pushed the main branch 2 times, most recently from 9f7c068 to adffeb4 Compare June 26, 2024 22:01
@fjudith
Copy link
Contributor Author

fjudith commented Jun 26, 2024

@fjudith Could you update this plugin to the latest backstage version 1.28.3?

Resolved remaining changeset issues as well.

vinzscam
vinzscam requested changes Jun 27, 2024
View reviewed changes
Copy link
Member

@vinzscam vinzscam left a comment

Choose a reason for hiding this comment

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

thank you! 🙏 Could you create a Backstage app in the workspace with all the plugins installed so that it gets easier to develop?

Linking the Jenkins' PR for reference: #560

@fjudith fjudith force-pushed the main branch 2 times, most recently from 287af61 to 3633075 Compare June 28, 2024 04:00
@fjudith
Copy link
Contributor Author

fjudith commented Jun 28, 2024

thank you! 🙏 Could you create a Backstage app in the workspace with all the plugins installed so that it gets easier to develop?

Linking the Jenkins' PR for reference: #560

done

@ggkoning
Copy link
Contributor

ggkoning commented Jul 1, 2024

@vinzscam Could you please review again?

@awanlin awanlin requested a review from vinzscam July 2, 2024 14:19
vinzscam
vinzscam previously requested changes Jul 2, 2024
View reviewed changes
Copy link
Member

@vinzscam vinzscam left a comment

Choose a reason for hiding this comment

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

@fjudith do you mind adding yourself as CODEOWNER of the workspace?

https://github.com/backstage/community-plugins/blob/main/.github/CODEOWNERS

workspaces/confluence/package.json Outdated Show resolved Hide resolved
@fjudith
Copy link
Contributor Author

fjudith commented Jul 5, 2024

@vinzscam all done !

@vinzscam
Copy link
Member

vinzscam commented Jul 5, 2024

Thank you! Last request, I need you to become org member in order to fix the CODEOWNER issue. Please open an issue by following this link: https://github.com/backstage/community/issues/new?assignees=&labels=org-member-request&projects=&template=org_member.yaml&title=Org+Member%3A+%3Cyour-github-login%3E

@fjudith
Copy link
Contributor Author

fjudith commented Jul 9, 2024

Thank you! Last request, I need you to become org member in order to fix the CODEOWNER issue. Please open an issue by following this link: https://github.com/backstage/community/issues/new?assignees=&labels=org-member-request&projects=&template=org_member.yaml&title=Org+Member%3A+%3Cyour-github-login%3E

Done @vinzscam !
backstage/community#143

@awanlin awanlin requested review from vinzscam and awanlin July 16, 2024 14:25
@awanlin awanlin closed this Jul 24, 2024
@awanlin awanlin reopened this Jul 24, 2024
awanlin
awanlin requested changes Jul 24, 2024
View reviewed changes
Copy link
Contributor

@awanlin awanlin left a comment

Choose a reason for hiding this comment

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

Gave this a look over, found a few things that we should clean up while we wait for you to become an Org member 👍

workspaces/confluence/packages/backend/src/index.ts Outdated Show resolved Hide resolved
workspaces/confluence/examples/template/content/catalog-info.yaml Outdated Show resolved Hide resolved
workspaces/confluence/lerna.json Outdated Show resolved Hide resolved
workspaces/confluence/plugins/confluence/README.md Outdated Show resolved Hide resolved
workspaces/confluence/plugins/confluence/README.md Outdated Show resolved Hide resolved
workspaces/confluence/plugins/confluence/README.md Outdated Show resolved Hide resolved
workspaces/confluence/plugins/search-backend-module-confluence-collator/README.md Outdated Show resolved Hide resolved
@awanlin
Copy link
Contributor

awanlin commented Jul 24, 2024

Now that the CI ran looks like there's some issue that needs to be addressed, I would also rebase and honestly a version bump would be good too. 👍

@awanlin
Copy link
Contributor

awanlin commented Jul 26, 2024

Hi @fjudith, can you add "@microsoft/api-extractor": "7.36.4" as a resolution in your root package.json and then regenerate the API Reports? This will fix the issue where the files have an odd name. Thanks!

@backstage-goalie
Copy link
Contributor

Thanks for the contribution!
All commits need to be DCO signed before they are reviewed. Please refer to the the DCO section in CONTRIBUTING.md or the DCO status for more info.

Removed unused backend plugins
9555d8a 
- proxy
- scaffolder
- techdocs

Signed-off-by: Florian JUDITH <florian.judith@alithya.com>
@awanlin awanlin closed this Aug 1, 2024
@awanlin awanlin reopened this Aug 1, 2024
Florian JUDITH added 2 commits August 3, 2024 11:08
Removed unused frontend plugins
3b2d75d 
Signed-off-by: Florian JUDITH <florian.judith@alithya.com>
Updated example entities to reference Confluence developer resources
b7ee438 
Signed-off-by: Florian JUDITH <florian.judith@alithya.com>
@AhmedRaafat14
Copy link

Hi, is this planned to be merged soon?
Thanks

@awanlin awanlin closed this Aug 6, 2024
@awanlin awanlin reopened this Aug 6, 2024
@awanlin
Copy link
Contributor

awanlin commented Aug 6, 2024

Hi @fjudith, once the CI is green I'm happy to approve and merge, thanks!

Fixed CI errors
043e94f 
Signed-off-by: Florian JUDITH <florian.judith@alithya.com>
@awanlin
Copy link
Contributor

awanlin commented Aug 6, 2024

Triggered the CI again, looks like prettier is not happy, not sure why this won't just run again for each commit. I'll keep an eye on it so you can keep moving forward.

Applied Prettier
92bf775 
Signed-off-by: Florian JUDITH <florian.judith@alithya.com>
@fjudith
Copy link
Contributor Author

fjudith commented Aug 6, 2024

Triggered the CI again, looks like prettier is not happy, not sure why this won't just run again for each commit. I'll keep an eye on it so you can keep moving forward.

Should be fine now. Prettier was applied on the whole workspace.

@fjudith
Copy link
Contributor Author

fjudith commented Aug 6, 2024 •
edited
Loading

@awanlin Should be fine now

Florian JUDITH added 3 commits August 7, 2024 10:33
Rolled-back prettier change
4b01840 
Signed-off-by: Florian JUDITH <florian.judith@alithya.com>
Fixed backend module api report
57f49f8 
Signed-off-by: Florian JUDITH <florian.judith@alithya.com>
Fixed frontend plugin api report
2f7a15a 
Signed-off-by: Florian JUDITH <florian.judith@alithya.com>
@fjudith
Copy link
Contributor Author

fjudith commented Aug 7, 2024

@awanlin api-reports are fixed

@awanlin awanlin closed this Aug 7, 2024
@awanlin awanlin reopened this Aug 7, 2024
@awanlin
Copy link
Contributor

awanlin commented Aug 7, 2024

Hi @fjudith, I might run through the various CI checks locally first as we are just playing ping-pong here sadly. Looks like prettier failed. Not sure if you have your editor setup to run that automatically for you on save, might be worth doing.

Applied Prettrier
0c459fc 
Signed-off-by: Florian JUDITH <florian.judith@alithya.com>
@fjudith
Copy link
Contributor Author

fjudith commented Aug 8, 2024

Hi @fjudith, I might run through the various CI checks locally first as we are just playing ping-pong here sadly. Looks like prettier failed. Not sure if you have your editor setup to run that automatically for you on save, might be worth doing.

Sorry for that @awanlin ,my editor was'nt configured properly.
I ran CI checks locally, it should run fine now

@awanlin
Copy link
Contributor

awanlin commented Aug 8, 2024

No worries, looks like we are very close. If you run yarn backstage-cli repo fix --publish form the root of the workspace that will fix this last failure and hopefully get things green 🤞

Fixed pacakge.json
1b60d97 
Signed-off-by: Florian JUDITH <florian.judith@alithya.com>
@awanlin awanlin dismissed vinzscam’s stale review August 8, 2024 13:03

Comments resolved

@awanlin awanlin merged commit 7a131e0 into backstage:main Aug 8, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awanlin awanlin awanlin approved these changes

@ggkoning ggkoning ggkoning approved these changes

@backstage-service backstage-service Awaiting requested review from backstage-service

@vinzscam vinzscam Awaiting requested review from vinzscam

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

Successfully merging this pull request may close these issues.
5 participants
@fjudith @ggkoning @vinzscam @awanlin @AhmedRaafat14