Skip to content

Commit

Permalink
version 2.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
laoshanxi committed Mar 13, 2023
1 parent 4eb9b2e commit 278cd13
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-push-appmesh-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ env:
REGISTRY: docker.io
# github.repository as <account>/<repo>
IMAGE_NAME: laoshanxi/appmesh
APPMESH_VERSION: "2.1.1"
APPMESH_VERSION: "2.1.2"

permissions: # added using https://github.com/step-security/secure-workflows
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverity_cpp_code_scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
contents: read

env:
APPMESH_VERSION: "2.1.1"
APPMESH_VERSION: "2.1.2"

jobs:
coverity-cpp-code-scan:
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/publish-github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
env:
# Use docker.io for Docker Hub if empty
REGISTRY: docker.io
APPMESH_VERSION: "2.1.1"
APPMESH_VERSION: "2.1.2"

permissions: # added using https://github.com/step-security/secure-workflows
contents: read
Expand Down Expand Up @@ -93,14 +93,7 @@ jobs:

- name: Generate Changelog
run: |
echo "1. libcpr replace cpprestsdk" >> CHANGELOG.txt
echo "2. MessagePack replace ProtoBuffer" >> CHANGELOG.txt
echo "3. TCP socket enable SSL" >> CHANGELOG.txt
echo "4. Publish Python SDK to PyPI" >> CHANGELOG.txt
echo "5. Publish ARM64 v8 platform packages" >> CHANGELOG.txt
echo "6. Generate SBOM for AppMesh Docker image" >> CHANGELOG.txt
echo "7. Build third party in build docker image" >> CHANGELOG.txt
echo "8. Integrate Python SDK to readthedoc with sphinxcontrib.apidoc" >> CHANGELOG.txt
echo "1. version 2.1.2" >> CHANGELOG.txt
ls -R
# publish release
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ string(TIMESTAMP APPMESH_BUILD_DATE "%Y-%m-%dT%H:%M:%SZ")
# project
##########################################################################
cmake_policy(SET CMP0048 NEW)
project(appmesh LANGUAGES CXX VERSION 2.1.1)
project(appmesh LANGUAGES CXX VERSION 2.1.2)

##########################################################################
# C++ flag
Expand Down
2 changes: 1 addition & 1 deletion docs/source/Coverity.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ $ du -sh appmesh.tar.gz
$ curl --form token=Yor-Coverity-Token \
--form [email protected] \
--form [email protected] \
--form version="2.1.1" \
--form version="2.1.2" \
--form description="gcc 8.3 build" \
https://scan.coverity.com/builds?project=laoshanxi%2Fapp-mesh
```
Expand Down
2 changes: 1 addition & 1 deletion docs/source/Install.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ $ systemctl status appmesh
Deploy Web UI (access https://host-name)
```
appc logon -u admin -x admin123
appc add -n appweb --perm 11 -e APP_DOCKER_OPTS="--net=host -v /opt/appmesh/ssl/server.pem:/etc/nginx/conf.d/server.crt:ro -v /opt/appmesh/ssl/server-key.pem:/etc/nginx/conf.d/server.key:ro" -d laoshanxi/appmesh-ui:2.1.1 -f
appc add -n appweb --perm 11 -e APP_DOCKER_OPTS="--net=host -v /opt/appmesh/ssl/server.pem:/etc/nginx/conf.d/server.crt:ro -v /opt/appmesh/ssl/server-key.pem:/etc/nginx/conf.d/server.key:ro" -d laoshanxi/appmesh-ui:2.1.2 -f
```

Note:
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
author = "laoshanxi"

# The full version, including alpha/beta/rc tags
release = "2.1.1"
release = "2.1.2"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/source/success/kubernetes_run_native_application.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This Docker image `laoshanxi/appmesh_agent` is used to forward container start c
$ tee Dockerfile <<-'EOF'
FROM ubuntu
ENV APP_MESH_VER=2.1.1
ENV APP_MESH_VER=2.1.2
RUN apt update && apt install wget net-tools -y && \
wget https://github.com/laoshanxi/app-mesh/releases/download/${APP_MESH_VER}/appmesh_${APP_MESH_VER}_amd64.deb && \
Expand Down
8 changes: 5 additions & 3 deletions src/sdk/python/appmesh/appmesh_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,11 @@ class Method(Enum):

def __init__(
self,
auth_enable: bool = True,
rest_url: str = "https://127.0.0.1:6060",
auth_enable: bool=True,
rest_url: str="https://127.0.0.1:6060",
rest_ssl_verify=_SSL_CA_PEM_FILE,
rest_timeout=(60, 300),
jwt_token=None,
):
"""Construct an App Mesh client object
Expand All @@ -57,10 +58,11 @@ def __init__(
rest_url (str, optional): server URI string.
rest_ssl_verify (str, optional): SSL CA certification file path or False to disable SSL verification.
rest_timeout (tuple, optional): HTTP timeout, Defaults to 60 seconds for connect timeout and 300 seconds for read timeout
jwt_token (str, optional): JWT token, provide correct token is same with login() & authenticate().
"""
self.server_url = rest_url
self.jwt_auth_enable = auth_enable
self.__jwt_token = None
self.__jwt_token = token
self.ssl_verify = rest_ssl_verify
self.rest_timeout = rest_timeout

Expand Down

0 comments on commit 278cd13

Please sign in to comment.