refactor: Remove function

internal/pkg/service/stream/dependencies/mocked.go

@@ -1,6 +1,7 @@
 package dependencies
 
 import (
+	"crypto/rand"
 	"fmt"
 	"net/url"
 	"strings"
@@ -13,7 +14,6 @@ import (
 	"github.com/keboola/keboola-as-code/internal/pkg/service/common/configmap"
 	"github.com/keboola/keboola-as-code/internal/pkg/service/common/dependencies"
 	"github.com/keboola/keboola-as-code/internal/pkg/service/stream/config"
-	"github.com/keboola/keboola-as-code/internal/pkg/service/stream/encryption"
 	"github.com/keboola/keboola-as-code/internal/pkg/service/stream/storage/test/dummy"
 	"github.com/keboola/keboola-as-code/internal/pkg/utils/netutils"
 )
@@ -64,9 +64,10 @@ func testConfig(tb testing.TB, d dependencies.Mocked) config.Config {
 	cfg.API.Task.CleanupEnabled = false
 
 	// Use native encryption for tests
-	key, err := encryption.RandomSecretKey()
+	secretKey := make([]byte, 32)
+	_, err := rand.Read(secretKey)
 	assert.NoError(tb, err)
-	cfg.Encryption.Native.SecretKey = key
+	cfg.Encryption.Native.SecretKey = string(secretKey)
 
 	// Validate configuration
 	require.NoError(tb, configmap.ValidateAndNormalize(&cfg))

internal/pkg/service/stream/encryption/encryption.go

@@ -2,8 +2,6 @@ package encryption
 
 import (
 	"context"
-	"crypto/rand"
-	"math/big"
 
 	"github.com/keboola/go-cloud-encrypt/pkg/cloudencrypt"
 )
@@ -53,20 +51,3 @@ func NewEncryptor(ctx context.Context, config Config) (cloudencrypt.Encryptor, e
 
 	return encryptor, nil
 }
-
-const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-
-func RandomSecretKey() (string, error) {
-	result := make([]byte, 32)
-	charsetLength := big.NewInt(int64(len(charset)))
-
-	for i := range result {
-		randIndex, err := rand.Int(rand.Reader, charsetLength)
-		if err != nil {
-			return "", err
-		}
-		result[i] = charset[randIndex.Int64()]
-	}
-
-	return string(result), nil
-}

test/stream/api/api_test.go

@@ -3,6 +3,7 @@ package api
 
 import (
 	"context"
+	"crypto/rand"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -14,7 +15,6 @@ import (
 
 	"github.com/keboola/keboola-as-code/internal/pkg/env"
 	"github.com/keboola/keboola-as-code/internal/pkg/filesystem"
-	"github.com/keboola/keboola-as-code/internal/pkg/service/stream/encryption"
 	volume "github.com/keboola/keboola-as-code/internal/pkg/service/stream/storage/level/local/volume/model"
 	"github.com/keboola/keboola-as-code/internal/pkg/utils/etcdhelper"
 	"github.com/keboola/keboola-as-code/internal/pkg/utils/netutils"
@@ -60,7 +60,8 @@ func TestStreamApiE2E(t *testing.T) {
 			require.NoError(t, os.WriteFile(filepath.Join(volumePath, volume.IDFile), []byte("my-volume"), 0o600))
 
 			// Use native encryption for tests
-			secretKey, err := encryption.RandomSecretKey()
+			secretKey := make([]byte, 32)
+			_, err = rand.Read(secretKey)
 			require.NoError(t, err)
 
 			addEnvs := env.FromMap(map[string]string{
@@ -76,7 +77,7 @@ func TestStreamApiE2E(t *testing.T) {
 				"STREAM_ETCD_ENDPOINT":                             etcdCfg.Endpoint,
 				"STREAM_ETCD_USERNAME":                             etcdCfg.Username,
 				"STREAM_ETCD_PASSWORD":                             etcdCfg.Password,
-				"STREAM_ENCRYPTION_NATIVE_SECRET_KEY":              secretKey,
+				"STREAM_ENCRYPTION_NATIVE_SECRET_KEY":              string(secretKey),
 			})
 
 			// Run the test

test/stream/bridge/keboola/guest_test.go

@@ -2,6 +2,7 @@ package keboola_test
 
 import (
 	"context"
+	"crypto/rand"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -15,7 +16,6 @@ import (
 	"github.com/keboola/keboola-as-code/internal/pkg/service/stream/api"
 	"github.com/keboola/keboola-as-code/internal/pkg/service/stream/config"
 	"github.com/keboola/keboola-as-code/internal/pkg/service/stream/dependencies"
-	"github.com/keboola/keboola-as-code/internal/pkg/service/stream/encryption"
 	"github.com/keboola/keboola-as-code/internal/pkg/utils/errors"
 	"github.com/keboola/keboola-as-code/internal/pkg/utils/netutils"
 )
@@ -28,11 +28,12 @@ func TestGuestUserWorkflow(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 300*time.Second)
 	defer cancel()
 
-	secretKey, err := encryption.RandomSecretKey()
+	secretKey := make([]byte, 32)
+	_, err := rand.Read(secretKey)
 	require.NoError(t, err)
 
 	modifyConfig := func(cfg *config.Config) {
-		cfg.Encryption.Native.SecretKey = secretKey
+		cfg.Encryption.Native.SecretKey = string(secretKey)
 		apiPort := netutils.FreePortForTest(t)
 		cfg.API.Listen = "0.0.0.0:" + strconv.FormatInt(int64(apiPort), 10)
 		u, err := url.Parse("http://localhost:" + strconv.FormatInt(int64(apiPort), 10))

test/stream/bridge/keboola/keboola_test.go

@@ -3,6 +3,7 @@ package keboola_test
 import (
 	"compress/gzip"
 	"context"
+	"crypto/rand"
 	"fmt"
 	"io"
 	"net/http"
@@ -18,7 +19,6 @@ import (
 	"github.com/keboola/keboola-as-code/internal/pkg/encoding/json"
 	"github.com/keboola/keboola-as-code/internal/pkg/service/common/duration"
 	"github.com/keboola/keboola-as-code/internal/pkg/service/stream/config"
-	"github.com/keboola/keboola-as-code/internal/pkg/service/stream/encryption"
 	"github.com/keboola/keboola-as-code/internal/pkg/service/stream/storage/level/local/diskwriter/network"
 	stagingConfig "github.com/keboola/keboola-as-code/internal/pkg/service/stream/storage/level/staging/config"
 	targetConfig "github.com/keboola/keboola-as-code/internal/pkg/service/stream/storage/level/target/config"
@@ -33,13 +33,14 @@ func TestKeboolaBridgeWorkflow(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 300*time.Second)
 	defer cancel()
 
-	secretKey, err := encryption.RandomSecretKey()
+	secretKey := make([]byte, 32)
+	_, err := rand.Read(secretKey)
 	require.NoError(t, err)
 
 	// Update configuration to make the cluster testable
 	configFn := func(cfg *config.Config) {
 		// Setup encryption
-		cfg.Encryption.Native.SecretKey = secretKey
+		cfg.Encryption.Native.SecretKey = string(secretKey)
 		// Enable metadata cleanup for removing storage jobs
 		cfg.Storage.MetadataCleanup.Enabled = true
 		// Disable unrelated workers