This repository has been archived by the owner on Nov 4, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #281 from galasa-dev/mcobbett-detect-secrets-fix
etcd client upgraded, gson level upgraded
- Loading branch information
Showing
4 changed files
with
330 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,206 @@ | ||
| #! /usr/bin/env bash | ||
|
|
||
| # | ||
| # Copyright contributors to the Galasa project | ||
| # | ||
| # SPDX-License-Identifier: EPL-2.0 | ||
| # | ||
| #----------------------------------------------------------------------------------------- | ||
| # | ||
| # Objectives: Calculate transient dependencies so we can include them in the bnd bundle | ||
| # | ||
| #----------------------------------------------------------------------------------------- | ||
|
|
||
| # Where is this script executing from ? | ||
| BASEDIR=$(dirname "$0");pushd $BASEDIR 2>&1 >> /dev/null ;BASEDIR=$(pwd);popd 2>&1 >> /dev/null | ||
| # echo "Running from directory ${BASEDIR}" | ||
| export ORIGINAL_DIR=$(pwd) | ||
| cd "${BASEDIR}" | ||
|
|
||
| cd "${BASEDIR}/.." | ||
| WORKSPACE_DIR=$(pwd) | ||
| cd "${BASEDIR}" | ||
|
|
||
| #----------------------------------------------------------------------------------------- | ||
| # | ||
| # Set Colors | ||
| # | ||
| #----------------------------------------------------------------------------------------- | ||
| bold=$(tput bold) | ||
| underline=$(tput sgr 0 1) | ||
| reset=$(tput sgr0) | ||
| red=$(tput setaf 1) | ||
| green=$(tput setaf 76) | ||
| white=$(tput setaf 7) | ||
| tan=$(tput setaf 202) | ||
| blue=$(tput setaf 25) | ||
|
|
||
| #----------------------------------------------------------------------------------------- | ||
| # | ||
| # Headers and Logging | ||
| # | ||
| #----------------------------------------------------------------------------------------- | ||
| underline() { printf "${underline}${bold}%s${reset}\n" "$@" ;} | ||
| h1() { printf "\n${underline}${bold}${blue}%s${reset}\n" "$@" ;} | ||
| h2() { printf "\n${underline}${bold}${white}%s${reset}\n" "$@" ;} | ||
| debug() { printf "${white}%s${reset}\n" "$@" ;} | ||
| info() { printf "${white}➜ %s${reset}\n" "$@" ;} | ||
| success() { printf "${green}✔ %s${reset}\n" "$@" ;} | ||
| error() { printf "${red}✖ %s${reset}\n" "$@" ;} | ||
| warn() { printf "${tan}➜ %s${reset}\n" "$@" ;} | ||
| bold() { printf "${bold}%s${reset}\n" "$@" ;} | ||
| note() { printf "\n${underline}${bold}${blue}Note:${reset} ${blue}%s${reset}\n" "$@" ;} | ||
|
|
||
| #----------------------------------------------------------------------------------------- | ||
| # Functions | ||
| #----------------------------------------------------------------------------------------- | ||
| function usage { | ||
| info "Syntax: calculate-dependencies.sh [OPTIONS]" | ||
| cat << EOF | ||
| Options are: | ||
| <none> | ||
| Environment variables used: | ||
| <none> | ||
| EOF | ||
| } | ||
|
|
||
|
|
||
| function create_temp_project { | ||
| h2 "Creating a temporary project so we can calculate the dependencies it has" | ||
| mkdir -p ${BASEDIR}/temp | ||
| cat << EOF > ${BASEDIR}/temp/pom.xml | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>dev.galasa</groupId> | ||
| <artifactId>dependency-finder</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <packaging>jar</packaging> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.etcd</groupId> | ||
| <artifactId>jetcd-core</artifactId> | ||
| <version>0.5.9</version> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> | ||
| EOF | ||
| success "OK" | ||
| } | ||
|
|
||
|
|
||
| function list_transient_dependencies_using_maven { | ||
|
|
||
| cd ${BASEDIR}/temp | ||
| h2 "This might be good in the bnd file of the cps extension:" | ||
| mvn dependency:tree | sed "s/\[INFO\]//g" | grep -v "BUILD SUCCESS" | grep -v "\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-" | grep -v "Total time" | grep -v "Finished at" \ | ||
| | grep -v "Scanning for projects" | grep -v "Building dependency-finder" | grep -v "maven-dependency-plugin" | grep -v "dev.galasa:dependency-finder" \ | ||
| | grep -v "^[ \t]*$" | sed "s/^[|+ \t\\\-]*//" | sed "s/:compile.*//g" | sed "s/:runtime.*//g" \ | ||
| | cut -d ':' -f2,4 \ | ||
| | sed "s/:/-/g" | sed "s/$/.jar; lib:=true,\\\/" | sed "s/^/ /" \ | ||
| | sort | uniq \ | ||
| > $BASEDIR/temp/dependencies_maven.txt | ||
|
|
||
| info "See $BASEDIR/temp/dependencies_maven.txt" | ||
| success "OK" | ||
|
|
||
|
|
||
| h2 "This might be good in the gradle file of the cps extension:" | ||
| mvn dependency:tree | sed "s/\[INFO\]//g" | grep -v "BUILD SUCCESS" | grep -v "\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-" | grep -v "Total time" | grep -v "Finished at" \ | ||
| | grep -v "Scanning for projects" | grep -v "Building dependency-finder" | grep -v "maven-dependency-plugin" | grep -v "dev.galasa:dependency-finder" \ | ||
| | grep -v "^[ \t]*$" | sed "s/^[|+ \t\\\-]*//" | sed "s/:compile.*//g" | sed "s/:runtime.*//g" \ | ||
| | sed "s/^/ implementation ('/" \ | ||
| | sed "s/$/')/" \ | ||
| | sed "s/:jar:/:/" \ | ||
| | sort | uniq \ | ||
| > $BASEDIR/temp/dependencies_maven_imports.txt | ||
|
|
||
| info "See $BASEDIR/temp/dependencies_maven_imports.txt" | ||
| success "OK" | ||
|
|
||
|
|
||
| # mvn dependency:tree | sed "s/\[INFO\]//g" | grep -v "BUILD SUCCESS" | grep -v "\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-" | grep -v "Total time" | grep -v "Finished at" \ | ||
| # | grep -v "Scanning for projects" | grep -v "Building dependency-finder" | grep -v "maven-dependency-plugin" | grep -v "dev.galasa:dependency-finder" | ||
| } | ||
|
|
||
|
|
||
|
|
||
| function list_transient_dependencies_using_gradle { | ||
| cd ${BASEDIR}/*parent | ||
| h2 "This might be good in the bnd file of the cps extension:" | ||
| gradle dev.galasa.cps.etcd:dependencies --configuration runtimeClasspath > $BASEDIR/temp/dependencies.txt | ||
| sed '/Indicates repeated occurrences/,$d' $BASEDIR/temp/dependencies.txt > $BASEDIR/temp/dependencies2.txt | ||
| cd ${BASEDIR}/temp | ||
| csplit $BASEDIR/temp/dependencies2.txt "/Runtime classpath of source set/" > /dev/null | ||
| mv $BASEDIR/temp/xx01 $BASEDIR/temp/dependencies3.txt | ||
| cat $BASEDIR/temp/dependencies3.txt | grep -v "runtimeClasspath - Runtime classpath of source set" \ | ||
| | sed "s/^[+ \\|\-]*//" \ | ||
| | cut -d ':' -f2,3 \ | ||
| | sed "s/:[a-zA-Z0-9.\\-]* -> /:/" \ | ||
| | sed "s/ [(][*][)]$//" \ | ||
| | sed "s/:/-/" \ | ||
| | grep -v "^[ \t]*$" \ | ||
| | sed "s/$/.jar/" \ | ||
| | sed "s/^/ /" \ | ||
| | sed "s/$/; lib:=true,\\\/" \ | ||
| | grep -v "dev.galasa" \ | ||
| | grep -v "bcel" \ | ||
| | grep -v "commons-io-.*.jar" \ | ||
| | grep -v "commons-lang3-.*.jar" \ | ||
| | grep -v "commons-logging-" \ | ||
| | grep -v "easymock-.*.jar" \ | ||
| | grep -v "log4j-api-.*.jar" \ | ||
| | grep -v "log4j-core-.*.jar" \ | ||
| | grep -v "log4j-slf4j-impl-.*.jar" \ | ||
| | grep -v "org.apache.felix.bundlerepository-.*.jar" \ | ||
| | grep -v "org.osgi" \ | ||
| | sort | uniq \ | ||
| > $BASEDIR/temp/dependencies_gradle.txt | ||
| # cat $BASEDIR/temp/dependencies_gradle.txt | ||
| # | ||
| rm $BASEDIR/temp/dependencies2.txt $BASEDIR/temp/dependencies3.txt | ||
| info "See $BASEDIR/temp/dependencies_gradle.txt" | ||
| success "OK" | ||
|
|
||
| cd ${BASEDIR}/*parent | ||
| h2 "This might be good in the gradle file of the cps extension:" | ||
| gradle dev.galasa.cps.etcd:dependencies --configuration runtimeClasspath > $BASEDIR/temp/dependencies.txt | ||
| sed '/Indicates repeated occurrences/,$d' $BASEDIR/temp/dependencies.txt > $BASEDIR/temp/dependencies2.txt | ||
| cd ${BASEDIR}/temp | ||
| csplit $BASEDIR/temp/dependencies2.txt "/Runtime classpath of source set/" > /dev/null | ||
| mv $BASEDIR/temp/xx01 $BASEDIR/temp/dependencies3.txt | ||
| cat $BASEDIR/temp/dependencies3.txt | grep -v "runtimeClasspath - Runtime classpath of source set" \ | ||
| | sed "s/^[+ \\|\-]*//" \ | ||
| | sed "s/:[a-zA-Z0-9.\\-]* -> /:/" \ | ||
| | sed "s/ [(][*][)]$//" \ | ||
| | grep -v "dev.galasa" \ | ||
| | grep -v "bcel" \ | ||
| | grep -v "commons-io" \ | ||
| | grep -v "commons-lang3" \ | ||
| | grep -v "commons-logging" \ | ||
| | grep -v "easymock" \ | ||
| | grep -v "org.apache.felix.bundlerepository" \ | ||
| | grep -v "org.osgi" \ | ||
| | sed "s/^/ implementation('/" \ | ||
| | sed "s/$/')/" \ | ||
| | grep -v " implementation('')" \ | ||
| | sort | uniq \ | ||
| > $BASEDIR/temp/dependencies_gradle_imports.txt | ||
|
|
||
| # | grep -v "log4j-api" \ | ||
| # | grep -v "log4j-core" \ | ||
| # | grep -v "log4j-slf4j-impl" \ | ||
|
|
||
| info "See $BASEDIR/temp/dependencies_gradle_imports.txt" | ||
| success "OK" | ||
| } | ||
|
|
||
| create_temp_project | ||
| # list_transient_dependencies_using_maven | ||
| list_transient_dependencies_using_gradle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| # The cps etcd extension | ||
|
|
||
| This extension provides access to an implementation of a CPS store based based on remotely connecting to an etcd server. | ||
|
|
||
|
|
||
| ## How the packaging works | ||
|
|
||
| This extension is perhaps slightly strange in that it doesn't every want to go out to maven central, so any dependencies it needs to run | ||
| must be included in the osgi bundle. | ||
|
|
||
| The extension therefore needs to get hold of the transitive dependencies and include them in a 'fat jar' bundle. | ||
|
|
||
| If you look at the built bundle (in the `galasa-extensions-parent/dev.galasa.cps.etcd/build/libs` folder) and unpack the jar, you will see that it packs up the dependndency jars in the root of the bundle jar. | ||
|
|
||
| There are 2 parts to packaging this extension: | ||
| - The `build.gradle` file downloads everything that it needed to compile, but it also downloads all the transitive dependencies | ||
| - The `bnd.bnd` file which controls which jars are included in the 'fat jar'. | ||
|
|
||
| The gradle plugin `biz.aQute.bnd.builder` is used to do the packing-up of the dependency jars, based on the content of the `bnd.bnd` file. | ||
|
|
||
| ## How to upgrade the dependencies | ||
|
|
||
| - Remove the dependencies from the `build.gradle` file which are only there to make sure things are downloaded which can be bundled into the fat jar. | ||
| - Upgrade what you need to in the `build.gradle`. For example, bump the value for the `io.etcd:jetcd-core` bundle might be what you are trying to do. | ||
| - Run the `calculate-transitive-dependencies.sh` script (in the root of this module). This script calculates the transitive depdendencies of everything which is in the build.gradle file. That's why we need to clean the `build.gradle` to contain only the minimum to start with. | ||
| - Move the contents of `temp/dependencies_gradle_imports.txt` to the `build.gradle` file. | ||
| - Move the contents of `temp/dependencies_gradle.txt` into the `bnd.bnd` file. | ||
|
|
||
| This should result in a long list of jars which are first downloaded, then packaged into the extension bundle jar. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters