From 75625c0eed0548b21c530f1fffd475445e7cf7e5 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Mon, 16 Dec 2024 14:31:50 -0500 Subject: [PATCH 1/4] 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 --- modules/dynamic-plugins/rhdh-supported-plugins.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/dynamic-plugins/rhdh-supported-plugins.sh b/modules/dynamic-plugins/rhdh-supported-plugins.sh index 5204dbba37..df7ff07294 100755 --- a/modules/dynamic-plugins/rhdh-supported-plugins.sh +++ b/modules/dynamic-plugins/rhdh-supported-plugins.sh @@ -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 @@ -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" From 049ae7f924e8b3540ac07c7129e802190fbc75f4 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Mon, 16 Dec 2024 14:34:03 -0500 Subject: [PATCH 2/4] regenerate adoc and csv with the corrected links Signed-off-by: Nick Boldt --- modules/dynamic-plugins/ref-rh-tech-preview-plugins.adoc | 4 ++-- modules/dynamic-plugins/rhdh-supported-plugins.csv | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/dynamic-plugins/ref-rh-tech-preview-plugins.adoc b/modules/dynamic-plugins/ref-rh-tech-preview-plugins.adoc index 60d4ebe2d2..7aaa1eb738 100644 --- a/modules/dynamic-plugins/ref-rh-tech-preview-plugins.adoc +++ b/modules/dynamic-plugins/ref-rh-tech-preview-plugins.adoc @@ -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` diff --git a/modules/dynamic-plugins/rhdh-supported-plugins.csv b/modules/dynamic-plugins/rhdh-supported-plugins.csv index 4e1471aadc..aa5f053d4d 100644 --- a/modules/dynamic-plugins/rhdh-supported-plugins.csv +++ b/modules/dynamic-plugins/rhdh-supported-plugins.csv @@ -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" From 7b536c752d9d00e7cf5d678fb1b6a982f3fa1bc4 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Mon, 16 Dec 2024 14:59:18 -0500 Subject: [PATCH 3/4] cherrypick cleanup fix from 1.4 -> main; suppresses warnings about empty array Signed-off-by: Nick Boldt --- .../dynamic-plugins/rhdh-supported-plugins.sh | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/modules/dynamic-plugins/rhdh-supported-plugins.sh b/modules/dynamic-plugins/rhdh-supported-plugins.sh index df7ff07294..6f8d45b53e 100755 --- a/modules/dynamic-plugins/rhdh-supported-plugins.sh +++ b/modules/dynamic-plugins/rhdh-supported-plugins.sh @@ -27,7 +27,7 @@ Options: Examples: - $0 -b release-1.3 --clean + $0 -b release-1.4 --clean EOF } @@ -297,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 From ba1582793feacca713520ac9651f09dccc1de588 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Mon, 16 Dec 2024 15:01:25 -0500 Subject: [PATCH 4/4] regen - fewer empty lines Signed-off-by: Nick Boldt --- modules/dynamic-plugins/ref-community-plugins.adoc | 1 - modules/dynamic-plugins/rhdh-supported-plugins.csv | 1 - 2 files changed, 2 deletions(-) diff --git a/modules/dynamic-plugins/ref-community-plugins.adoc b/modules/dynamic-plugins/ref-community-plugins.adoc index eb35beb235..64a94911b3 100644 --- a/modules/dynamic-plugins/ref-community-plugins.adoc +++ b/modules/dynamic-plugins/ref-community-plugins.adoc @@ -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* - |=== diff --git a/modules/dynamic-plugins/rhdh-supported-plugins.csv b/modules/dynamic-plugins/rhdh-supported-plugins.csv index aa5f053d4d..0ad3caec65 100644 --- a/modules/dynamic-plugins/rhdh-supported-plugins.csv +++ b/modules/dynamic-plugins/rhdh-supported-plugins.csv @@ -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" -