From ae1bd29c81c5f2887d75aa8a2607dd8e9deefc4a Mon Sep 17 00:00:00 2001 From: Alex G Date: Tue, 28 Jun 2022 10:32:05 -0400 Subject: [PATCH 1/5] Update version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 09039d1..8d5bccc 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ plugins { apply plugin: 'io.spring.dependency-management' group 'dev.salmonllama' -version '2.0.5' +version '2.1.1' sourceCompatibility = 16 From d940a61d38670809c064bcefaed570c00ff2b650 Mon Sep 17 00:00:00 2001 From: Alex G Date: Tue, 28 Jun 2022 10:44:50 -0400 Subject: [PATCH 2/5] Update dockerfile for gcp creds. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 5ba46ce..cf1b1a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,7 @@ FROM openjdk:16 EXPOSE 8080 ENV ENVIRONMENT=PROD +ENV GOOGLE_APPLICATION_CREDENTIALS=/root/.fsbot/google_application_credentials.json RUN mkdir /app From 8d1721e2f106ba5cb5c17eb4e3f7cb6e2c321871 Mon Sep 17 00:00:00 2001 From: Alex G Date: Tue, 28 Jun 2022 10:54:18 -0400 Subject: [PATCH 3/5] Update dockerfile for gcp creds v2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cf1b1a7..a869767 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ FROM openjdk:16 EXPOSE 8080 ENV ENVIRONMENT=PROD -ENV GOOGLE_APPLICATION_CREDENTIALS=/root/.fsbot/google_application_credentials.json +ENV GOOGLE_APPLICATION_CREDENTIALS=~/root/.fsbot/google_application_credentials.json RUN mkdir /app From 38647ef28d94b0bb3dadbc33947268aafeb9d70e Mon Sep 17 00:00:00 2001 From: Alex G Date: Tue, 28 Jun 2022 11:06:52 -0400 Subject: [PATCH 4/5] Update dockerfile/cred url for gcp creds v3 --- Dockerfile | 2 +- src/main/java/dev/salmonllama/fsbot/config/SecretManager.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a869767..cf1b1a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ FROM openjdk:16 EXPOSE 8080 ENV ENVIRONMENT=PROD -ENV GOOGLE_APPLICATION_CREDENTIALS=~/root/.fsbot/google_application_credentials.json +ENV GOOGLE_APPLICATION_CREDENTIALS=/root/.fsbot/google_application_credentials.json RUN mkdir /app diff --git a/src/main/java/dev/salmonllama/fsbot/config/SecretManager.java b/src/main/java/dev/salmonllama/fsbot/config/SecretManager.java index 00226ac..cec40ff 100644 --- a/src/main/java/dev/salmonllama/fsbot/config/SecretManager.java +++ b/src/main/java/dev/salmonllama/fsbot/config/SecretManager.java @@ -5,7 +5,8 @@ import java.io.IOException; import com.google.cloud.secretmanager.v1.SecretManagerServiceClient; public enum SecretManager { - DISCORD_TOKEN ("projects/fashionscapers-212707/secrets/fs_discord_token/versions/1"), + // TODO: Change this to adapt to env + DISCORD_TOKEN ("projects/fashionscapers-212707/secrets/fs_discord_token_prod/versions/1"), IMGUR_ID ("projects/fashionscapers-212707/secrets/fs_imgur_client_id/versions/1"), IMGUR_BEARER ("projects/fashionscapers-212707/secrets/fs_imgur_bearer_token/versions/1") ; From 1f1e5c6cebd306f645eb431999bf321380aef3ab Mon Sep 17 00:00:00 2001 From: Alex G Date: Tue, 28 Jun 2022 11:13:02 -0400 Subject: [PATCH 5/5] Added discord_name to insert statement --- .../fsbot/database/controllers/OutfitController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java index 6d0c8ef..f467159 100644 --- a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java +++ b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java @@ -232,13 +232,14 @@ public class OutfitController { FSDB.get().insert( "INSERT INTO " + - "outfits('id', 'link', 'submitter', 'tag', 'meta', 'created', 'updated', 'deleted', 'featured', 'display_count', 'delete_hash') " + - "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + "outfits('id', 'link', 'submitter', 'tag', 'meta', 'discord_name', 'created', 'updated', 'deleted', 'featured', 'display_count', 'delete_hash') " + + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", outfit.getId(), outfit.getLink(), outfit.getSubmitter(), outfit.getTag(), outfit.getMeta(), + outfit.getDiscordName(), outfit.getCreated(), outfit.getUpdated(), outfit.isDeleted(),