Merge pull request #362 from Artemkaaas/libsovtoken-0.9.7

Libsovtoken 0.9.7

Author: Artemkaaas

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+
+## 0.9.7
+* Updated logging initialization to use libindy pattern.
+* bugfixes
+
 ## 0.9.3
 * Changed CI/CD to new stable branch.
 * CD added to the new stable branch with new stable release process

devops/Makefile

@@ -38,19 +38,19 @@ LIBS = $(LIB_DYNAMIC) $(LIB_STATIC)
 # package related variables
 PACKAGE_NAME ?= $(LIBNAME)
 PRE_PACKAGE_GOALS := pre_package $(LIB_DYNAMIC)
-FPM_P_MAINTAINER := Evernym
-FPM_P_URL := https://github.com/evernym/libsovtoken
+FPM_P_MAINTAINER := Sovrin
+FPM_P_URL := https://github.com/sovrin-foundation/libsovtoken
 FPM_P_LICENSE := Apache License 2.0
-FPM_P_VENDOR := Evernym
-FPM_P_DESCRIPTION := libsovtoken writen in Rust
+FPM_P_VENDOR := Sovrin
+FPM_P_DESCRIPTION := libsovtoken written in Rust
 FPM_P_NAME = $(PACKAGE_NAME)
 FPM_P_VERSION ?= $(SRC_VERSION)
-FPM_P_DEPENDS = libindy(=1.6.8)
+FPM_P_DEPENDS = libindy(>=1.8.2)
 FPM_P_OUTPUT_DIR = $(LIB_TARGET_DIR)
 FPM_ARGS = $(LIB_DYNAMIC)=/usr/lib/
 
 # docker related variables
-DOCKER_NAME ?= evernym/libsovtoken
+DOCKER_NAME ?= sovrin/libsovtoken
 LST_BASE_DOCKER_TAG ?=
 LST_CI_DOCKER_TAG ?=
 LST_ANDROID_NDK_DOCKER_TAG ?=

devops/README.md

@@ -4,7 +4,7 @@ This folder includes devops related routine and consists of the following parts:
 - [Makefile](Makefile) automates devops tasks like test, package and publish to [crates.io](https://crates.io/) which could be performed either on-host or in-docker
 - [docker](docker) folder holds docker related routine
 - [aws-codebuild](aws-codebuild) folder consists of files that describes AWS CodeBuild based CI/CD pipelines
-- [ext](ext) folder is a [git-subrepo][d003158e] of shared [library](https://github.com/evernym/jenkins-shared/tree/devops-shared) which provides makefile based approach of devops tasks automation. Please check its [README.md](ext/README.md) for more information.
+- [ext](ext) folder is a [git-subrepo][d003158e] of shared [library](https://github.com/sovrin-foundation/jenkins-shared/tree/devops-shared) which provides makefile based approach of devops tasks automation. Please check its [README.md](ext/README.md) for more information.
 
   [d003158e]: https://github.com/ingydotnet/git-subrepo "git-subrepo"
 
@@ -14,7 +14,7 @@ Aurora wallet is shipped with dockerfiles for ubuntu [xenial](docker/ci/xenial/D
 
 ## CI pipeline
 
-CI pipeline is described by [Jenkinsfile.ci](aws-codebuild/Jenkinsfile.ci). It uses [Jenkins shared library](https://github.com/evernym/jenkins-shared/tree/aws-codebuild) API to build projects on [AWS CodeBuild](https://aws.amazon.com/codebuild/). CI utilizes docker containers from [docker/ci](docker/ci) folder to run tests on both ubuntu `xenial` and `centos7`.
+CI pipeline is described by [Jenkinsfile.ci](aws-codebuild/Jenkinsfile.ci). It uses [Jenkins shared library](https://github.com/sovrin-foundation/jenkins-shared/tree/aws-codebuild) API to build projects on [AWS CodeBuild](https://aws.amazon.com/codebuild/). CI utilizes docker containers from [docker/ci](docker/ci) folder to run tests on both ubuntu `xenial` and `centos7`.
 
 CI pipeline stages:
 - clone the GitHub repository
@@ -29,23 +29,23 @@ CI pipeline stages:
 
 ## CD pipeline
 
-CD pipeline is described by [Jenkinsfile.cd](aws-codebuild/Jenkinsfile.cd). It uses [Jenkins shared library](https://github.com/evernym/jenkins-shared/tree/aws-codebuild) API as well and generates the following artifacts:
+CD pipeline is described by [Jenkinsfile.cd](aws-codebuild/Jenkinsfile.cd). It uses [Jenkins shared library](https://github.com/sovrin-foundation/jenkins-shared/tree/aws-codebuild) API as well and generates the following artifacts:
 - debian package for ubuntu `xenial`
 - zip archive with shared and dynamic libraries for android on the following architectures: `arm`, `armv7`, `arm64`, `x86`, `x86_64`
 
 CD pipeline stages:
 - clone the GitHub repository
 - resolve the following parameters:
   - current source version from [Cargo.toml](../libsovtoken/Cargo.toml)
-  - last revision number among the debian packages with the same source version in [Evernym debian repo](https://repo.corp.evernym.com/deb/dists/evernym-agency-dev-ubuntu/)
+  - last revision number among the debian packages with the same source version in [Sovrin debian repo](https://repo.sovrin.com/deb/dists/sovrin-agency-dev-ubuntu/)
 - evaluate new debian package version basing on source version, last revision number and current build number
 - upload current HEAD as zip archive to AWS S3 bucket used by CodeBuild project
 - launch a CodeBuild project using the same `AwsCodeBuildHelper.build` API as CI does. The main difference here is that CD pipeline doesn't build an image for AWS ECR repository assuming that it has been done previously by CI pipeline. Its sub-stages:
   - (optional) create/update CodeBuild project (TODO shouldn't do that in any case assuming CI did that)
   - run the CodeBuild project to perform debian packaging
   - download logs
 - archive logs
-- upload created debian package to [Evernym debian repo](https://repo.corp.evernym.com/deb/dists/evernym-agency-dev-ubuntu/)
+- upload created debian package to [Sovrin debian repo](https://repo.sovrin.com/deb/dists/sovrin-agency-dev-ubuntu/)
 
 ## Makefile
 
@@ -91,7 +91,7 @@ Each target could be run in two ways - with or without `_in_docker` postfix: e.g
 | `ANDROID_ARCHS`     |`package_android`  | target architectures for android builds  |`arm`, `armv7`, `arm64`, `x86`, `x86_64`|
 | `CRATE_P_VERSION`   | all  | if set overwrites `version` field of `[package]` section in [Cargo.toml](../libsovtoken/Cargo.toml) before crate publishing| not set  |
 | `CARGO_LOGIN_TOKEN` | all  | token to perform `cargo login` during crate publishing  |not set|
-| `DOCKER_NAME`       | all  | name of the image built by `image_lst_ci` target |`evernym/libsovtoken`|
+| `DOCKER_NAME`       | all  | name of the image built by `image_lst_ci` target |`sovrin/libsovtoken`|
 |  `DOCKER_TAG`       | all  | tag of the image built by `image_lst_ci` target| `<VERSION>-$(OSNAME)-ci`, where `VERSION` is value of `CI_ENV_VERSION` environment variable in accordant dockerfile     |
 
 Please refer to [ext/README.md](ext/README.md) for list of environment variables inherited from there

devops/android_upload.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+set -x
+
+if [ "$1" = "--help" ] ; then
+  echo "Usage: <version> <key> <branchName> <number> <artifact> <artifact_name>"
+  return
+fi
+
+version="$1"
+key="$2"
+branchName="$3"
+buildNumber="$4"
+artifact="$5"
+file="$6"
+
+[ -z $version ] && exit 1
+[ -z $key ] && exit 2
+[ -z $branchName ] && exit 3
+[ -z $buildNumber ] && exit 4
+[ -z $artifact ] && exit 5
+[ -z $file ] && exit 6
+
+ssh -v -oStrictHostKeyChecking=no -i $key repo@$SOVRIN_REPO_HOST mkdir -p /var/repository/repos/android/${artifact}/${branchName}/${version}-${buildNumber}
+
+cat <<EOF | sftp -v -oStrictHostKeyChecking=no -i $key repo@$SOVRIN_REPO_HOST
+cd /var/repository/repos/android/${artifact}/${branchName}/$version-$buildNumber
+put -r ${file}
+ls -l /var/repository/repos/android/${artifact}/${branchName}/$version-$buildNumber
+EOF