Merge branch 'main' into dependabot/pip/src/agent/kubernetes-agent/pi…

…p-67c222d85d

.gitignore

@@ -247,4 +247,8 @@ src/dashboard/lambda/mock/index.js
 
 # Cello local storage
 /**/opt/*
-/**/cello/*
+/**/cello/*
+
+# Local Netlify folder
+.netlify
+deno.lock

Makefile

@@ -223,7 +223,7 @@ docker-rest-agent:
 	docker build -t hyperledger/cello-agent-docker:latest -f build_image/docker/agent/docker-rest-agent/Dockerfile.in ./ --build-arg pip=$(PIP) --platform linux/$(ARCH)
 
 fabric:
-	docker image pull yeasy/hyperledger-fabric:2.2.0
+	docker build -t hyperledger/fabric:2.5.9 -f build_image/docker/cello-hlf/Dockerfile build_image/docker/cello-hlf/
 
 dashboard:
 	docker build -t hyperledger/cello-dashboard:latest -f build_image/docker/common/dashboard/Dockerfile.in ./

build_image/docker/cello-hlf/Dockerfile

@@ -1,12 +1,16 @@
 # https://github.com/yeasy/docker-hyperledger-fabric
 #
 # Dockerfile for Hyperledger fabric all-in-one development and experiments, including:
-# * fabric-peer
 # * fabric-orderer
+# * fabric-peer
 # * fabric-ca
-# * cryptogen
 # * configtxgen
 # * configtxlator
+# * cryptogen
+# * discover
+# * ledgerutil
+# * osnadmin
+# * ccaas_builder sample
 # * gotools
 
 # If you only need quickly deploy a fabric network, please see
@@ -17,8 +21,8 @@
 # Workdir is set to $GOPATH/src/github.com/hyperledger/fabric
 # Data is stored under /var/hyperledger/production
 
-FROM golang:1.14
-LABEL version=2.2.0
+FROM golang:1.22
+LABEL maintainer "Baohua Yang <yeasy.github.com>"
 
 # Orderer, peer, ca, operation api
 EXPOSE 7050 7051 7054 8443 9443
@@ -30,15 +34,15 @@ ENV FABRIC_ROOT=$GOPATH/src/github.com/hyperledger/fabric \
     FABRIC_CA_ROOT=$GOPATH/src/github.com/hyperledger/fabric-ca
 
 # BASE_VERSION is used in metadata.Version as major version
-ENV BASE_VERSION=2.2.0
+ENV BASE_VERSION=2.5.9
 
 # PROJECT_VERSION is required in core.yaml for fabric-baseos and fabric-ccenv
-ENV PROJECT_VERSION=2.2.0
-ENV HLF_CA_VERSION=1.4.8
+ENV PROJECT_VERSION=2.5.9
+ENV HLF_CA_VERSION=1.5.12
 
 # generic environment (core.yaml) for builder and runtime: e.g., builder: $(DOCKER_NS)/fabric-ccenv:$(TWO_DIGIT_VERSION), golang, java, node
 ENV DOCKER_NS=hyperledger
-ENV TWO_DIGIT_VERSION=2.2
+ENV TWO_DIGIT_VERSION=2.5
 
 ENV BASE_DOCKER_NS=hyperledger
 ENV LD_FLAGS="-X github.com/hyperledger/fabric/common/metadata.Version=${PROJECT_VERSION} \
@@ -69,39 +73,38 @@ ENV FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server \
 
 RUN mkdir -p /var/hyperledger/production \
         $GOPATH/src/github.com/hyperledger \
-        $FABRIC_CFG_PATH \
+        /opt/hyperledger/ccaas_builder/bin \
         $FABRIC_CFG_PATH/crypto-config \
+        /var/hyperledger/fabric-ca-server \
         $FABRIC_CA_SERVER_HOME \
         $FABRIC_CA_CLIENT_HOME \
         $CA_CFG_PATH \
         /chaincode/input \
-        /chaincode/output \
-        /var/hyperledger/fabric-ca-server
+        /chaincode/output
 
 # Install development dependencies
 RUN apt-get update \
-        && apt-get install -y apt-utils python3-dev docker-compose-plugin\
+        && apt-get install -y apt-utils python3-dev \
         && apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev libyaml-dev libltdl-dev libtool \
-        && apt-get install -y python3-pip \
         && apt-get install -y vim tree jq unzip \
-        && pip3 install behave nose \
-        && pip3 install pyinotify \
+        && apt-get install -y python3 python3-pip python3-venv \
+        && python3 -m venv /opt/venv \
+        && /opt/venv/bin/pip install behave nose PyYAML==5.3.1 docker-compose pyinotify \
         && rm -rf /var/cache/apt
 
+ENV PATH="/opt/venv/bin:$PATH"
+
 # Install yq to update config for fabric-ca
 RUN wget -O /go/bin/yq https://github.com/mikefarah/yq/releases/download/2.4.1/yq_linux_amd64 \
         && chmod a+x /go/bin/yq
 
-# install gotools
-RUN go get github.com/golang/protobuf/protoc-gen-go \
-        && go get github.com/maxbrunsfeld/counterfeiter \
-        && go get github.com/axw/gocov/... \
-        && go get github.com/AlekSi/gocov-xml \
-        && go get golang.org/x/tools/cmd/goimports \
-        && go get golang.org/x/lint/golint \
-        && go get github.com/estesp/manifest-tool/... \
-        && go get github.com/client9/misspell/cmd/misspell \
-        && go get github.com/onsi/ginkgo/ginkgo
+# Install gotools
+RUN go install github.com/golang/protobuf/protoc-gen-go@latest \
+        && go install github.com/maxbrunsfeld/counterfeiter/v6@latest \
+        && go install github.com/axw/gocov/gocov@latest \
+        && go install github.com/axw/gocov/gocov@latest \
+        && go install golang.org/x/tools/cmd/goimports@latest \
+        && go install github.com/onsi/ginkgo/ginkgo@latest
 
 # Clone the Hyperledger Fabric code and cp sample config files
 RUN cd $GOPATH/src/github.com/hyperledger \
@@ -114,25 +117,27 @@ RUN cd $GOPATH/src/github.com/hyperledger \
         && cp -r $FABRIC_ROOT/sampleconfig/* $FABRIC_CFG_PATH/
 
 # Add external fabric chaincode dependencies
-RUN go get github.com/hyperledger/fabric-chaincode-go/shim \
-        && go get github.com/hyperledger/fabric-protos-go/peer
-
-# Install configtxgen, cryptogen, configtxlator, discover and idemixgen
-RUN cd $FABRIC_ROOT/ \
-        && CGO_CFLAGS=" " go install -tags "" github.com/hyperledger/fabric/cmd/configtxgen \
-        && CGO_CFLAGS=" " go install -tags "" github.com/hyperledger/fabric/cmd/cryptogen \
-        && CGO_CFLAGS=" " go install -tags "" github.com/hyperledger/fabric/cmd/configtxlator \
-        && CGO_CFLAGS=" " go install -tags "" -ldflags "-X github.com/hyperledger/fabric/cmd/discover/metadata.Version=${PROJECT_VERSION}" github.com/hyperledger/fabric/cmd/discover \
-        && CGO_CFLAGS=" " go install -tags "" github.com/hyperledger/fabric/cmd/idemixgen
-
-# Install fabric peer
-RUN CGO_CFLAGS=" " go install -tags "" -ldflags "$LD_FLAGS" github.com/hyperledger/fabric/cmd/peer \
-        && go clean
-
-# Install fabric orderer
-RUN CGO_CFLAGS=" " go install -tags "" -ldflags "$LD_FLAGS" github.com/hyperledger/fabric/cmd/orderer \
+#RUN go get github.com/hyperledger/fabric-chaincode-go/shim \
+#        && go get github.com/hyperledger/fabric-protos-go/peer
+
+# Install configtxgen, cryptogen, configtxlator, discover, ledgerutil, osnadmin, orderer and peer
+RUN cd $FABRIC_ROOT \
+        && CGO_CFLAGS=" " go install -tags "" -ldflags "${LD_FLAGS}" github.com/hyperledger/fabric/cmd/configtxgen \
+        && CGO_CFLAGS=" " go install -tags "" -ldflags "${LD_FLAGS}" github.com/hyperledger/fabric/cmd/configtxlator \
+        && CGO_CFLAGS=" " go install -tags "" -ldflags "${LD_FLAGS}" github.com/hyperledger/fabric/cmd/cryptogen \
+        && CGO_CFLAGS=" " go install -tags "" -ldflags "${LD_FLAGS}" github.com/hyperledger/fabric/cmd/discover \
+        && CGO_CFLAGS=" " go install -tags "" -ldflags "${LD_FLAGS}" github.com/hyperledger/fabric/cmd/ledgerutil \
+        && CGO_CFLAGS=" " go install -tags "" -ldflags "${LD_FLAGS}" github.com/hyperledger/fabric/cmd/osnadmin \
+        && CGO_CFLAGS=" " go install -tags "" -ldflags "$LD_FLAGS" github.com/hyperledger/fabric/cmd/orderer \
+        && CGO_CFLAGS=" " go install -tags "" -ldflags "$LD_FLAGS" github.com/hyperledger/fabric/cmd/peer \
         && go clean
 
+# Install ccaas_builder sample, since hlf v2.4.1
+RUN cd $FABRIC_ROOT/ccaas_builder \
+        && go build -o /opt/hyperledger/ccaas_builder/bin/ ./cmd/build \
+        && go build -o /opt/hyperledger/ccaas_builder/bin/ ./cmd/detect \
+        && go build -o /opt/hyperledger/ccaas_builder/bin/ ./cmd/release \
+	&& go clean
 #ADD crypto-config $FABRIC_CFG_PATH/crypto-config
 
 # Install fabric-ca
@@ -142,7 +147,7 @@ RUN cd $GOPATH/src/github.com/hyperledger \
         && rm v${HLF_CA_VERSION}.zip \
         && mv fabric-ca-${HLF_CA_VERSION} fabric-ca \
 # This will install fabric-ca-server and fabric-ca-client into $GOPATH/bin/
-        && go install -ldflags "-X github.com/hyperledger/fabric-ca/lib/metadata.Version=$PROJECT_VERSION -linkmode external -extldflags '-static -lpthread'" github.com/hyperledger/fabric-ca/cmd/... \
+        && go install -ldflags "-X github.com/hyperledger/fabric-ca/lib/metadata.Version=${HLF_CA_VERSION} -linkmode external -extldflags '-static -lpthread'" github.com/hyperledger/fabric-ca/cmd/... \
 # Copy example ca and key files
 #&& cp $FABRIC_CA_ROOT/images/fabric-ca/payload/*.pem $FABRIC_CA_HOME/ \
         && go clean

build_image/docker/common/api-engine/Dockerfile.in

@@ -2,22 +2,21 @@ FROM python:3.8
 
 # Install software
 RUN apt-get update \
-	&& apt-get install -y gettext-base graphviz libgraphviz-dev \
+	&& apt-get install -y gettext-base graphviz libgraphviz-dev vim \
 	&& apt-get autoclean \
 	&& apt-get clean \
 	&& apt-get autoremove && rm -rf /var/cache/apt/
 
 # Set the working dir
 WORKDIR /var/www/server
 
+# Install compiled code tools from Artifactory and copy it to opt folder.
+RUN curl -L --retry 5 --retry-delay 3 "https://github.com/hyperledger/fabric/releases/download/v2.5.9/hyperledger-fabric-linux-amd64-2.5.9.tar.gz" | tar xz -C /opt/
+
 # Copy source code to the working dir
 COPY src/api-engine ./
 COPY template/node  /opt/node
 
-# Install compiled code tools from Artifactory and copy it to opt folder.
-RUN curl "https://hyperledger.jfrog.io/artifactory/fabric-binaries/hyperledger-fabric-linux-amd64-2.2-stable.tar.gz?archiveType=gzip" > bin.tar.gz \
-	&& tar -xzvf bin.tar.gz -C /opt/
-
 # Install python dependencies
 RUN	pip3 install -r requirements.txt
 

build_image/docker/common/dashboard/Dockerfile.in

@@ -1,10 +1,10 @@
-FROM node:14.18
+FROM node:20.15
 
 WORKDIR /usr/src/app/
 USER root
 RUN mkdir -p /usr/src/app && cd /usr/src/app
 COPY src/dashboard /usr/src/app
-RUN yarn --network-timeout 600000 && yarn run build
+RUN export NODE_OPTIONS=--openssl-legacy-provider && yarn --network-timeout 600000 && yarn run build
 
 FROM nginx:1.15.12
 COPY --from=0 /usr/src/app/dist /usr/share/nginx/html

build_image/docker/common/dashboard/nginx.conf

@@ -28,6 +28,8 @@ http {
 
     #gzip  on;
 
+    client_max_body_size 100M;
+
     server {
         listen       8081;
         server_name  localhost;

src/api-engine/api_engine/settings.py.example

@@ -240,3 +240,5 @@ SIMPLE_JWT = {
     'TOKEN_TYPE_CLAIM': 'token_type',
     'TOKEN_USER_CLASS': 'rest_framework_simplejwt.models.TokenUser',
 }
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

src/api-engine/requirements.txt

@@ -1,4 +1,4 @@
-asgiref==3.3.2
+asgiref==3.6.0
 attrs==20.3.0
 cachetools==4.1.1
 celery==5.2.6
@@ -7,7 +7,7 @@ chardet==3.0.4
 coreapi==2.3.3
 coreschema==0.0.4
 defusedxml==0.6.0
-Django==3.2.25
+Django==4.2.16
 django-allauth==0.41.0
 django-cors-headers==3.5.0
 django-extensions==2.2.9

src/dashboard/netlify.toml

@@ -0,0 +1,8 @@
+[build]
+functions = "lambda"
+
+[[redirects]]
+  from = "/*"
+  to = "/.netlify/functions/:splat"
+  status = 200
+

src/dashboard/package.json

@@ -13,8 +13,8 @@
     "docker:dev": "docker compose -f ./docker/docker-compose.dev.yml up",
     "docker:push": "npm run docker-hub:build && npm run docker:tag && docker push antdesign/ant-design-pro",
     "docker:tag": "docker tag ant-design-pro antdesign/ant-design-pro",
-    "functions:build": "npm run generateMock && netlify-lambda build ./lambda",
-    "functions:run": "npm run generateMock && cross-env NODE_ENV=dev netlify-lambda serve ./lambda",
+    "functions:build": "yarn run generateMock && netlify dev",
+    "netlify:dev": "netlify dev",
     "generateMock": "node ./scripts/generateMock",
     "lint": "eslint --ext .js src mock tests && npm run lint:style && npm run lint:prettier",
     "lint-staged": "lint-staged",
@@ -23,7 +23,7 @@
     "lint:prettier": "check-prettier lint",
     "lint:style": "stylelint 'src/**/*.less' --syntax less",
     "prettier": "node ./scripts/prettier.js",
-    "site": "umi build && npm run functions:build",
+    "site": "umi build && yarn run functions:build",
     "start": "cross-env umi dev PORT=8001",
     "start:no-mock": "cross-env MOCK=none umi dev PORT=8002",
     "test": "umi test",
@@ -57,6 +57,7 @@
     "antd": "^4.2.5",
     "bizcharts": "3.5.2-beta.1",
     "bizcharts-plugin-slider": "^2.1.1-beta.1",
+    "body-parser": "^1.19.0",
     "cello-paginator": "^1.0.1",
     "classnames": "^2.2.6",
     "enquire-js": "^0.2.1",
@@ -66,11 +67,11 @@
     "lodash-decorators": "^6.0.1",
     "memoize-one": "^5.0.0",
     "moment": "^2.24.0",
-    "netlify-lambda": "^1.4.3",
+    "merge-umi-mock-data": "^1.0.0",
     "numeral": "^2.0.6",
     "nzh": "^1.0.4",
     "omit.js": "^1.0.0",
-    "path-to-regexp": "^3.0.0",
+    "path-to-regexp": "^8.1.0",
     "prop-types": "^15.6.2",
     "qs": "^6.6.0",
     "rc-animate": "^2.6.0",
@@ -92,6 +93,7 @@
     "@types/history": "^4.7.2",
     "@types/react": "^16.8.1",
     "@types/react-dom": "^16.0.11",
+    "glob": "^9.0.0",
     "@umijs/preset-react": "^1.2.2",
     "antd-pro-merge-less": "^1.0.0",
     "antd-theme-webpack-plugin": "^1.2.0",
@@ -111,13 +113,14 @@
     "eslint-plugin-markdown": "^2.2.0",
     "eslint-plugin-react": "^7.12.4",
     "faker": "^4.1.0",
-    "gh-pages": "^2.0.1",
+    "gh-pages": "^6.1.1",
     "husky": "^4.2.5",
     "jest-puppeteer": "^4.1.0",
     "jsdom-global": "^3.0.2",
     "less": "^3.9.0",
     "lint-staged": "^11.0.0",
     "mockjs": "^1.0.1-beta3",
+    "netlify-cli": "^16.0.0",
     "prettier": "^1.17.0",
     "serverless-http": "^2.0.1",
     "slash2": "^2.0.0",
@@ -143,6 +146,7 @@
     "scripts/**/*.js"
   ],
   "resolutions": {
-    "mockjs/commander": "^8.2.0"
+    "mockjs/commander": "^8.2.0",
+    "glob": "^9.0.0"
   }
 }

tests/dashboard/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.2'
 services:
   test-dashboard:
-    image: node:14.17
+    image: node:14.18
     volumes:
       - $ROOT_PATH/src/dashboard:/dashboard
     working_dir: /dashboard