From 166942ef4d62accb52f6d5cacb46595966e748ec Mon Sep 17 00:00:00 2001 From: Lyubomir Bandrov <73892014+lbandrov@users.noreply.github.com> Date: Tue, 18 Jun 2024 17:26:58 +0300 Subject: [PATCH] Develop rebase (#5) * Improved Deployer Logs for Mustgather Endpoints (#614) * Improved Mustgather Logs * Removed extra logging for status as it will fill up the logs --------- Signed-off-by: Shoaeb Jindani * Changes as per timeout error in pipeline (#615) * update as per pipeline failure and changes * updated as per failure in pipeline * retry login in chaincode proposal --------- Signed-off-by: Ketul Shah * sanitise payload of db backup api (#616) * sanitize payload of db backup api --------- Signed-off-by: Chandra Kant Paliwal * add object-src to the csp header in all api responses (#618) Signed-off-by: David Huffman * Bump github.com/docker/docker in /packages/fabric-deployer (#620) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.12+incompatible to 20.10.27+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v20.10.12...v20.10.27) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * remove "saas" and replace "v2" text from api paths (#617) * remove "saas" and replace "v2" text from api paths * change test to use /v3/ --------- Signed-off-by: David Huffman * bump release notes (#621) Signed-off-by: David Huffman * add channel name validation on channel creation (#619) * added api in swagger and applied validation by same --------- Signed-off-by: Chandra Kant Paliwal * Sync and update fabric operator apis (#622) Signed-off-by: asararatnakar * join orderer issue fix on without system channel (#624) Signed-off-by: Chandra Kant Paliwal * added audit log on channel update, add or delete any configuration (#625) * added audit log on channel udate, add or delete any configuration --------- Signed-off-by: Chandra Kant Paliwal * Fix for Channel UI change from Grid to List view (#623) Signed-off-by: Chandra Kant Paliwal * log added on application startup tasks (#628) * log added on application startup tasks --------- Signed-off-by: Chandra Kant Paliwal * Show channel under pending channel if user close window after creation (#627) Signed-off-by: Chandra Kant Paliwal * bump release notes (#629) Signed-off-by: David Huffman * bump release notes (#630) Signed-off-by: David Huffman * Upgrade deployer as per https://github.com/advisories/GHSA-jq35-85cj-fj4p (#626) Signed-off-by: Ben Smith * fix access token generation if using api key (#633) * fix access token generation if using api key --------- Signed-off-by: David Huffman * performance enhancement on serive up by flatten validation json conversion provide instead of building (#632) Signed-off-by: Chandra Kant Paliwal * Bump ip from 2.0.0 to 2.0.1 (#634) Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1. - [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * add full date to logs in the console transport (#631) Signed-off-by: David Huffman * update flat swagger (#635) Signed-off-by: David Huffman * add release note Signed-off-by: Chandra Kant Paliwal * remove init required input option in chaincode lifecycle 2.0 (#637) * remove init required input option in chaincode lifecycle 2.0 --------- Signed-off-by: David Huffman * Fix on while joining channel peer display which is already part of channel (#638) Signed-off-by: Chandra Kant Paliwal * retry chaincode transactions with all orderers (#639) Signed-off-by: David Huffman * bump release notes (#640) Signed-off-by: David Huffman * replace dead api doc link in welcome banner (#641) Signed-off-by: David Huffman * fix chaincode approval bug (#642) Signed-off-by: David Huffman * revert channel channel changes from 638 (#644) Signed-off-by: David Huffman * bump release notes (#645) Signed-off-by: David Huffman * fix builidng list of possible orderer nodes (#646) Signed-off-by: David Huffman * safer nested data navigation in signature submission (#648) * safer nested data navigation in signature submission --------- Signed-off-by: David Huffman * bump release notes (#649) Signed-off-by: David Huffman * fix chaincode definition approval error (#651) * fix chaincode definition approval error * bump release notes --------- Signed-off-by: David Huffman * simplify console_type flag setting (#656) Signed-off-by: David Huffman * Channel ordering cluster name show in both Grid and List view with distinct value (#650) Signed-off-by: Chandra Kant Paliwal * Update help doc links according to console type (#658) * fix for learn and help doc links according to console type --------- Signed-off-by: Chandra Kant Paliwal * 2.0 ordering capability channel and fixes to failures (#657) * 2.0 ordering capabilitites and test updates * updated code as per failure * added scrollIntoView for mustgather failure --------- Signed-off-by: Ketul Shah * Adding Reader/Writer tests (#653) Signed-off-by: Uwe Haller * fix version summary module, in the summary now it shows correct CA version in operator part (#654) * fix version summary module --------- Signed-off-by: Devansh Purani * Fix Join Channel features showing peers which is already part of the channel Signed-off-by: Chandra Kant Paliwal * update code error message and optimize find existing peer code Signed-off-by: Chandra Kant Paliwal * update code error message and optimize find existing peer code Signed-off-by: Chandra Kant Paliwal * bump release notes Signed-off-by: Chandra Kant Paliwal * Bump google.golang.org/protobuf in /packages/fabric-deployer Bumps google.golang.org/protobuf from 1.28.0 to 1.33.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: indirect ... Signed-off-by: dependabot[bot] * Updates for Reader and Writer tests (#661) * Updates for Reader and Writer tests --------- Signed-off-by: Uwe Haller * Bump follow-redirects from 1.15.4 to 1.15.6 in /packages/athena (#664) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump follow-redirects from 1.15.4 to 1.15.6 in /packages/stitch (#665) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump follow-redirects from 1.15.4 to 1.15.6 in /packages/apollo (#666) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Removed DIND References from Deployer Signed-off-by: Shoaeb Jindani * Bump follow-redirects from 1.15.4 to 1.15.6 (#667) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * replace decompress-targz with tar-stream (#663) * replaces dependency decompress-targz with tar-stream to fix cve --------- Signed-off-by: Chandra Kant Paliwal * fetch chennels list with skip cache after channel deletion Signed-off-by: Chandra Kant Paliwal * removed duplicate step definition and alignment Signed-off-by: Ketul Shah * commit1 Signed-off-by: Devansh Purani * adds new field to allow migrated component to return os style urls (#672) * adds new field to allow migrated component to return os style urls --------- Signed-off-by: David Huffman * Bump github.com/docker/docker in /packages/fabric-deployer Bumps [github.com/docker/docker](https://github.com/docker/docker) from 24.0.7+incompatible to 24.0.9+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v24.0.7...v24.0.9) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: indirect ... Signed-off-by: dependabot[bot] * fix for console type on settings api Signed-off-by: Chandra Kant Paliwal * show message if tls certificate not present on joining OS Signed-off-by: Chandra Kant Paliwal * remote console statement Signed-off-by: Chandra Kant Paliwal * bump release notes Signed-off-by: Chandra Kant Paliwal * bump release notes Signed-off-by: Chandra Kant Paliwal * Upgrade Node Package Dependencies. Signed-off-by: Ben Smith * Issue fix for keep loading on pending orderer channels section after joining peer to channel and typo fix in message Signed-off-by: Chandra Kant Paliwal * bump release notes Signed-off-by: Chandra Kant Paliwal * Upgrade google.golang.org/protobuf for CVE-2024-24786. Signed-off-by: Ben Smith * os node add to existing channel fix Signed-off-by: Chandra Kant Paliwal * fix for renew msp admin certificate Signed-off-by: Chandra Kant Paliwal * enabling execution report Signed-off-by: Ketul Shah * added condition for migrated component to return os style urls Signed-off-by: Chandra Kant Paliwal * bump release notes Signed-off-by: Chandra Kant Paliwal * Upgrade underlying runtimes/os. * Upgrade console image(s) to UBI-9 base image and build images. * Upgrade grpcweb base image to Go v1.21.9. * Upgrade to Python v3.12 in workflows. * Upgrade to CouchDB v3.3.3. * Upgrade the version of GitHub actions that are used. Signed-off-by: Ben Smith * remove linters Signed-off-by: Chandra Kant Paliwal * Revert to UBI8 for now. Signed-off-by: Ben Smith * added timeout to handle pipeline failure Signed-off-by: Ketul Shah * Update 03-JoinANetwork.feature to create Peer in 2.5 Update 03-JoinANetwork.feature to create Peer in 2.5 Signed-off-by: Ketul Shah * Upgrade golang.org/x/net to v0.24.0 as per CVE-2023-45288. Signed-off-by: Ben Smith * increased timeout as per pipeline failures Signed-off-by: Ketul Shah * updated tests as per pipeline failures Signed-off-by: Ketul Shah * increased timeout as per failures for setting identities Signed-off-by: Ketul Shah * update as per timeout error audit log Signed-off-by: Ketul Shah * fix for audit log failures - to click by className instead of ID Signed-off-by: Ketul Shah * @material-ui shifted to @mui Signed-off-by: Devansh Purani * added @emotion/react and @emotion/styled Signed-off-by: Devansh Purani * bump release note Signed-off-by: Chandra Kant Paliwal * removed @emotion Signed-off-by: Devansh Purani * localization library replaced by i18next Signed-off-by: Chandra Kant Paliwal * update transpoformation prop type Signed-off-by: Chandra Kant Paliwal * fix lint and update for test cases Signed-off-by: Chandra Kant Paliwal * remove linters Signed-off-by: Chandra Kant Paliwal * remove commented code Signed-off-by: Chandra Kant Paliwal * update package lock Signed-off-by: Chandra Kant Paliwal * material version fix Signed-off-by: Chandra Kant Paliwal * fix dependency Signed-off-by: Chandra Kant Paliwal * handle case for render html translated content Signed-off-by: Chandra Kant Paliwal * added more timeout as per pipeline failures Signed-off-by: Ketul Shah * Upgrade github.com/docker/docker to v25.0.5 to address CVE-2024-29018. Signed-off-by: Ben Smith * join channel issue fix Signed-off-by: Chandra Kant Paliwal * Import and flatten grpcweb so it's all local. Signed-off-by: Ben Smith * revert library updations for release Signed-off-by: Chandra Kant Paliwal * bum release note Signed-off-by: Chandra Kant Paliwal * updated react, react-dom localization, redux, react-redux, redux-thunk library replace with i18n build libraries, jest and other unit testing and build libraries Signed-off-by: Chandra Kant Paliwal * changed method to search text in audit log table Signed-off-by: Ketul Shah * timeout changes as per failure Signed-off-by: Ketul Shah * Bump ejs from 3.1.8 to 3.1.10 Bumps [ejs](https://github.com/mde/ejs) from 3.1.8 to 3.1.10. - [Release notes](https://github.com/mde/ejs/releases) - [Commits](https://github.com/mde/ejs/compare/v3.1.8...v3.1.10) --- updated-dependencies: - dependency-name: ejs dependency-type: indirect ... Signed-off-by: dependabot[bot] * update message for html formating and bug fixes Signed-off-by: Chandra Kant Paliwal * update router hoc for v6 routing Signed-off-by: Chandra Kant Paliwal * login changes revert Signed-off-by: Chandra Kant Paliwal * api fixes for allow to generate token for reader and writer roles and update message key Signed-off-by: Chandra Kant Paliwal * update test case for handle error message key updation Signed-off-by: Chandra Kant Paliwal * linter config migrated as per linter library version updation Signed-off-by: Chandra Kant Paliwal * keep msg key for 400 validation errors same as other apis Signed-off-by: Chandra Kant Paliwal * library added @mui/material, @mui/styles and @emotion/styled Signed-off-by: Devansh Purani * login issue fix Signed-off-by: Chandra Kant Paliwal * update login test case Signed-off-by: Chandra Kant Paliwal * material-ui-chip updated Signed-off-by: Devansh Purani * updated material-ui-chip-input to v5 Signed-off-by: Devansh Purani * updated async, bytes, classnames, debug, http-proxy-middleware, parse-duration, prop-types, query-string Signed-off-by: Devansh Purani * reverted async lib version Signed-off-by: Devansh Purani * reverted some libs and updated bytes,classnames,debug libs Signed-off-by: Devansh Purani * updated parse-duration, prop-types and query-string libs Signed-off-by: Devansh Purani * updated focus-trap-react,http-proxy-middleware libs Signed-off-by: Devansh Purani * updated async lib Signed-off-by: Devansh Purani * ui fix and style update for chip library updates Signed-off-by: Chandra Kant Paliwal * bump release note Signed-off-by: Chandra Kant Paliwal * updated react-idle-timer library Signed-off-by: Devansh Purani * translation fix on support screen Signed-off-by: Chandra Kant Paliwal * translation issue fix Signed-off-by: Chandra Kant Paliwal * bump release notes and route fix Signed-off-by: Chandra Kant Paliwal * translate issue fix Signed-off-by: Chandra Kant Paliwal * bump release note Signed-off-by: Chandra Kant Paliwal * ZAP issues and developer api doc updates Signed-off-by: Chandra Kant Paliwal * config option revert Signed-off-by: Chandra Kant Paliwal * fix for dev doc update lint Signed-off-by: Chandra Kant Paliwal * changed 2.2 to 2.5 and added update MSP case Signed-off-by: Ketul Shah * update landing page issue and clipboard with localizaton fix Signed-off-by: Chandra Kant Paliwal * in case key does not found translate should return key Signed-off-by: Chandra Kant Paliwal * added declartion Signed-off-by: Chandra Kant Paliwal * login redirect handle on enter key press Signed-off-by: Chandra Kant Paliwal * bump release note Signed-off-by: Chandra Kant Paliwal * fix url to documentation for peer node Signed-off-by: Devansh Purani * channel update and remove orderer ui fix Signed-off-by: Chandra Kant Paliwal * bump release note Signed-off-by: Chandra Kant Paliwal * fix doc url for peer log settings Signed-off-by: Devansh Purani * connection profile issue fix lib update issue fix and added subtitle with support doc link Signed-off-by: Chandra Kant Paliwal * bump release note Signed-off-by: Chandra Kant Paliwal * translation issue fix on sinature approval screen Signed-off-by: Chandra Kant Paliwal * translation issue fix on sinature approval screen Signed-off-by: Chandra Kant Paliwal * Updated carbon library v10 to v11 Signed-off-by: Chandra Kant Paliwal * Adding Console API tests Signed-off-by: Uwe Haller * notification ui fixes Signed-off-by: Chandra Kant Paliwal * channel ui layout fix Signed-off-by: Chandra Kant Paliwal * idle timer issue fix Signed-off-by: Chandra Kant Paliwal * create wrapper component to use idle timerhoc Signed-off-by: Chandra Kant Paliwal * updated cypress test cases for css class prefix Signed-off-by: Chandra Kant Paliwal * update ts loader for audit fix Signed-off-by: Chandra Kant Paliwal * audit fix Signed-off-by: Chandra Kant Paliwal * audit fix Signed-off-by: Chandra Kant Paliwal * audit fix Signed-off-by: Chandra Kant Paliwal * audit fix Signed-off-by: Chandra Kant Paliwal * jest test fixes Signed-off-by: Chandra Kant Paliwal * resolve linters Signed-off-by: Chandra Kant Paliwal * Bump braces from 3.0.2 to 3.0.3 Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] * lint fixes Signed-off-by: Chandra Kant Paliwal * hlfoc console doc link updated Signed-off-by: Chandra Kant Paliwal * bump change log Signed-off-by: Chandra Kant Paliwal * release note and revert unwanted code Signed-off-by: Chandra Kant Paliwal * release note added Signed-off-by: Chandra Kant Paliwal * removed wild card directives Signed-off-by: Devansh Purani * max update limit axceed issue fix on msp creation Signed-off-by: Chandra Kant Paliwal * indentation fix Signed-off-by: Chandra Kant Paliwal * bump release note Signed-off-by: Chandra Kant Paliwal * revert connect src and update release doc Signed-off-by: Chandra Kant Paliwal * IDL-60 Allow mannual trigger of Docker workflow Signed-off-by: Lyubomir Bandrov --------- Signed-off-by: David Huffman Signed-off-by: dependabot[bot] Signed-off-by: asararatnakar Signed-off-by: Chandra Kant Paliwal Signed-off-by: Ben Smith Signed-off-by: Uwe Haller Signed-off-by: Shoaeb Jindani Signed-off-by: Ketul Shah Signed-off-by: Devansh Purani Signed-off-by: Lyubomir Bandrov Signed-off-by: Lyubomir Bandrov <73892014+lbandrov@users.noreply.github.com> Co-authored-by: shoaebjindani <40020259+shoaebjindani@users.noreply.github.com> Co-authored-by: Ketul Shah Co-authored-by: Chandra Kant Paliwal <155957290+ckpaliwal@users.noreply.github.com> Co-authored-by: dshuffma-ibm Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ratnakar Co-authored-by: Ben Smith Co-authored-by: Chandra Kant Paliwal Co-authored-by: uhaller <54943114+uhaller@users.noreply.github.com> Co-authored-by: devanshpurani7 Co-authored-by: Shoaeb Jindani Co-authored-by: Uwe Haller --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 70f3c9dc..4fb9db43 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,8 +2,8 @@ name: Docker on: push: - branches: - - main + tags: + - '*' workflow_dispatch: jobs: