diff --git a/README.md b/README.md index e8b8702e6b..45438b80f5 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ Web Interface for Mailbox. docker run --env AWS_ACCESS_KEY_ID= \ --env AWS_SECRET_ACCESS_KEY= \ --env AWS_REGION= \ - ---env AWS_API_ID= \ --env AWS_API_GATEWAY_ENDPOINT= \ harryzcy/mailbox-browser ``` @@ -40,7 +39,6 @@ During runtime: - `AWS_ACCESS_KEY_ID`: AWS access key id - `AWS_SECRET_ACCESS_KEY`: AWS secret access key - `AWS_REGION`: AWS region code -- `AWS_API_ID`: AWS API Gateway ID - `AWS_API_GATEWAY_ENDPOINT`: AWS API Gateway endpoint - `EMAIL_ADDRESSES`: a comma-separated list of email addresses/domains to send email from (required for replying emails) - `PROXY_ENABLE` (optional): whether to proxy email images, must be `true` (default) or `false` diff --git a/bff/config/config.go b/bff/config/config.go index c86a4e501f..ff2738a24b 100644 --- a/bff/config/config.go +++ b/bff/config/config.go @@ -17,7 +17,6 @@ var ( AWSRegion string AWSAccessKeyID string AWSSecretAccessKey string - AWSAPIID string AWSAPIGatewayEndpoint string EmailAddresses []string @@ -75,7 +74,6 @@ func load(logger *zap.Logger) error { AWSAccessKeyID = getString(v, "aws.accessKeyID", "AWS_ACCESS_KEY_ID") AWSSecretAccessKey = getString(v, "aws.secretAccessKey", "AWS_SECRET_ACCESS_KEY") AWSAPIGatewayEndpoint = strings.TrimSuffix(getString(v, "aws.apiGateway.endpoint", "AWS_API_GATEWAY_ENDPOINT"), "/") - AWSAPIID = getString(v, "aws.apiGateway.apiID", "AWS_API_ID") // comma separated list of email addresses or domains, required for email replies EmailAddresses = strings.Split(getString(v, "email.addresses", "EMAIL_ADDRESSES"), ",") diff --git a/bff/config/config_test.go b/bff/config/config_test.go index 3edebb0bf7..b86d1ee594 100644 --- a/bff/config/config_test.go +++ b/bff/config/config_test.go @@ -49,7 +49,6 @@ func TestLoad(t *testing.T) { assert.Equal(t, "us-west-2", AWSRegion) assert.Equal(t, "example-key-id", AWSAccessKeyID) assert.Equal(t, "example-secret-key", AWSSecretAccessKey) - assert.Equal(t, "app-id", AWSAPIID) assert.Equal(t, "https://example.com", AWSAPIGatewayEndpoint) assert.Equal(t, []string{"example.com", "example.org"}, EmailAddresses) assert.True(t, ProxyEnable) @@ -70,7 +69,6 @@ func TestLoad_NoFile(t *testing.T) { assert.Equal(t, "", AWSRegion) assert.Equal(t, "", AWSAccessKeyID) assert.Equal(t, "", AWSSecretAccessKey) - assert.Equal(t, "", AWSAPIID) assert.Equal(t, "", AWSAPIGatewayEndpoint) assert.Equal(t, []string{""}, EmailAddresses) assert.True(t, ProxyEnable) diff --git a/cloudflare/src/config.ts b/cloudflare/src/config.ts index b48d97ca8e..cb85f55e7b 100644 --- a/cloudflare/src/config.ts +++ b/cloudflare/src/config.ts @@ -6,7 +6,6 @@ export interface Env { AWS_REGION: string AWS_ACCESS_KEY_ID: string AWS_SECRET_ACCESS_KEY: string - AWS_API_ID: string AWS_API_GATEWAY_ENDPOINT: string EMAIL_ADDRESSES: string[]