Merge pull request #39 from doitintl/fix-buildx

fix-buildx

Author: alexei-led

.github/workflows/github-release.yaml

@@ -20,7 +20,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: '>=1.19.0'
+          go-version: '>=1.21.0'
 
       - name: Cross-Platform build
         run: |

.github/workflows/test.yaml

@@ -25,7 +25,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: '>=1.19.0'
+          go-version: '>=1.21.0'
 
       - name: Lint
         run: |

Dockerfile

@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:experimental
 
-FROM --platform=${BUILDPLATFORM} golang:1.19-alpine as builder
+FROM --platform=${BUILDPLATFORM} golang:1.21-alpine as builder
 # passed by buildkit
 ARG TARGETOS
 ARG TARGETARCH

go.mod

@@ -1,6 +1,6 @@
 module secrets-init
 
-go 1.19
+go 1.21
 
 require (
 	cloud.google.com/go/compute v1.10.0

pkg/secrets/aws/secrets.go

@@ -3,6 +3,7 @@ package aws
 import (
 	"context"
 	"encoding/json"
+	"sort"
 	"strings"
 
 	"secrets-init/pkg/secrets" //nolint:gci
@@ -96,7 +97,7 @@ func (sp *SecretsProvider) ResolveSecrets(_ context.Context, vars []string) ([]s
 		}
 		envs = append(envs, env)
 	}
-
+	sort.Strings(envs)
 	return envs, nil
 }
 

pkg/secrets/aws/secrets_test.go

@@ -48,8 +48,8 @@ func TestSecretsProvider_ResolveSecrets(t *testing.T) {
 				"test-secret-2=arn:aws:secretsmanager:87654321",
 			},
 			want: []string{
-				"test-secret-1=test-secret-value-1",
 				"non-secret=hello",
+				"test-secret-1=test-secret-value-1",
 				"test-secret-2=test-secret-value-2",
 			},
 			mockServiceProvider: func(mockSM *mocks.SecretsManagerAPI, mockSSM *mocks.SSMAPI) secrets.Provider {