+
+ 
+
Private File Upload
+ ++ Build on Spring Cloud & AWS S3 +
+ + + + + +## Table of Contents + +* [About the Project](#about-the-project) + * [Built With](#built-with) +* [Getting Started](#getting-started) + * [Prerequisites](#prerequisites) + * [Installation](#installation) +* [Usage](#usage) +* [Contact](#contact) +* [Acknowledgements](#acknowledgements) + + + + +## About The Project + +
+ 
+
+
+
+🪣 Create a bucket
+ +1. Navigate to the _Spaces_ section +2. Click on _New Space_ +3. Enter the name and click _Submit_ +4. A message should pop up to indicate success + +
+
+
+🗂 Upload a File
+ +1. Navigate to the _Spaces_ section +2. Select _Details_ on the target Space/Bucket +3. Click on _Upload File_ +4. Pick our file, provide a name and click _Submit_ +5. A message should pop up to indicate success +
+
+
+🔎 List all Objects in a Bucket
+ +1. Navigate to the _Spaces_ section +2. Select _Details_ on the target Space/Bucket +3. You see a list of all objects stored in the bucket +
+
+
+🌐 Get an Object's URL
+ +1. Navigate to the _Spaces_ section +2. Select _Details_ on the target Space/Bucket +3. Select _Download_ on the target object +4. The object's URL shall be opened in a new tab +
+
+
+📢 Make an object public
+ +1. Navigate to the _Spaces_ section +2. Select _Details_ on the target Space/Bucket +3. Select _Make Public_ on the target object +4. A message should pop up to indicate success +
+
+
+🤫 Make an Object private
+ +1. Navigate to the _Spaces_ section +2. Select _Details_ on the target Space/Bucket +3. Select _Make Private_ on the target object +4. A message should pop up to indicate success +
+
+
+🔥 Delete an Object
+ +1. Navigate to the _Spaces_ section +2. Select _Details_ on the target Space/Bucket +3. Select _Delete_ on the target object +4. The list of objects should reload without the deleted one +
+
+
+☄️ Delete a Bucket
+ +1. Navigate to the _Spaces_ section +2. Select _Delete_ on the target Space/Bucket +3. The list of buckets should reload without the deleted one +
+
+
+👾 Generate a pre-signed URL
+ +1. Navigate to the _Spaces_ section +2. Select _Details_ on the target Space/Bucket +3. Select _Magic Link_ on the target object +4. A message should pop up, containing a pre-signed URL for that object (which is valid for 15 minutes) +
+
+
+
+## Contact
+
+Joshua Görner - [jgoerner](https://www.linkedin.com/in/jgoerner/) - joshua.goerner[at]gmail.com
+
+
+
+## Acknowledgements
+* [O. Drew](https://github.com/othneildrew/Best-README-Template) - nice GH Readme template
+* [Hatchful](https://hatchful.shopify.com/) - Easy Logo Generation
\ No newline at end of file
diff --git a/aws/s3/build.gradle b/aws/s3/build.gradle
new file mode 100644
index 000000000..7d1b47fd1
--- /dev/null
+++ b/aws/s3/build.gradle
@@ -0,0 +1,41 @@
+plugins {
+ id 'org.springframework.boot' version '2.4.2'
+ id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+ id 'java'
+}
+
+group = 'io.jgoerner'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = '11'
+
+repositories {
+ mavenCentral()
+}
+
+ext {
+ // set('springCloudVersion', "Hoxton.SR9")
+ set('springCloudVersion', "Finchley.SR1")
+}
+
+
+dependencies {
+ annotationProcessor 'org.projectlombok:lombok'
+ developmentOnly 'org.springframework.boot:spring-boot-devtools'
+ implementation 'org.springframework.boot:spring-boot-starter-web'
+ implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+ implementation 'org.springframework.cloud:spring-cloud-starter-aws'
+ implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+ implementation 'org.projectlombok:lombok:1.18.16'
+ runtimeOnly 'com.h2database:h2'
+ testImplementation 'org.springframework.boot:spring-boot-starter-test'
+}
+
+dependencyManagement {
+ imports {
+ mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+ }
+}
+
+test {
+ useJUnitPlatform()
+}
diff --git a/spring-cloud/sleuth-upstream-service/settings.gradle b/aws/s3/data/.gitkeep
similarity index 100%
rename from spring-cloud/sleuth-upstream-service/settings.gradle
rename to aws/s3/data/.gitkeep
diff --git a/aws/s3/gradle/wrapper/gradle-wrapper.jar b/aws/s3/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..e708b1c02
Binary files /dev/null and b/aws/s3/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/aws/s3/gradle/wrapper/gradle-wrapper.properties b/aws/s3/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..d5ad2ff8f
--- /dev/null
+++ b/aws/s3/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Jan 04 22:38:53 CET 2021
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/spring-cloud/sleuth-upstream-service/gradlew b/aws/s3/gradlew
similarity index 74%
rename from spring-cloud/sleuth-upstream-service/gradlew
rename to aws/s3/gradlew
index 4453ccea3..4f906e0c8 100755
--- a/spring-cloud/sleuth-upstream-service/gradlew
+++ b/aws/s3/gradlew
@@ -1,5 +1,21 @@
#!/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
@@ -28,16 +44,16 @@ 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=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
-warn ( ) {
+warn () {
echo "$*"
}
-die ( ) {
+die () {
echo
echo "$*"
echo
@@ -66,6 +82,7 @@ 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
@@ -109,10 +126,11 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# 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
@@ -138,35 +156,30 @@ if $cygwin ; then
else
eval `echo args$i`="\"$arg\""
fi
- i=$((i+1))
+ 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" ;;
+ 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 ( ) {
+save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
-APP_ARGS=$(save "$@")
+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"
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
exec "$JAVACMD" "$@"
diff --git a/aws/s3/gradlew.bat b/aws/s3/gradlew.bat
new file mode 100644
index 000000000..ac1b06f93
--- /dev/null
+++ b/aws/s3/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/aws/s3/images/logo.png b/aws/s3/images/logo.png
new file mode 100644
index 000000000..91f0001c8
Binary files /dev/null and b/aws/s3/images/logo.png differ
diff --git a/aws/s3/images/usage.gif b/aws/s3/images/usage.gif
new file mode 100644
index 000000000..5ba964699
Binary files /dev/null and b/aws/s3/images/usage.gif differ
diff --git a/aws/s3/settings.gradle b/aws/s3/settings.gradle
new file mode 100644
index 000000000..5b04ce064
--- /dev/null
+++ b/aws/s3/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 's3'
diff --git a/aws/s3/src/main/java/io/jgoerner/s3/S3Application.java b/aws/s3/src/main/java/io/jgoerner/s3/S3Application.java
new file mode 100644
index 000000000..989fcc0b1
--- /dev/null
+++ b/aws/s3/src/main/java/io/jgoerner/s3/S3Application.java
@@ -0,0 +1,38 @@
+package io.jgoerner.s3;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafProperties;
+import org.springframework.cloud.aws.autoconfigure.context.ContextInstanceDataAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.thymeleaf.templateresolver.FileTemplateResolver;
+import org.thymeleaf.templateresolver.ITemplateResolver;
+
+@SpringBootApplication(exclude = ContextInstanceDataAutoConfiguration.class)
+public class S3Application {
+
+ private final ThymeleafProperties properties;
+
+ @Value("${spring.thymeleaf.templates_root:}")
+ private String templatesRoot;
+
+ public S3Application(ThymeleafProperties properties) {
+ this.properties = properties;
+ }
+
+ public static void main(String[] args) {
+ SpringApplication.run(S3Application.class, args);
+ }
+
+ @Bean
+ public ITemplateResolver defaultTemplateResolver() {
+ FileTemplateResolver resolver = new FileTemplateResolver();
+ resolver.setSuffix(properties.getSuffix());
+ resolver.setPrefix(templatesRoot);
+ resolver.setTemplateMode(properties.getMode());
+ resolver.setCacheable(properties.isCache());
+ return resolver;
+ }
+
+}
diff --git a/aws/s3/src/main/java/io/jgoerner/s3/adapter/in/RestApi.java b/aws/s3/src/main/java/io/jgoerner/s3/adapter/in/RestApi.java
new file mode 100644
index 000000000..1f7e9c8a8
--- /dev/null
+++ b/aws/s3/src/main/java/io/jgoerner/s3/adapter/in/RestApi.java
@@ -0,0 +1,128 @@
+package io.jgoerner.s3.adapter.in;
+
+import io.jgoerner.s3.application.port.in.object.*;
+import io.jgoerner.s3.application.port.in.space.*;
+import io.jgoerner.s3.domain.Object;
+import io.jgoerner.s3.domain.ObjectPartial;
+import io.jgoerner.s3.domain.Space;
+import io.jgoerner.s3.domain.SpacePartial;
+import lombok.SneakyThrows;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.net.URL;
+import java.util.List;
+import java.util.Optional;
+
+@RestController
+@RequestMapping("api")
+@Log4j2
+public class RestApi {
+
+ private final CreateSpace spaceCreator;
+ private final GetAllSpaces allSpaceGetter;
+ private final RemoveSpace spaceRemover;
+ private final GetAllObjects allObjectsInSpaceGetter;
+ private final UploadObject objectUploader;
+ private final UpdateObject objectUpdater;
+ private final RemoveObject objectDeleter;
+ private final ForceRemoveSpace forceSpaceRemover;
+ private final CreateLink linkCreator;
+ private final SetTTL ttlUpdater;
+ private final RemoveTTL ttlRemover;
+
+ public RestApi(
+ CreateSpace spaceCreator,
+ GetAllSpaces allSpaceGetter,
+ RemoveSpace spaceRemover,
+ GetAllObjects allObjectsInSpaceGetter,
+ UploadObject objectUploader,
+ UpdateObject objectUpdater,
+ RemoveObject objectDeleter,
+ ForceRemoveSpace forceSpaceRemover,
+ CreateLink linkCreator,
+ SetTTL ttlUpdater,
+ RemoveTTL ttlRemover) {
+ this.spaceCreator = spaceCreator;
+ this.allSpaceGetter = allSpaceGetter;
+ this.spaceRemover = spaceRemover;
+ this.allObjectsInSpaceGetter = allObjectsInSpaceGetter;
+ this.objectUploader = objectUploader;
+ this.objectUpdater = objectUpdater;
+ this.objectDeleter = objectDeleter;
+ this.forceSpaceRemover = forceSpaceRemover;
+ this.linkCreator = linkCreator;
+ this.ttlUpdater = ttlUpdater;
+ this.ttlRemover = ttlRemover;
+ }
+
+ @GetMapping("/space")
+ List