From e3271ea47a1fbb984b0e84daf5a2c104fc368802 Mon Sep 17 00:00:00 2001
From: Ron Rise <ron@siteworxpro.com>
Date: Tue, 25 Feb 2025 09:13:08 -0500
Subject: [PATCH] Updated go version 1.24.0

---
 Dockerfile               |  9 ++++++++-
 config/config.go         |  2 +-
 config/generator.go      |  6 +++---
 generator/base64_test.go |  8 +++++++-
 generator/format_test.go | 21 ++++++++++++++++++---
 generator/plain_test.go  | 14 ++++++++++++--
 go.mod                   |  2 +-
 7 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 036ff07..d29e903 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM siteworxpro/golang:1.23.4 AS build
+FROM siteworxpro/golang:1.24.0 AS build
 
 WORKDIR /app
 
@@ -18,4 +18,11 @@ WORKDIR /app
 
 COPY --from=build /app/imgproxy /app/imgproxy
 
+RUN  adduser -u 1001 -g appuser appuser -D && \
+    chown -R appuser:appuser /app
+
+USER 1001
+
+# docker buildx build --push --sbom=true --provenance=true --platform linux/amd64,linux/arm64 -t siteworxpro/img-proxy-url-generator:v1.4.0-grpc .
+
 ENTRYPOINT ["/app/imgproxy", "grpc"]
\ No newline at end of file
diff --git a/config/config.go b/config/config.go
index 2556e35..8d06d4e 100644
--- a/config/config.go
+++ b/config/config.go
@@ -7,7 +7,7 @@ import (
 
 type Config struct {
 	initializeOnce sync.Once
-	Generator      *generatorConfig
+	Generator      *GeneratorConfig
 	Aws            *awsConfig
 	Redis          *redisConfig
 }
diff --git a/config/generator.go b/config/generator.go
index 66ed139..b74a023 100644
--- a/config/generator.go
+++ b/config/generator.go
@@ -5,7 +5,7 @@ import (
 	"github.com/bigkevmcd/go-configparser"
 )
 
-type generatorConfig struct {
+type GeneratorConfig struct {
 	Salt          []byte
 	Key           []byte
 	Host          string
@@ -13,11 +13,11 @@ type generatorConfig struct {
 	PlainUrl      bool
 }
 
-func getGeneratorConfig(p *configparser.ConfigParser) (*generatorConfig, error) {
+func getGeneratorConfig(p *configparser.ConfigParser) (*GeneratorConfig, error) {
 	var config string
 	var err error
 
-	gc := &generatorConfig{}
+	gc := &GeneratorConfig{}
 	if !p.HasSection("img-proxy") {
 		return nil, fmt.Errorf("config error - [img-proxy] config required")
 	}
diff --git a/generator/base64_test.go b/generator/base64_test.go
index b1d155b..7af035a 100644
--- a/generator/base64_test.go
+++ b/generator/base64_test.go
@@ -1,11 +1,17 @@
 package generator
 
 import (
+	"github.com/siteworxpro/img-proxy-url-generator/config"
 	"testing"
 )
 
 func TestGenerator_GenerateBase64(t *testing.T) {
-	g, err := NewGenerator(Config{})
+	g, err := NewGenerator(&config.Config{
+		Generator: &config.GeneratorConfig{
+			Key:  []byte("f2d1f37016b7d12ab27b25377f39fd84e2d3368472ff096261ce7ac3e8490af429d43803836ad6a42a3bd9fb859a38137173619cb00bcb6fe3870e3feab2b764"),
+			Salt: []byte("919ed8813f76abfd42968b10e05258db"),
+		},
+	})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/generator/format_test.go b/generator/format_test.go
index 50de7aa..db75f93 100644
--- a/generator/format_test.go
+++ b/generator/format_test.go
@@ -1,9 +1,18 @@
 package generator
 
-import "testing"
+import (
+	"github.com/siteworxpro/img-proxy-url-generator/config"
+	"testing"
+)
 
 func TestGenerator_StringToFormat(t *testing.T) {
-	g, err := NewGenerator(Config{})
+	g, err := NewGenerator(&config.Config{
+		Generator: &config.GeneratorConfig{
+			Key:  []byte("2c90317177aa7a3c44fa6804bf9bf466930f36ac9262bfdae972e836a9f83d239fd6bcee0c91a29ada58cc7329c787f35d2309f0984f2fd315e2c27bac8ac247"),
+			Salt: []byte("2777def3372a385f4aa7e62b2b431927"),
+		},
+	})
+
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -23,7 +32,13 @@ func TestGenerator_StringToFormat(t *testing.T) {
 }
 
 func TestGenerator_StringToFormatError(t *testing.T) {
-	g, err := NewGenerator(Config{})
+	g, err := NewGenerator(&config.Config{
+		Generator: &config.GeneratorConfig{
+			Key:  []byte("f2d1f37016b7d12ab27b25377f39fd84e2d3368472ff096261ce7ac3e8490af429d43803836ad6a42a3bd9fb859a38137173619cb00bcb6fe3870e3feab2b764"),
+			Salt: []byte("919ed8813f76abfd42968b10e05258db"),
+		},
+	})
+
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/generator/plain_test.go b/generator/plain_test.go
index 24c73b9..24019a5 100644
--- a/generator/plain_test.go
+++ b/generator/plain_test.go
@@ -1,9 +1,19 @@
 package generator
 
-import "testing"
+import (
+	"github.com/siteworxpro/img-proxy-url-generator/config"
+	"testing"
+)
 
 func TestGenerator_GenerateUrl(t *testing.T) {
-	g, err := NewGenerator(Config{})
+	g, err := NewGenerator(&config.Config{
+		Generator: &config.GeneratorConfig{
+			Key:      []byte("f2d1f37016b7d12ab27b25377f39fd84e2d3368472ff096261ce7ac3e8490af429d43803836ad6a42a3bd9fb859a38137173619cb00bcb6fe3870e3feab2b764"),
+			Salt:     []byte("919ed8813f76abfd42968b10e05258db"),
+			PlainUrl: true,
+		},
+	})
+
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/go.mod b/go.mod
index 703d577..392235a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/siteworxpro/img-proxy-url-generator
 
-go 1.23.4
+go 1.24.0
 
 require (
 	github.com/aws/aws-sdk-go v1.55.5