Rename media config vars

Author: rowanseymour

core/models/orgs.go

@@ -171,7 +171,7 @@ func (o *Org) AirtimeService(httpClient *http.Client, httpRetries *httpx.RetryCo
 
 // StoreAttachment saves an attachment to storage
 func (o *Org) StoreAttachment(ctx context.Context, rt *runtime.Runtime, filename string, contentType string, content io.ReadCloser) (utils.Attachment, error) {
-	prefix := rt.Config.S3MediaPrefix
+	prefix := rt.Config.S3AttachmentsPrefix
 
 	// read the content
 	contentBytes, err := io.ReadAll(content)

mailroom.go

@@ -129,7 +129,7 @@ func (mr *Mailroom) Start() error {
 		if err != nil {
 			return err
 		}
-		mr.rt.AttachmentStorage = storage.NewS3(s3Client, mr.rt.Config.S3MediaBucket, c.S3Region, s3.BucketCannedACLPublicRead, 32)
+		mr.rt.AttachmentStorage = storage.NewS3(s3Client, mr.rt.Config.S3AttachmentsBucket, c.S3Region, s3.BucketCannedACLPublicRead, 32)
 		mr.rt.SessionStorage = storage.NewS3(s3Client, mr.rt.Config.S3SessionBucket, c.S3Region, s3.ObjectCannedACLPrivate, 32)
 	} else {
 		mr.rt.AttachmentStorage = storage.NewFS("_storage", 0766)

runtime/config.go

@@ -49,14 +49,14 @@ type Config struct {
 	MaxValueLength       int    `help:"the maximum size in characters for contact field values and run result values"`
 	SessionStorage       string `validate:"omitempty,session_storage"         help:"where to store session output (s3|db)"`
 
-	S3Endpoint       string `help:"the S3 endpoint we will write attachments to"`
-	S3Region         string `help:"the S3 region we will write attachments to"`
-	S3MediaBucket    string `help:"the S3 bucket we will write attachments to"`
-	S3MediaPrefix    string `help:"the prefix that will be added to attachment filenames"`
-	S3SessionBucket  string `help:"the S3 bucket we will write attachments to"`
-	S3SessionPrefix  string `help:"the prefix that will be added to attachment filenames"`
-	S3DisableSSL     bool   `help:"whether we disable SSL when accessing S3. Should always be set to False unless you're hosting an S3 compatible service within a secure internal network"`
-	S3ForcePathStyle bool   `help:"whether we force S3 path style. Should generally need to default to False unless you're hosting an S3 compatible service"`
+	S3Endpoint          string `help:"the S3 endpoint we will write attachments to"`
+	S3Region            string `help:"the S3 region we will write attachments to"`
+	S3AttachmentsBucket string `help:"the S3 bucket we will write attachments to"`
+	S3AttachmentsPrefix string `help:"the prefix that will be added to attachment filenames"`
+	S3SessionBucket     string `help:"the S3 bucket we will write attachments to"`
+	S3SessionPrefix     string `help:"the prefix that will be added to attachment filenames"`
+	S3DisableSSL        bool   `help:"whether we disable SSL when accessing S3. Should always be set to False unless you're hosting an S3 compatible service within a secure internal network"`
+	S3ForcePathStyle    bool   `help:"whether we force S3 path style. Should generally need to default to False unless you're hosting an S3 compatible service"`
 
 	AWSAccessKeyID     string `help:"the access key id to use when authenticating S3"`
 	AWSSecretAccessKey string `help:"the secret access key id to use when authenticating S3"`
@@ -106,14 +106,14 @@ func NewDefaultConfig() *Config {
 		MaxValueLength:       640,
 		SessionStorage:       "db",
 
-		S3Endpoint:       "https://s3.amazonaws.com",
-		S3Region:         "us-east-1",
-		S3MediaBucket:    "mailroom-media",
-		S3MediaPrefix:    "/attachments/",
-		S3SessionBucket:  "mailroom-sessions",
-		S3SessionPrefix:  "/",
-		S3DisableSSL:     false,
-		S3ForcePathStyle: false,
+		S3Endpoint:          "https://s3.amazonaws.com",
+		S3Region:            "us-east-1",
+		S3AttachmentsBucket: "mailroom-attachments",
+		S3AttachmentsPrefix: "/attachments/",
+		S3SessionBucket:     "mailroom-sessions",
+		S3SessionPrefix:     "/",
+		S3DisableSSL:        false,
+		S3ForcePathStyle:    false,
 
 		AWSAccessKeyID:     "",
 		AWSSecretAccessKey: "",

services/tickets/zendesk/service.go

@@ -252,7 +252,7 @@ func (s *service) push(msg *ExternalResource, logHTTP flows.HTTPLogCallback) err
 // is sent to Zendesk as file/1/01c1/1aa4/01c11aa4-770a-4783.jpg
 // which it will request as POST https://textit.com/tickets/types/zendesk/file/1/01c1/1aa4/01c11aa4-770a-4783.jpg
 func (s *service) convertAttachments(attachments []utils.Attachment) ([]string, error) {
-	prefix := s.rtConfig.S3MediaPrefix
+	prefix := s.rtConfig.S3AttachmentsPrefix
 	if !strings.HasPrefix(prefix, "/") {
 		prefix = "/" + prefix
 	}