Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 TRISA (https://trisa.io)
Copyright (c) 2021 TRISA (https://travelrule.io)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion containers/bff/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -v -o /go/bin/trtl -ldflags="
# Final Stage
FROM --platform=${BUILDPLATFORM} ${FINAL_IMAGE} AS final

LABEL maintainer="TRISA <info@trisa.io>"
LABEL maintainer="TRISA <info@travelrule.io>"
LABEL description="TRISA GDS Backend for Front-End"

# Ensure ca-certificates are up to date
Expand Down
2 changes: 1 addition & 1 deletion containers/cathy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -v -o /go/bin/sectigo -ldflag
# Final Stage
FROM --platform=${BUILDPLATFORM} ${FINAL_IMAGE} AS final

LABEL maintainer="TRISA <info@trisa.io>"
LABEL maintainer="TRISA <info@travelrule.io>"
LABEL description="TRISA Cathy CA for Integration Testing and Staging QA"

# Ensure ca-certificates are up to date
Expand Down
4 changes: 2 additions & 2 deletions containers/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
- GDS_ADMIN_AUDIENCE=http://localhost:4433
- GDS_ADMIN_TOKEN_KEYS=1y9jUjVqRqRJaiKsNqrZmQkhTqe:/data/creds/current_token_key.pem,1y9jTDgrljWl0iVUOQBcCev7rBG:/data/creds/rotated_token_key.pem
- GDS_ADMIN_OAUTH_GOOGLE_AUDIENCE
- GDS_ADMIN_OAUTH_AUTHORIZED_EMAIL_DOMAINS=trisa.io,rotational.io,akiltechnologies.com,100kode.io
- GDS_ADMIN_OAUTH_AUTHORIZED_EMAIL_DOMAINS=travelrule.io,rotational.io,akiltechnologies.com,100kode.io
- GDS_MEMBERS_ENABLED=true
- GDS_MEMBERS_BIND_ADDR=:4435
- GDS_MEMBERS_INSECURE=true
Expand Down Expand Up @@ -304,7 +304,7 @@ services:
- GDS_ADMIN_AUDIENCE=http://localhost:8433
- GDS_ADMIN_TOKEN_KEYS=1y9jUjVqRqRJaiKsNqrZmQkhTqe:/data/creds/current_token_key.pem,1y9jTDgrljWl0iVUOQBcCev7rBG:/data/creds/rotated_token_key.pem
- GDS_ADMIN_OAUTH_GOOGLE_AUDIENCE
- GDS_ADMIN_OAUTH_AUTHORIZED_EMAIL_DOMAINS=trisa.io,rotational.io,akiltechnologies.com,100kode.io
- GDS_ADMIN_OAUTH_AUTHORIZED_EMAIL_DOMAINS=travelrule.io,rotational.io,akiltechnologies.com,100kode.io
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will need to create a story to update our Google OAuth configuration.

- GDS_MEMBERS_ENABLED=true
- GDS_MEMBERS_BIND_ADDR=:8435
- GDS_MEMBERS_INSECURE=true
Expand Down
2 changes: 1 addition & 1 deletion containers/gds-admin-ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN yarn build
# Final Stage
FROM ${FINAL_IMAGE} AS final

LABEL maintainer="TRISA <admin@trisa.io>"
LABEL maintainer="TRISA <admin@travelrule.io>"
LABEL description="GDS Administrative User Interface"

COPY --from=builder /usr/src/app/build/ /usr/share/nginx/html
Expand Down
2 changes: 1 addition & 1 deletion containers/gds-ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN yarn build
# Final Stage
FROM ${FINAL_IMAGE} AS final

LABEL maintainer="TRISA <admin@trisa.io>"
LABEL maintainer="TRISA <admin@travelrule.io>"
LABEL description="Global TRISA Directory Service User Interface"

COPY --from=builder /usr/src/app/build/ /usr/share/nginx/html
Expand Down
4 changes: 2 additions & 2 deletions containers/gds-user-ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ RUN yarn build
# Final Stage
FROM ${FINAL_IMAGE} AS final

LABEL maintainer="TRISA <admin@trisa.io>"
LABEL maintainer="TRISA <admin@travelrule.io>"
LABEL description="Global TRISA Directory Service Advanced User Interface"

COPY --from=builder /usr/src/app/build/ /usr/share/nginx/html
COPY containers/gds-user-ui/nginx.conf /etc/nginx/conf.d/default.conf

ENV NGINX_ENTRYPOINT_QUIET_LOGS=1
CMD [ "nginx", "-g", "daemon off;" ]
CMD [ "nginx", "-g", "daemon off;" ]
4 changes: 2 additions & 2 deletions containers/gds/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /go/bin/trtl -ldflags="-X
# Final Stage
FROM --platform=${BUILDPLATFORM} ${FINAL_IMAGE} AS final

LABEL maintainer="TRISA <info@trisa.io>"
LABEL maintainer="TRISA <info@travelrule.io>"
LABEL description="Global TRISA Directory Service"

# Ensure ca-certificates are up to date
Expand All @@ -49,4 +49,4 @@ COPY --from=builder /go/bin/gds /usr/local/bin/gds
COPY --from=builder /go/bin/gdsutil /usr/local/bin/gdsutil
COPY --from=builder /go/bin/trtl /usr/local/bin/trtl

CMD [ "/usr/local/bin/gds", "serve" ]
CMD [ "/usr/local/bin/gds", "serve" ]
4 changes: 2 additions & 2 deletions containers/maintenance/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
ARG BASE_IMAGE=nginx:stable
FROM ${BASE_IMAGE} AS final

LABEL maintainer="TRISA <admin@trisa.io>"
LABEL maintainer="TRISA <admin@travelrule.io>"
LABEL description="TRISA GDS Maintenance Mode Placeholder"

COPY web/maintenance /usr/share/nginx/html
COPY containers/maintenance/nginx.conf /etc/nginx/conf.d/default.conf

ENV NGINX_ENTRYPOINT_QUIET_LOGS=1
CMD [ "nginx", "-g", "daemon off;" ]
CMD [ "nginx", "-g", "daemon off;" ]
4 changes: 2 additions & 2 deletions containers/trtl-init/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM alpine:latest

LABEL maintainer="TRISA <info@trisa.io>"
LABEL maintainer="TRISA <info@travelrule.io>"
LABEL description="StatefulSet initialization for trtl replicas"

COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh

ENTRYPOINT [ "/entrypoint.sh" ]
ENTRYPOINT [ "/entrypoint.sh" ]
4 changes: 2 additions & 2 deletions containers/trtl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -v -o /go/bin/gdsutil -ldflag
# Final Stage
FROM --platform=${BUILDPLATFORM} ${FINAL_IMAGE} AS final

LABEL maintainer="TRISA <info@trisa.io>"
LABEL maintainer="TRISA <info@travelrule.io>"
LABEL description="GDS Replicated Data Backend (TRTL)"

# Ensure ca-certificates are up to date
Expand All @@ -47,4 +47,4 @@ RUN set -x && apt-get update && \
COPY --from=builder /go/bin/trtl /usr/local/bin/trtl
COPY --from=builder /go/bin/gdsutil /usr/local/bin/gdsutil

CMD [ "/usr/local/bin/trtl", "serve" ]
CMD [ "/usr/local/bin/trtl", "serve" ]
4 changes: 2 additions & 2 deletions containers/trtlsim/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -v -o /go/bin/trtlsim ./cmd/t
# Final Stage
FROM --platform=${BUILDPLATFORM} ${FINAL_IMAGE} AS final

LABEL maintainer="TRISA <info@trisa.io>"
LABEL maintainer="TRISA <info@travelrule.io>"
LABEL description="GDS Replicated Data Backend (TRTL)"

# Ensure ca-certificates are up to date
Expand All @@ -44,4 +44,4 @@ RUN set -x && apt-get update && \
# Copy the binary to the production image from the builder stage.
COPY --from=builder /go/bin/trtlsim /usr/local/bin/trtlsim

CMD [ "/usr/local/bin/trtlsim" ]
CMD [ "/usr/local/bin/trtlsim" ]
4 changes: 2 additions & 2 deletions pkg/bff/api/v1/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -813,13 +813,13 @@ func TestAnnoucements(t *testing.T) {
Title: "Upcoming TRISA Working Group Call",
Body: "Join us on Thursday Apr 28 for the TRISA Working Group.",
PostDate: "2022-04-20",
Author: "admin@trisa.io",
Author: "admin@travelrule.io",
},
{
Title: "Routine Maintenance Scheduled",
Body: "The GDS will be undergoing routine maintenance on Apr 7.",
PostDate: "2022-04-01",
Author: "admin@trisa.io",
Author: "admin@travelrule.io",
},
{
Title: "Beware the Ides of March",
Expand Down
28 changes: 14 additions & 14 deletions pkg/bff/models/v1/registration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,8 @@ func TestValidateContact(t *testing.T) {
// Test validating the TRISA implementation details
func TestValidateTRISA(t *testing.T) {
validNetwork := &NetworkDetails{
Endpoint: "main.trisa.io:443",
CommonName: "main.trisa.io",
Endpoint: "main.travelrule.io:443",
CommonName: "main.travelrule.io",
}

testCases := []struct {
Expand All @@ -546,49 +546,49 @@ func TestValidateTRISA(t *testing.T) {
{Field: FieldTestNet, Err: ErrMissingTestNetOrMainNet.Error()},
{Field: FieldMainNet, Err: ErrMissingTestNetOrMainNet.Error()},
}},
{&NetworkDetails{CommonName: "test.trisa.io"}, validNetwork, ValidationErrors{
{&NetworkDetails{CommonName: "test.travelrule.io"}, validNetwork, ValidationErrors{
{Field: FieldTestNetEndpoint, Err: ErrMissingField.Error()},
{Field: FieldTestNetCommonName, Err: ErrCommonNameMismatch.Error()},
}},
{&NetworkDetails{Endpoint: "not an address", CommonName: "test.trisa.io"}, nil, ValidationErrors{
{&NetworkDetails{Endpoint: "not an address", CommonName: "test.travelrule.io"}, nil, ValidationErrors{
{Field: FieldTestNetEndpoint, Err: ErrInvalidEndpoint.Error()},
{Field: FieldTestNetCommonName, Err: ErrCommonNameMismatch.Error()},
}},
{&NetworkDetails{Endpoint: ":443", CommonName: "test.trisa.io"}, nil, ValidationErrors{
{&NetworkDetails{Endpoint: ":443", CommonName: "test.travelrule.io"}, nil, ValidationErrors{
{Field: FieldTestNetEndpoint, Err: ErrMissingHost.Error()},
{Field: FieldTestNetCommonName, Err: ErrCommonNameMismatch.Error()},
}},
{&NetworkDetails{Endpoint: "test.trisa.io:", CommonName: "test.trisa.io"}, nil, ValidationErrors{
{&NetworkDetails{Endpoint: "test.travelrule.io:", CommonName: "test.travelrule.io"}, nil, ValidationErrors{
{Field: FieldTestNetEndpoint, Err: ErrMissingPort.Error()},
}},
{&NetworkDetails{Endpoint: "test.trisa.io:foo", CommonName: "test.trisa.io"}, nil, ValidationErrors{
{&NetworkDetails{Endpoint: "test.travelrule.io:foo", CommonName: "test.travelrule.io"}, nil, ValidationErrors{
{Field: FieldTestNetEndpoint, Err: ErrInvalidPort.Error()},
}},
{&NetworkDetails{Endpoint: "test.trisa.io:443"}, nil, ValidationErrors{
{&NetworkDetails{Endpoint: "test.travelrule.io:443"}, nil, ValidationErrors{
{Field: FieldTestNetCommonName, Err: ErrMissingField.Error()},
}},
{&NetworkDetails{Endpoint: "test.trisa.io:443", CommonName: "*.trisa.io"}, nil, ValidationErrors{
{&NetworkDetails{Endpoint: "test.travelrule.io:443", CommonName: "*.travelrule.io"}, nil, ValidationErrors{
{Field: FieldTestNetCommonName, Err: ErrInvalidCommonName.Error()},
{Field: FieldTestNetCommonName, Err: ErrCommonNameMismatch.Error()},
}},
{&NetworkDetails{Endpoint: "test.trisa.io:443", CommonName: "main.trisa.io"}, nil, ValidationErrors{
{&NetworkDetails{Endpoint: "test.travelrule.io:443", CommonName: "main.travelrule.io"}, nil, ValidationErrors{
{Field: FieldTestNetCommonName, Err: ErrCommonNameMismatch.Error()},
}},
{&NetworkDetails{Endpoint: "test.trisa.io:443", CommonName: "main.trisa.io", DnsNames: []string{"alt.trisa.io", "", "*.trisa.io", "https://trisa.io"}}, validNetwork, ValidationErrors{
{&NetworkDetails{Endpoint: "test.travelrule.io:443", CommonName: "main.travelrule.io", DnsNames: []string{"alt.travelrule.io", "", "*.travelrule.io", "https://travelrule.io"}}, validNetwork, ValidationErrors{
{Field: FieldTestNetCommonName, Err: ErrCommonNameMismatch.Error()},
{Field: FieldTestNetDNSNames, Err: ErrMissingField.Error(), Index: 1},
{Field: FieldTestNetDNSNames, Err: ErrInvalidCommonName.Error(), Index: 2},
{Field: FieldTestNetDNSNames, Err: ErrInvalidCommonName.Error(), Index: 3},
}},
{&NetworkDetails{Endpoint: "test.trisa.io:443", CommonName: "test.trisa.io"}, &NetworkDetails{Endpoint: "main.trisa.io:443"}, ValidationErrors{
{&NetworkDetails{Endpoint: "test.travelrule.io:443", CommonName: "test.travelrule.io"}, &NetworkDetails{Endpoint: "main.travelrule.io:443"}, ValidationErrors{
{Field: FieldMainNetCommonName, Err: ErrMissingField.Error()},
}},
{validNetwork, validNetwork, ValidationErrors{
{Field: FieldMainNetEndpoint, Err: ErrDuplicateEndpoint.Error()},
}},
{&NetworkDetails{Endpoint: "test.trisa.io:443", CommonName: "test.trisa.io"}, nil, nil},
{&NetworkDetails{Endpoint: "test.travelrule.io:443", CommonName: "test.travelrule.io"}, nil, nil},
{nil, validNetwork, nil},
{&NetworkDetails{Endpoint: "test.trisa.io:443", CommonName: "test.trisa.io"}, validNetwork, nil},
{&NetworkDetails{Endpoint: "test.travelrule.io:443", CommonName: "test.travelrule.io"}, validNetwork, nil},
}

for i, tc := range testCases {
Expand Down
18 changes: 9 additions & 9 deletions pkg/bff/testdata/announcements.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"title": "Post 1",
"body": "Maecenas nec dolor leo. Curabitur a est facilisis, aliquet mi vitae, vehicula enim. Nunc pulvinar varius auctor. Etiam sollicitudin convallis venenatis. Donec posuere blandit dui ut lobortis. Pellentesque blandit faucibus sollicitudin. Duis malesuada, nisl et elementum accumsan, justo arcu auctor orci, luctus faucibus turpis mi ac sem.",
"post_date": "2022-01-14",
"author": "admin@trisa.io"
"author": "admin@travelrule.io"
},
{
"title": "Post 2",
"body": "Pellentesque fringilla, lorem et ultrices vehicula, est urna mattis lacus, ac pulvinar tortor sapien in lacus. Aliquam sed imperdiet sem, in feugiat erat. Pellentesque id tempus tellus. Nulla et sagittis nisl, efficitur consectetur risus. Nulla vel purus vestibulum, venenatis massa vel, pretium arcu. Integer luctus augue enim, sed eleifend massa auctor ac. Vivamus neque lacus, egestas in mauris non, finibus lacinia odio.",
"post_date": "2022-01-29",
"author": "admin@trisa.io"
"author": "admin@travelrule.io"
},
{
"title": "Post 3",
Expand All @@ -21,19 +21,19 @@
"title": "Post 4",
"body": "Sed rutrum venenatis neque, non vestibulum ante lobortis eget. Etiam sed sem in ante placerat fermentum in a mi. Sed non viverra turpis, non porta ex. Quisque vitae eros finibus, auctor ipsum id, fringilla turpis. Duis ac neque est. Mauris in malesuada neque, sed congue dolor. Fusce lectus quam, venenatis a sapien quis, fermentum cursus sapien.",
"post_date": "2022-02-19",
"author": "admin@trisa.io"
"author": "admin@travelrule.io"
},
{
"title": "Post 5",
"body": "Pellentesque arcu augue, vehicula non ultrices vel, convallis sed tellus. Vestibulum rhoncus felis quis ex pulvinar semper ut vitae libero. Aliquam at suscipit est, et scelerisque justo. In eget felis dignissim, placerat metus quis, tristique ipsum. Integer vitae diam sed justo auctor convallis. Duis venenatis nisi nibh, et lacinia lacus congue id. In congue volutpat nulla, at bibendum purus blandit in. Cras laoreet iaculis viverra.",
"post_date": "2022-03-04",
"author": "admin@trisa.io"
"author": "admin@travelrule.io"
},
{
"title": "Post 6",
"body": "Cras blandit, ex sit amet tempus efficitur, elit neque egestas quam, non tincidunt massa diam fermentum magna. Aliquam eget congue dui. Etiam non sodales nulla. Ut et tincidunt ipsum. Pellentesque ultrices, libero nec ultrices mollis, turpis dolor eleifend mi, eget tincidunt felis nisi et tellus. Morbi ornare ipsum quam, porta scelerisque quam ultrices ac. Morbi vestibulum dapibus ultricies. Duis metus tortor, pellentesque nec nulla eget, lobortis viverra erat. Sed quis enim ante. Etiam suscipit tellus mollis tristique lobortis.",
"post_date": "2022-03-16",
"author": "admin@trisa.io"
"author": "admin@travelrule.io"
},
{
"title": "Post 7",
Expand All @@ -51,18 +51,18 @@
"title": "Post 9",
"body": "Proin lacus elit, semper id justo ac, condimentum finibus arcu. Quisque id enim id nulla tincidunt suscipit. Phasellus eu sapien felis. Aenean aliquet id nisi non ornare. Nulla pretium vitae elit at varius. In scelerisque nunc vel lacus condimentum pulvinar. Nullam efficitur neque at neque ullamcorper cursus. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.",
"post_date": "2022-04-19",
"author": "admin@trisa.io"
"author": "admin@travelrule.io"
},
{
"title": "Post 10",
"body": "Ut gravida id lectus quis varius. Praesent vitae ipsum consequat nulla luctus auctor. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Quisque nec blandit justo. Fusce in velit congue, aliquam neque elementum, vestibulum massa. Donec non magna lacus. Mauris ex erat, condimentum non nunc lobortis, luctus elementum nisi. Pellentesque interdum pretium urna, eu euismod erat sollicitudin ac.",
"post_date": "2022-04-26",
"author": "admin@trisa.io"
"author": "admin@travelrule.io"
},
{
"title": "Post 11",
"body": "It has been a while since we posted, but we just wanted to give an update.",
"post_date": "2022-06-12",
"author": "admin@trisa.io"
"author": "admin@travelrule.io"
}
]
]
4 changes: 2 additions & 2 deletions pkg/bff/testdata/mainnet/vasp.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
],
"review_notes": {
"5daa4ff0-9011-4b61-a8b3-9b0ff1ec4927": {
"author": "admin@trisa.io",
"author": "admin@travelrule.io",
"created": "2021-07-12T20:12:02Z",
"editor": "yvonne26@example.org",
"id": "5daa4ff0-9011-4b61-a8b3-9b0ff1ec4927",
Expand Down Expand Up @@ -141,4 +141,4 @@
"version": "4"
},
"website": "https://trisa.alice.example.com"
}
}
4 changes: 2 additions & 2 deletions pkg/bff/testdata/testnet/vasp.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
],
"review_notes": {
"5daa4ff0-9011-4b61-a8b3-9b0ff1ec4927": {
"author": "admin@trisa.io",
"author": "admin@travelrule.io",
"created": "2021-07-12T20:12:02Z",
"editor": "yvonne26@example.org",
"id": "5daa4ff0-9011-4b61-a8b3-9b0ff1ec4927",
Expand Down Expand Up @@ -144,4 +144,4 @@
"version": "4"
},
"website": "https://trisa.alice.example.com"
}
}
2 changes: 1 addition & 1 deletion pkg/gds/admin/v2/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ func TestRetrieveVASP(t *testing.T) {
"previous_state": "PENDING_REVIEW",
"current_state": "APPROVED",
"description": "approved by certified reviewer",
"source": "admin@trisa.io",
"source": "admin@travelrule.io",
},
},
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/gds/admin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1352,7 +1352,7 @@ func (s *gdsTestSuite) TestListReviewNotes() {
rep = s.doRequest(a.ListReviewNotes, c, w, actual)
require.Equal(http.StatusOK, rep.StatusCode)
require.Len(actual.Notes, 1)
require.Equal("admin@trisa.io", actual.Notes[0].Author)
require.Equal("admin@travelrule.io", actual.Notes[0].Author)
require.NotEmpty(actual.Notes[0].Created)
require.NotEmpty(actual.Notes[0].Editor)
require.NotEmpty(actual.Notes[0].ID)
Expand Down Expand Up @@ -1426,7 +1426,7 @@ func (s *gdsTestSuite) TestUpdateReviewNote() {
ts, err := time.Parse(time.RFC3339, actual.Modified)
require.NoError(err)
require.True(ts.Sub(modified) < time.Minute)
require.Equal("admin@trisa.io", actual.Author)
require.Equal("admin@travelrule.io", actual.Author)
require.Equal(request.claims.Email, actual.Editor)
require.Equal("bar", actual.Text)
// Record on the database should be updated
Expand Down
2 changes: 1 addition & 1 deletion pkg/gds/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ type MembersConfig struct {

type EmailConfig struct {
ServiceEmail string `envconfig:"GDS_SERVICE_EMAIL" default:"TRISA Directory Service <admin@trisa.directory>"`
AdminEmail string `envconfig:"GDS_ADMIN_EMAIL" default:"TRISA Admins <admin@trisa.io>"`
AdminEmail string `envconfig:"GDS_ADMIN_EMAIL" default:"TRISA Admins <admin@travelrule.io>"`
SendGridAPIKey string `envconfig:"SENDGRID_API_KEY" required:"false"`
DirectoryID string `envconfig:"GDS_DIRECTORY_ID" default:"trisa.directory"`
VerifyContactBaseURL string `envconfig:"GDS_VERIFY_CONTACT_URL" default:"https://trisa.directory/verify"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/gds/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var testEnv = map[string]string{
"GDS_ADMIN_MODE": "debug",
"GDS_ADMIN_TOKEN_KEYS": "1y9fT85qWaIvAAORW7DKxtpz9FB:testdata/key1.pem,1y9fVjaUlsVdFFDUWlvRq2PLkw3:testdata/key2.pem",
"GDS_ADMIN_OAUTH_GOOGLE_AUDIENCE": "abc-1234.example.fakegoogleusercontent.com",
"GDS_ADMIN_OAUTH_AUTHORIZED_EMAIL_DOMAINS": "trisa.io,trisa.directory,testnet.directory",
"GDS_ADMIN_OAUTH_AUTHORIZED_EMAIL_DOMAINS": "travelrule.io,trisa.directory,testnet.directory",
"GDS_ADMIN_ALLOW_ORIGINS": "https://admin.testnet.directory",
"GDS_ADMIN_COOKIE_DOMAIN": "admin.testnet.directory",
"GDS_ADMIN_AUDIENCE": "https://api.admin.testnet.directory",
Expand Down
Loading
Loading