use string gcp credentials (#286)

Author: frostbyte73

cmd/server/main.go

@@ -4,7 +4,6 @@ import (
 	"embed"
 	"fmt"
 	"io/fs"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"os/signal"
@@ -82,7 +81,7 @@ func runService(c *cli.Context) error {
 		if configFile == "" {
 			return errors.ErrNoConfig
 		}
-		content, err := ioutil.ReadFile(configFile)
+		content, err := os.ReadFile(configFile)
 		if err != nil {
 			return err
 		}

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/livekit/livekit-server v1.3.5-0.20230218061519-7a2d9b3d615e
 	github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1
 	github.com/livekit/mediatransportutil v0.0.0-20230130133657-96cfb115473a
-	github.com/livekit/protocol v1.4.3-0.20230228235227-721dbba55d18
+	github.com/livekit/protocol v1.4.3
 	github.com/livekit/psrpc v0.2.9
 	github.com/livekit/server-sdk-go v1.0.7-0.20230112195259-5bc292cbbdf2
 	github.com/pion/rtcp v1.2.10

go.sum

@@ -264,8 +264,8 @@ github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 h1:jm09419p0lqTkD
 github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ=
 github.com/livekit/mediatransportutil v0.0.0-20230130133657-96cfb115473a h1:5UkGQpskXp7HcBmyrCwWtO7ygDWbqtjN09Yva4l/nyE=
 github.com/livekit/mediatransportutil v0.0.0-20230130133657-96cfb115473a/go.mod h1:1Dlx20JPoIKGP45eo+yuj0HjeE25zmyeX/EWHiPCjFw=
-github.com/livekit/protocol v1.4.3-0.20230228235227-721dbba55d18 h1:9HU+GLf3KHCCuod5VrNvdWlkRMjlXFZobL6JR8PwhzA=
-github.com/livekit/protocol v1.4.3-0.20230228235227-721dbba55d18/go.mod h1:hkK/G0wwFiLUGp9F5kxeQxq2CQuIzkmfBwKhTsc71us=
+github.com/livekit/protocol v1.4.3 h1:z+xiG5NmBnfnuDQHZ4LesqT+yZuLyKBQPZaaBUKPx+E=
+github.com/livekit/protocol v1.4.3/go.mod h1:hkK/G0wwFiLUGp9F5kxeQxq2CQuIzkmfBwKhTsc71us=
 github.com/livekit/psrpc v0.2.9 h1:F9QatmORMcCzzzkDDqFJHe1ZIrJw9rXiluBk33Pmcdw=
 github.com/livekit/psrpc v0.2.9/go.mod h1:K0j8f1PgLShR7Lx80KbmwFkDH2BvOnycXGV0OSRURKc=
 github.com/livekit/rtcscore-go v0.0.0-20220815072451-20ee10ae1995 h1:vOaY2qvfLihDyeZtnGGN1Law9wRrw8BMGCr1TygTvMw=

pkg/config/base.go

@@ -82,7 +82,7 @@ type GCPConfig struct {
 
 func (c *GCPConfig) ToGCPUpload() *livekit.GCPUpload {
 	return &livekit.GCPUpload{
-		Credentials: []byte(c.CredentialsJSON),
+		Credentials: c.CredentialsJSON,
 		Bucket:      c.Bucket,
 	}
 }

pkg/config/output.go

@@ -542,7 +542,7 @@ func redactUpload(upload uploader) {
 	}
 
 	if gcp := upload.GetGcp(); gcp != nil {
-		gcp.Credentials = []byte(util.Redact(string(gcp.Credentials)))
+		gcp.Credentials = util.Redact(gcp.Credentials)
 		return
 	}
 

pkg/pipeline/sink/uploader/gcp.go

@@ -43,8 +43,8 @@ func (u *GCPUploader) Upload(localFilepath, storageFilepath string, _ types.Outp
 	}
 
 	var client *storage.Client
-	if u.conf.Credentials != nil {
-		client, err = storage.NewClient(ctx, option.WithCredentialsJSON(u.conf.Credentials))
+	if u.conf.Credentials != "" {
+		client, err = storage.NewClient(ctx, option.WithCredentialsJSON([]byte(u.conf.Credentials)))
 	} else {
 		client, err = storage.NewClient(ctx)
 	}

test/config.go

@@ -4,7 +4,6 @@ package test
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -65,7 +64,7 @@ func NewTestContext(t *testing.T) *TestConfig {
 	if confString == "" {
 		confFile := os.Getenv("EGRESS_CONFIG_FILE")
 		require.NotEmpty(t, confFile)
-		b, err := ioutil.ReadFile(confFile)
+		b, err := os.ReadFile(confFile)
 		require.NoError(t, err)
 		confString = string(b)
 	}

test/helpers.go

@@ -194,8 +194,8 @@ func downloadGCP(t *testing.T, conf *livekit.GCPUpload, localFilepath, storageFi
 	var client *storage.Client
 
 	var err error
-	if conf.Credentials != nil {
-		client, err = storage.NewClient(ctx, option.WithCredentialsJSON(conf.Credentials))
+	if conf.Credentials != "" {
+		client, err = storage.NewClient(ctx, option.WithCredentialsJSON([]byte(conf.Credentials)))
 	} else {
 		client, err = storage.NewClient(ctx)
 	}