Merge pull request 'refactored docker build to use image caching' (#38) from update into master

Reviewed-on: #38

.drone.yml

@@ -31,6 +31,8 @@ steps:
       registry: nexus.khongisa.co.za
       repo: nexus.khongisa.co.za/litecharms-scheduler
       tags: [ latest, "1.${DRONE_BUILD_NUMBER}" ]
+      use_cache: true
+      cache_from: nexus.khongisa.co.za/litecharms-scheduler:latest
       custom_labels:
         - org.opencontainers.image.source=https://gitea.khongisa.co.za/litecharms/scheduler
         - org.opencontainers.image.version=1.${DRONE_BUILD_NUMBER}

LiteCharmsScheduler/LiteCharmsScheduler.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.82.0" />
+    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.137.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.9" />
     <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -18,7 +18,7 @@
 
   <!-- Lite Charms Libraries -->
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.82.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.137.0" />
   </ItemGroup>
 
   <!-- Shared Global Usings -->

LiteCharmsScheduler/Program.cs

@@ -14,7 +14,9 @@ builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineB
 builder.Services.AddEmailServices(builder.Configuration);
 builder.Services.AddEmailServiceBus();
 
+builder.Services.AddHttpClient();
 builder.Services.AddShopServices();
+builder.Services.AddPayfastServices(builder.Configuration);
 builder.Services.AddHashServices(builder.Configuration);
 builder.Services.AddMidrandShopDatabase(builder.Configuration);
 

LiteCharmsScheduler/appsettings.json

@@ -1,4 +1,16 @@
 {
+  "PayfastSettings": {
+    "CheckoutUrl": "https://sandbox.payfast.co.za/eng/process",
+    "ValidHosts": [
+      "www.payfast.co.za",
+      "sandbox.payfast.co.za",
+      "w1w.payfast.co.za",
+      "w2w.payfast.co.za",
+      "ips.payfast.co.za",
+      "api.payfast.co.za",
+      "payment.payfast.io"
+    ]
+  },
   "HasherSettings": {
     "MinHashLength": 11
   },

litecharms-scheduler-uat.yml

@@ -23,30 +23,12 @@ data:
   BookshopS3Settings__Region: "garage"
   BookshopS3Settings__BucketName: "bookshop"
   BookshopS3Settings__CdnBaseUrl: "https://bookshop.cdn.khongisa.co.za"
-  ValidPayfastHosts__0: "www.payfast.co.za"
+  PayfastSettings__CheckoutUrl: "https://sandbox.payfast.co.za/eng/process"
-  ValidPayfastHosts__1: "sandbox.payfast.co.za"
+  PayfastSettings__ValidHosts__0: "www.payfast.co.za"
-  ValidPayfastHosts__2: "w1w.payfast.co.za"
+  PayfastSettings__ValidHosts__1: "sandbox.payfast.co.za"
-  ValidPayfastHosts__3: "w2w.payfast.co.za"
+  PayfastSettings__ValidHosts__2: "ips.payfast.co.za"
-  ValidPayfastHosts__4: "ips.payfast.co.za"
+  PayfastSettings__ValidHosts__3: "api.payfast.co.za"
-  ValidPayfastHosts__5: "api.payfast.co.za"
+  PayfastSettings__ValidHosts__4: "payment.payfast.io"
-  ValidPayfastHosts__6: "payment.payfast.io"
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: scheduler-secrets
-  namespace: litecharms-scheduler-uat
-type: Opaque
-data:  
-  connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
-  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPW1pZHJhbmRzaG9wLWRldjtVc2VybmFtZT1taWRyYW5kc2hvcC1kZXYtdXNlcjtQYXNzd29yZD1hUFh5a0tnM3RTOWNtRDtQZXJzaXN0IFNlY3VyaXR5IEluZm89VHJ1ZQ==
-  discord-webhook: aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTUwMDIzMzEyOTYwNzAzNjk3MC9KYzc5endwMjlxYWpLbmoyYkR3cm5GR0RJci11ZGIyV2JIUDZTYjdpT0hCTWpQSUY3Vkw5eUVHTkJUSXpSOVVWVzI0bQ==
-  aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
-  email-password: JFpTLWVJQGlYbTVNUCRhfg==
-  hasher-salt: VEdsbmFIUWdRMmhoY20xekxDQk5hV1J5WVc1a1FtOXZhM01nYldGclpTQnNiM1J6SUc5bUlHMXZibVY1SUdGdVpDQmhjbVVnWVNCemRXTmpaWE56Wm5Wc0lIWnBjbUZzSUhOMGIzSjVJR2x1SUZOdmRYUm9JRUZtY21sallRPT0=
-  hasher-payfastpassphrase: OUdBSVIwdFdwaFgwcU8=
-  bookshop-s3-accesskey: R0s1MTRkMmNlOGRjNjkyMzdhMDVjMDFlZWY=
-  bookshop-s3-secretkey: ZWFhZmVkYTFhZWQ0MDllY2ZlNjA3MTRlY2RhNTQ5YjgyYmRmNWEzZGFmOWYxOGRkNjFmNjZiNDk3M2E2NDgyZQ==
 ---
 apiVersion: v1
 kind: Service
@@ -68,7 +50,8 @@ metadata:
   namespace: litecharms-scheduler-uat
 spec:
   serviceName: "scheduler-worker-service"
-  replicas: 1
+  replicas: 2
+  revisionHistoryLimit: 1
   selector:
     matchLabels:
       app: scheduler
@@ -91,54 +74,6 @@ spec:
           envFrom:
             - configMapRef:
                 name: scheduler-config
-          env:
+            - secretRef:
-            - name: BookshopS3Settings__AccessKey
+                name: scheduler-secrets
-              valueFrom:
+ 
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: bookshop-s3-accesskey
-            - name: BookshopS3Settings__SecretKey
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: bookshop-s3-secretkey
-            - name: HasherSettings__Salt
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: hasher-salt
-            - name: HasherSettings__PayfastPassphrase
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: hasher-payfastpassphrase            
-            - name: ConnectionStrings__PostgresMidrandBooks
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: connection-string
-            - name: Monitoring__ApiKey
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: aspire-apikey
-            - name: Email__Credentials__Password
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: email-password
-            - name: ConnectionStrings__PostgresScheduler
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: connection-string-quartz            
-            - name: ConnectionStrings__DiscordShop
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: discord-webhook
-            - name: Monitoring__ApiKey
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: aspire-apikey