Skip to content

chore(dynamic plugins): fix scope references for rhdh-plugins: should be @red-hat-developer-hub/ not @red/hat-developer-hub- #805

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

Merged
Gerry-Forde merged 4 commits into from
Dec 16, 2024
Merged

chore(dynamic plugins): fix scope references for rhdh-plugins: should be @red-hat-developer-hub/ not @red/hat-developer-hub- #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75625c0
chore(dynamic plugins): fix scope references for rhdh-plugins: should…
nickboldt Dec 16, 2024
049ae7f
regenerate adoc and csv with the corrected links
nickboldt Dec 16, 2024
7b536c7
cherrypick cleanup fix from 1.4 -> main; suppresses warnings about em…
nickboldt Dec 16, 2024
ba15827
regen - fewer empty lines
nickboldt Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion modules/dynamic-plugins/ref-community-plugins.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ Details on how {company-name} provides support for bundled community dynamic plu
[%header,cols=4*]
|===
|*Name* |*Plugin* |*Version* |*Path and required variables*

|===
4 changes: 2 additions & 2 deletions modules/dynamic-plugins/ref-rh-tech-preview-plugins.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@
|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-server-dynamic`


|Bulk Import |`https://npmjs.com/package/@red/hat-developer-hub-backstage-plugin-bulk-import/v/1.10.3[@red/hat-developer-hub-backstage-plugin-bulk-import]` |1.10.3
|Bulk Import |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-bulk-import/v/1.10.3[@red-hat-developer-hub/backstage-plugin-bulk-import]` |1.10.3
|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import`


|Bulk Import |`https://npmjs.com/package/@red/hat-developer-hub-backstage-plugin-bulk-import-backend/v/5.2.0[@red/hat-developer-hub-backstage-plugin-bulk-import-backend]` |5.2.0
|Bulk Import |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-bulk-import-backend/v/5.2.0[@red-hat-developer-hub/backstage-plugin-bulk-import-backend]` |5.2.0
|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic`


Expand Down
5 changes: 2 additions & 3 deletions modules/dynamic-plugins/rhdh-supported-plugins.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"Bitbucket Cloud ","@backstage/plugin-scaffolder-backend-module-bitbucket-cloud","Backend","0.2.2","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-cloud-dynamic",";","Disabled"
"Bitbucket Server ","@backstage/plugin-catalog-backend-module-bitbucket-server","Backend","0.2.3","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-bitbucket-server-dynamic","`BITBUCKET_HOST`;","Disabled"
"Bitbucket Server ","@backstage/plugin-scaffolder-backend-module-bitbucket-server","Backend","0.2.2","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-server-dynamic",";","Disabled"
"Bulk Import ","@red/hat-developer-hub-backstage-plugin-bulk-import","Frontend","1.10.3","Red Hat Tech Preview","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import",";","Disabled"
"Bulk Import ","@red/hat-developer-hub-backstage-plugin-bulk-import-backend","Backend","5.2.0","Red Hat Tech Preview","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic",";","Disabled"
"Bulk Import ","@red-hat-developer-hub/backstage-plugin-bulk-import","Frontend","1.10.3","Red Hat Tech Preview","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import",";","Disabled"
"Bulk Import ","@red-hat-developer-hub/backstage-plugin-bulk-import-backend","Backend","5.2.0","Red Hat Tech Preview","./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic",";","Disabled"
"Datadog ","@roadiehq/backstage-plugin-datadog","Frontend","2.4.0","Red Hat Tech Preview","./dynamic-plugins/dist/roadiehq-backstage-plugin-datadog",";","Disabled"
"Dynatrace ","@backstage-community/plugin-dynatrace","Frontend","10.0.8","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-dynatrace",";","Disabled"
"Gerrit ","@backstage/plugin-scaffolder-backend-module-gerrit","Backend","0.2.2","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-gerrit-dynamic",";","Disabled"
Expand Down Expand Up @@ -69,4 +69,3 @@
"Tech Radar ","@backstage-community/plugin-tech-radar","Frontend","1.0.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-tech-radar",";","Disabled"
"Tech Radar ","@backstage-community/plugin-tech-radar-backend","Backend","1.0.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-tech-radar-backend-dynamic","`TECH_RADAR_DATA_URL`;","Disabled"
"Utils ","@roadiehq/scaffolder-backend-module-utils","Backend","3.0.0","Red Hat Tech Preview","./dynamic-plugins/dist/roadiehq-scaffolder-backend-module-utils-dynamic",";","Disabled"

26 changes: 18 additions & 8 deletions modules/dynamic-plugins/rhdh-supported-plugins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Options:

Examples:

$0 -b release-1.3 --clean
$0 -b release-1.4 --clean

EOF
}
Expand Down Expand Up @@ -121,6 +121,7 @@ for j in $jsons; do
if [[ $Plugin != "@"* ]]; then # don't update janus-idp/backstage-plugins plugin names
Plugin="$(echo "${Plugin}" | sed -r -e 's/([^-]+)-(.+)/\@\1\/\2/' \
-e 's|janus/idp-|janus-idp/|' \
-e 's|red/hat-developer-hub-|red-hat-developer-hub/|' \
-e 's|backstage/community-|backstage-community/|' \
-e 's|parfuemerie/douglas-|parfuemerie-douglas/|')"
fi
Expand Down Expand Up @@ -179,8 +180,9 @@ for j in $jsons; do
# curl -sSLko- https://registry.npmjs.org/@janus-idp%2fcli | jq -r '.versions[]|(.version+", "+.gitHead)' | sort -uV
# for timestamp when tag is created
# curl -sSLko- https://registry.npmjs.org/@janus-idp%2fcli | jq -r '.time' | grep -v -E "created|modified|{|}" | sort -uV
# echo "Searching for ${Plugin/\//%2f} at npmjs.org..."
allVersionsPublished="$(curl -sSLko- "https://registry.npmjs.org/${Plugin/\//%2f}" | jq -r '.versions[].version')"
# echo $allVersionsPublished
# echo "Found $allVersionsPublished"
# clean out any pre-release versions
latestXYRelease="$(echo "$allVersionsPublished" | grep -v -E -- "next|alpha|-" | grep -E "^${Version%.*}" | sort -uV | tail -1)"
# echo "[DEBUG] Latest x.y version at https://registry.npmjs.org/${Plugin/\//%2f} : $latestXYRelease"
Expand Down Expand Up @@ -295,16 +297,24 @@ num_plugins+=(${#adoc1[@]})

rm -f "${0/.sh/.adoc2}"
sorted=(); while IFS= read -rd '' key; do sorted+=( "$key" ); done < <(printf '%s\0' "${!adoc2[@]}" | sort -z)
for key in "${sorted[@]}"; do
echo -e "${adoc2[$key]}" >> "${0/.sh/.ref-rh-tech-preview-plugins}";
echo -e "${csv[$key]}" >> "${0/.sh/.csv}"; done
# shellcheck disable=SC2128
if [[ $sorted ]] ;then
for key in "${sorted[@]}"; do
echo -e "${adoc2[$key]}" >> "${0/.sh/.ref-rh-tech-preview-plugins}";
echo -e "${csv[$key]}" >> "${0/.sh/.csv}"
done
fi
num_plugins+=(${#adoc2[@]})

rm -f "${0/.sh/.adoc3}"
sorted=(); while IFS= read -rd '' key; do sorted+=( "$key" ); done < <(printf '%s\0' "${!adoc3[@]}" | sort -z)
for key in "${sorted[@]}"; do
echo -e "${adoc3[$key]}" >> "${0/.sh/.ref-community-plugins}";
echo -e "${csv[$key]}" >> "${0/.sh/.csv}"; done
# shellcheck disable=SC2128
if [[ $sorted ]] ;then
for key in "${sorted[@]}"; do
echo -e "${adoc3[$key]}" >> "${0/.sh/.ref-community-plugins}";
echo -e "${csv[$key]}" >> "${0/.sh/.csv}"
done
fi
num_plugins+=(${#adoc3[@]})

# merge the content from the three .adocX files into the .template.adoc file, replacing the TABLE_CONTENT markers
Expand Down
Loading