Skip to content

Commit 704093a

Browse files
nickboldtotikhomi
nickboldt
authored and
otikhomi
committed
chore(dynamic plugins): fix scope references for rhdh-plugins: should be @red-hat-developer-hub/ not @red/hat-developer-hub- (redhat-developer#805)
* chore(dynamic plugins): fix scope references for rhdh-plugins: should be @red-hat-developer-hub/ not @red/hat-developer-hub- Signed-off-by: Nick Boldt <[email protected]> * regenerate adoc and csv with the corrected links Signed-off-by: Nick Boldt <[email protected]> * cherrypick cleanup fix from 1.4 -> main; suppresses warnings about empty array Signed-off-by: Nick Boldt <[email protected]> * regen - fewer empty lines Signed-off-by: Nick Boldt <[email protected]> --------- Signed-off-by: Nick Boldt <[email protected]>
1 parent 0d709c2 commit 704093a

File tree

4 files changed

+22
-14
lines changed

4 files changed

+22
-14
lines changed

‎modules/dynamic-plugins/ref-community-plugins.adoc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ Details on how {company-name} provides support for bundled community dynamic plu
1515
[%header,cols=4*]
1616
|===
1717
|*Name* |*Plugin* |*Version* |*Path and required variables*
18-
1918
|===

‎modules/dynamic-plugins/ref-rh-tech-preview-plugins.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@
8888
|`./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-bitbucket-server-dynamic`
8989

9090

91-
|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
91+
|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
9292
|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import`
9393

9494

95-
|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
95+
|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
9696
|`./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic`
9797

9898

‎modules/dynamic-plugins/rhdh-supported-plugins.csv‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"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"
2929
"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"
3030
"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"
31-
"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"
32-
"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"
31+
"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"
32+
"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"
3333
"Datadog ","@roadiehq/backstage-plugin-datadog","Frontend","2.4.0","Red Hat Tech Preview","./dynamic-plugins/dist/roadiehq-backstage-plugin-datadog",";","Disabled"
3434
"Dynatrace ","@backstage-community/plugin-dynatrace","Frontend","10.0.8","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-dynatrace",";","Disabled"
3535
"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"
@@ -69,4 +69,3 @@
6969
"Tech Radar ","@backstage-community/plugin-tech-radar","Frontend","1.0.0","Red Hat Tech Preview","./dynamic-plugins/dist/backstage-community-plugin-tech-radar",";","Disabled"
7070
"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"
7171
"Utils ","@roadiehq/scaffolder-backend-module-utils","Backend","3.0.0","Red Hat Tech Preview","./dynamic-plugins/dist/roadiehq-scaffolder-backend-module-utils-dynamic",";","Disabled"
72-

‎modules/dynamic-plugins/rhdh-supported-plugins.sh‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Options:
2727
2828
Examples:
2929
30-
$0 -b release-1.3 --clean
30+
$0 -b release-1.4 --clean
3131
3232
EOF
3333
}
@@ -121,6 +121,7 @@ for j in $jsons; do
121121
if [[ $Plugin != "@"* ]]; then # don't update janus-idp/backstage-plugins plugin names
122122
Plugin="$(echo "${Plugin}" | sed -r -e 's/([^-]+)-(.+)/\@\1\/\2/' \
123123
-e 's|janus/idp-|janus-idp/|' \
124+
-e 's|red/hat-developer-hub-|red-hat-developer-hub/|' \
124125
-e 's|backstage/community-|backstage-community/|' \
125126
-e 's|parfuemerie/douglas-|parfuemerie-douglas/|')"
126127
fi
@@ -179,8 +180,9 @@ for j in $jsons; do
179180
# curl -sSLko- https://registry.npmjs.org/@janus-idp%2fcli | jq -r '.versions[]|(.version+", "+.gitHead)' | sort -uV
180181
# for timestamp when tag is created
181182
# curl -sSLko- https://registry.npmjs.org/@janus-idp%2fcli | jq -r '.time' | grep -v -E "created|modified|{|}" | sort -uV
183+
# echo "Searching for ${Plugin/\//%2f} at npmjs.org..."
182184
allVersionsPublished="$(curl -sSLko- "https://registry.npmjs.org/${Plugin/\//%2f}" | jq -r '.versions[].version')"
183-
# echo $allVersionsPublished
185+
# echo "Found $allVersionsPublished"
184186
# clean out any pre-release versions
185187
latestXYRelease="$(echo "$allVersionsPublished" | grep -v -E -- "next|alpha|-" | grep -E "^${Version%.*}" | sort -uV | tail -1)"
186188
# echo "[DEBUG] Latest x.y version at https://registry.npmjs.org/${Plugin/\//%2f} : $latestXYRelease"
@@ -295,16 +297,24 @@ num_plugins+=(${#adoc1[@]})
295297

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

303309
rm -f "${0/.sh/.adoc3}"
304310
sorted=(); while IFS= read -rd '' key; do sorted+=( "$key" ); done < <(printf '%s\0' "${!adoc3[@]}" | sort -z)
305-
for key in "${sorted[@]}"; do
306-
echo -e "${adoc3[$key]}" >> "${0/.sh/.ref-community-plugins}";
307-
echo -e "${csv[$key]}" >> "${0/.sh/.csv}"; done
311+
# shellcheck disable=SC2128
312+
if [[ $sorted ]] ;then
313+
for key in "${sorted[@]}"; do
314+
echo -e "${adoc3[$key]}" >> "${0/.sh/.ref-community-plugins}";
315+
echo -e "${csv[$key]}" >> "${0/.sh/.csv}"
316+
done
317+
fi
308318
num_plugins+=(${#adoc3[@]})
309319

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

0 commit comments

Comments
 (0)