New options and secrets to deploy

arumie · Mar 2, 2024 · a05e745 · a05e745
1 parent da482ad
commit a05e745
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 54 deletions.
diff --git a/.github/workflows/google-cloudrun-docker.yml b/.github/workflows/google-cloudrun-docker.yml
@@ -100,15 +100,28 @@ jobs:
           docker push "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{env.GAR_REPO}}/${{ env.SERVICE }}:${{ github.sha }}"
 
       # END - Docker auth and build
+      - name: Approve deployment
+        uses: trstringer/manual-approval@v1
+        with:
+          secret: ${{ github.TOKEN }}
+          approvers: arumie
+          minimum-approvals: 1
+          issue-title: "Deploying ${{ env.SERVICE }}:${{ github.sha }} to Cloud Run"
+          issue-body: "Please approve or deny the deployment"
+          exclude-workflow-initiator-as-approver: false
+          additional-approved-words: ''
+          additional-denied-words: ''
 
       - name: Deploy to Cloud Run
         id: deploy
-        uses: google-github-actions/deploy-cloudrun@v0
+        uses: google-github-actions/deploy-cloudrun@v2
         with:
           service: ${{ env.SERVICE }}
           region: ${{ env.REGION }}
           # NOTE: If using a pre-built image, update the image name here
           image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{env.GAR_REPO}}/${{ env.SERVICE }}:${{ github.sha }}
+          secrets: |
+            AiTestimonials__PostgresConnectionString=vercel-postgres-secret:latest
 
       # If required, use the Cloud Run url output in later steps
       - name: Show Output

diff --git a/AiTestimonials/Options/OpenAIOptions.cs b/AiTestimonials/Options/OpenAIOptions.cs
diff --git a/AiTestimonials/Options/ServiceOptions.cs b/AiTestimonials/Options/ServiceOptions.cs
@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations;
+using OpenAI;
+
+namespace AiTestimonials.Options;
+
+public class ServiceOptions : IValidatableObject
+{
+    public const string Section = "AiTestimonials";
+
+    public string OpenAiApiKey { get; set; } = default!;
+
+    [Required]
+    public string PostgresConnectionString { get; set; } = default!;
+
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (PostgresConnectionString == null)
+        {
+            yield return new ValidationResult("No PostgresConnectionString for DB specified. Should be on the form: 'Host={host};Username={user};Password={pwd};Database={db}'");
+        }
+    }
+}
diff --git a/AiTestimonials/Repository/VercelPostgresRepository.cs b/AiTestimonials/Repository/VercelPostgresRepository.cs
@@ -12,11 +12,7 @@ public class VercelPostgresRepository
 
     public VercelPostgresRepository(IOptions<ServiceOptions> serviceOptions)
     {
-        var host = serviceOptions.Value.PostgresHost;
-        var db = serviceOptions.Value.PostgresDatabase;
-        var user = serviceOptions.Value.PostgresUser;
-        var pwd = serviceOptions.Value.PostgresPassword;
-        var connectionString = $"Host={host};Username={user};Password={pwd};Database={db}";
+        var connectionString = serviceOptions.Value.PostgresConnectionString;
         var dataSourceBuilder = new NpgsqlDataSourceBuilder(connectionString);
         dataSourceBuilder.EnableDynamicJson();
         _db = dataSourceBuilder.Build();