Skip to content

Commit

Permalink
#16 #23 #24 Resolve issues
Browse files Browse the repository at this point in the history
  • Loading branch information
binchoo committed Sep 4, 2022
1 parent 3e492e5 commit 17558fe
Show file tree
Hide file tree
Showing 16 changed files with 865 additions and 221 deletions.
33 changes: 11 additions & 22 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,33 +1,22 @@
main:

paimonganyu-skill-prod: build-paimonganyu-skill
cd sam/paimonganyu-skill; sam deploy --guided \
--stack-name paimonganyu-skill \
--profile serverless \
--region ap-northeast-2 \
--parameter-overrides Env=prod
paimonganyu-test: build-paimonganyu
cd PaimonGanyu; ./gradlew -Penv=test paimonganyu-app:paimonganyu:sD

paimonganyu-prod: build-paimonganyu
cd sam/paimonganyu; sam deploy --guided \
--stack-name paimonganyu \
--profile serverless \
--region ap-northeast-2 \
--parameter-overrides Env=prod
paimonganyu-skill-test: build-paimonganyu-skill
cd PaimonGanyu; ./gradlew -Penv=test paimonganyu-app:paimonganyu-skill:sD

paimonganyu-test: build-paimonganyu
cd sam/paimonganyu; sam deploy --guided \
--stack-name paimonganyu-test
--profile serverless \
--region ap-northeast-1 \
--parameter-overrides Env=test
paimonganyu: build-paimonganyu
cd PaimonGanyu; ./gradlew -Penv=prod paimonganyu-app:paimonganyu:sD

paimonganyu-skill: build-paimonganyu-skill
cd PaimonGanyu; ./gradlew -Penv=prod paimonganyu-app:paimonganyu-skill:sD

build-paimonganyu:
cd sam/paimonganyu; sam build --profile serverless
cd PaimonGanyu; ./gradlew -Pversion=$(version) -x test clean :paimonganyu-app:paimonganyu:copyZipNoTomcat
cd PaimonGanyu; ./gradlew paimonganyu-app:paimonganyu:sB

build-paimonganyu-skill:
cd sam/paimonganyu-skill; sam build --profile serverless
cd PaimonGanyu; ./gradlew -Pversion=$(version) -x test clean :paimonganyu-app:paimonganyu-skill:copyBootJar
cd PaimonGanyu; ./gradlew paimonganyu-app:paimonganyu-skill:sB

localtest:
cd PaimonGanyu; ./gradlew -PlocalTest=true clean test
23 changes: 23 additions & 0 deletions PaimonGanyu/paimonganyu-app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
import java.util.stream.Collectors

def samBuildDir(Project project, String stackName) {
'../'.repeat(project.depth + 1) + "sam/${stackName}/.aws-sam/build"
}

def paramString(Map<String, String> params) {
def strings = []
if (params != null) {
for (Map.Entry<String, String> param : params.entrySet())
strings.add(param.getKey() + "=" + param.getValue())
}
strings.stream().collect(Collectors.joining(","))
}

def deployCommand(project, region, stackName, profile, params) {
def script = "/tmp/${stackName}.sh"
def samDeploy = """cat ${script}; rm ${script}; cd ${project.projectDir};
|sam deploy --guided
| --region ${region}
| --stack-name ${stackName}
| --profile ${profile}
| --parameter-overrides ${paramString(params)}""".stripMargin().replace("\n", "")
def openTerminal = "echo \"${samDeploy}\" > ${script}; chmod +x ${script}; open -a Terminal ${script}"
return openTerminal
}
File renamed without changes.
28 changes: 20 additions & 8 deletions PaimonGanyu/paimonganyu-app/paimonganyu-skill/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,25 @@ bootJar {
archiveBaseName='paimonganyu-skill'
}

task copyBootJar(type: Copy) {
def dest = samBuildDir(project, 'paimonganyu-skill')
from bootJar
into(dest)
doLast {
println "$project.name:$name has moved bootJar into $dest"
}
def profile() {
[prod: 'pgprod', test: 'pgtest'].get(project.findProperty('env'))
}

def params() {
['Env': project.findProperty('env')]
}

task samBuild(type: Exec) {
dependsOn bootJar
test.enabled = false
workingDir = projectDir
commandLine = ['sam', 'build']
}

task samDeploy(type: Exec) {
def command = deployCommand(this, "ap-northeast-2", "paimonganyu-skill", profile(), params())
workingDir = projectDir
commandLine = ['bash', '-c', command]
}

task stopRunningDynamoDBContainer(type: Exec) {
Expand Down Expand Up @@ -56,4 +68,4 @@ test {
excludeTestsMatching("org.binchoo.paimonganyu.integration.hoyopass.SecuredHoyopassRegistryLocalSystemTest")
}
}
}
}
185 changes: 185 additions & 0 deletions PaimonGanyu/paimonganyu-app/paimonganyu-skill/gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
#!/usr/bin/env sh

#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn () {
echo "$*"
}

die () {
echo
echo "$*"
echo
exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

exec "$JAVACMD" "$@"
Loading

0 comments on commit 17558fe

Please sign in to comment.