Skip to content

Commit 2c584fb

Browse files
author
markzegarelli
authored
Merge pull request #1497 from segmentio/dependabot_update_rollup
Dependabot update rollup
2 parents 74c3d2f + 3bbe324 commit 2c584fb

File tree

2 files changed

+53
-77
lines changed

2 files changed

+53
-77
lines changed

src/connections/data-residency.md

Lines changed: 33 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -67,72 +67,48 @@ To begin with Local Data Storage, complete the following steps in your AWS accou
6767
Segment requires this access to write raw data to your regionally hosted S3 bucket. Specifically, this allows Segment (as the Segment S3-copy user) to use `s3:PutObject`. To enable encryption at rest, use the default S3 mechanism. If you have server-side encryption enabled with AWS KMS managed keys, see the additional [required configuration step](/docs/connections/storage/catalog/amazon-s3/#encryption). To edit the bucket policy, right-click the bucket name in the AWS management console, and select **Edit policy**.
6868

6969
4. Create a new IAM role in your AWS account with a trust relationship to the role which allows Segment to use the Segment `workspace_id` as `externalID`.
70+
5. Attach this IAM policy to the role defined in Step 4.
7071
```json
71-
{
72-
"Version": "2012-10-17",
73-
"Statement": [
74-
{
75-
"Sid": "",
76-
"Effect": "Allow",
77-
"Principal": {
78-
"AWS": [
79-
"arn:aws:iam::595280932656:role/segment-regional-archives-production-access"
72+
{
73+
"Version": "2012-10-17",
74+
"Statement": [
75+
{
76+
"Sid": "ListObjectsInBucket",
77+
"Effect": "Allow",
78+
"Action": "s3:ListBucket",
79+
"Resource": [
80+
"arn:aws:s3:::YOUR_BUCKET_NAME"
8081
]
8182
},
82-
"Action": "sts:AssumeRole",
83-
"Condition": {
84-
"StringEquals": {
85-
"sts:ExternalId": [
86-
"YOUR_WORKSPACE_ID"
87-
]
88-
}
83+
{
84+
"Sid": "AllObjectActions",
85+
"Effect": "Allow",
86+
"Action": "s3:*Object*",
87+
"Resource": [
88+
"arn:aws:s3:::YOUR_BUCKET_NAME/*",
89+
]
8990
}
90-
}
91-
]
92-
}
93-
```
94-
5. Attach this IAM policy to the role defined in Step 4.
95-
```json
96-
{
97-
"Version": "2012-10-17",
98-
"Statement": [
99-
{
100-
"Sid": "ListObjectsInBucket",
101-
"Effect": "Allow",
102-
"Action": "s3:ListBucket",
103-
"Resource": [
104-
"arn:aws:s3:::YOUR_BUCKET_NAME"
105-
]
106-
},
107-
{
108-
"Sid": "AllObjectActions",
109-
"Effect": "Allow",
110-
"Action": "s3:*Object*",
111-
"Resource": [
112-
"arn:aws:s3:::YOUR_BUCKET_NAME/*",
113-
]
114-
}
115-
]
116-
}
91+
]
92+
}
11793
```
11894
This access allows Segment to run local deletions jobs from regionally hosted data for a given user ID.
11995

12096
6. If you are using KMS encryption on your S3 bucket, add the following policy to the IAM role:
12197
```json
122-
{
123-
"Version": "2012-10-17",
124-
"Statement": [
125-
{
126-
"Sid": "AllowKMS",
127-
"Effect": "Allow",
128-
"Action": [
129-
"kms:GenerateDataKey",
130-
"kms:Decrypt"
131-
],
132-
"Resource": "$YOUR_KEY_ARN"
133-
}
134-
]
135-
}
98+
{
99+
"Version": "2012-10-17",
100+
"Statement": [
101+
{
102+
"Sid": "AllowKMS",
103+
"Effect": "Allow",
104+
"Action": [
105+
"kms:GenerateDataKey",
106+
"kms:Decrypt"
107+
],
108+
"Resource": "$YOUR_KEY_ARN"
109+
}
110+
]
111+
}
136112
```
137113

138114
### Local Data Storage configuration

yarn.lock

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1770,10 +1770,10 @@ bluebird@^3.5.1, bluebird@^3.5.5:
17701770
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
17711771
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
17721772

1773-
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
1774-
version "4.11.9"
1775-
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
1776-
integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
1773+
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.9:
1774+
version "4.12.0"
1775+
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
1776+
integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
17771777

17781778
boolbase@^1.0.0, boolbase@~1.0.0:
17791779
version "1.0.0"
@@ -1824,7 +1824,7 @@ braces@~3.0.2:
18241824
dependencies:
18251825
fill-range "^7.0.1"
18261826

1827-
brorand@^1.0.1:
1827+
brorand@^1.0.1, brorand@^1.1.0:
18281828
version "1.1.0"
18291829
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
18301830
integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@@ -3024,17 +3024,17 @@ electron-to-chromium@^1.3.523:
30243024
integrity sha512-/55x3nF2feXFZ5tdGUOr00TxnUjUgdxhrn+eCJ1FAcoAt+cKQTjQkUC5XF4frMWE1R5sjHk+JueuBalimfe5Pg==
30253025

30263026
elliptic@^6.0.0:
3027-
version "6.5.3"
3028-
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
3029-
integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
3027+
version "6.5.4"
3028+
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
3029+
integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
30303030
dependencies:
3031-
bn.js "^4.4.0"
3032-
brorand "^1.0.1"
3031+
bn.js "^4.11.9"
3032+
brorand "^1.1.0"
30333033
hash.js "^1.0.0"
3034-
hmac-drbg "^1.0.0"
3035-
inherits "^2.0.1"
3036-
minimalistic-assert "^1.0.0"
3037-
minimalistic-crypto-utils "^1.0.0"
3034+
hmac-drbg "^1.0.1"
3035+
inherits "^2.0.4"
3036+
minimalistic-assert "^1.0.1"
3037+
minimalistic-crypto-utils "^1.0.1"
30383038

30393039
emoji-regex@^7.0.1:
30403040
version "7.0.3"
@@ -3880,7 +3880,7 @@ hex-color-regex@^1.1.0:
38803880
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
38813881
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
38823882

3883-
hmac-drbg@^1.0.0:
3883+
hmac-drbg@^1.0.1:
38843884
version "1.0.1"
38853885
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
38863886
integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@@ -4078,7 +4078,7 @@ inflight@^1.0.4:
40784078
once "^1.3.0"
40794079
wrappy "1"
40804080

4081-
inherits@2, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
4081+
inherits@2, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
40824082
version "2.0.4"
40834083
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
40844084
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -5282,7 +5282,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
52825282
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
52835283
integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
52845284

5285-
minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
5285+
minimalistic-crypto-utils@^1.0.1:
52865286
version "1.0.1"
52875287
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
52885288
integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
@@ -8823,9 +8823,9 @@ uri-js@^4.2.2:
88238823
punycode "^2.1.0"
88248824

88258825
urijs@^1.16.1, urijs@^1.18.2:
8826-
version "1.19.5"
8827-
resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.5.tgz#119683ab4b2fb0bd637e5ea6dd9117bcac68d3e4"
8828-
integrity sha512-48z9VGWwdCV5KfizHsE05DWS5fhK6gFlx5MjO7xu0Krc5FGPWzjlXEVV0nPMrdVuP7xmMHiPZ2HoYZwKOFTZOg==
8826+
version "1.19.6"
8827+
resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.6.tgz#51f8cb17ca16faefb20b9a31ac60f84aa2b7c870"
8828+
integrity sha512-eSXsXZ2jLvGWeLYlQA3Gh36BcjF+0amo92+wHPyN1mdR8Nxf75fuEuYTd9c0a+m/vhCjRK0ESlE9YNLW+E1VEw==
88298829

88308830
urix@^0.1.0:
88318831
version "0.1.0"

0 commit comments

Comments
 (0)