Skip to content
This repository was archived by the owner on Jun 16, 2024. It is now read-only.

Commit 1cab653

Browse files
sorahsorah
committed
production test drive
1 parent 48a066f commit 1cab653

File tree

5 files changed

+97
-10
lines changed

5 files changed

+97
-10
lines changed

‎config/conference.jsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
development: import './conference/development.libsonnet',
3-
production: import './conference/development.libsonnet', // TODO: fix with production
3+
production: import './conference/production.libsonnet',
44
}

‎config/conference/production.libsonnet

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
local interpret_ivs = { arn: 'arn:aws:ivs:us-west-2:005216166247:channel/BqJ6JEV7iJUt', url: 'https://73c1ba2ff7fa.us-west-2.playback.live-video.net/api/video/v1/us-west-2.005216166247.channel.BqJ6JEV7iJUt.m3u8' };
2+
3+
{
4+
default_track: 'a',
5+
track_order: ['a'], //, 'b'],
6+
tracks: {
7+
a: {
8+
name: '#rubykaigiA',
9+
slug: 'a',
10+
ivs: {
11+
main: {
12+
arn: 'arn:aws:ivs:us-west-2:005216166247:channel/VvM44QACk0cP',
13+
url: 'https://73c1ba2ff7fa.us-west-2.playback.live-video.net/api/video/v1/us-west-2.005216166247.channel.VvM44QACk0cP.m3u8',
14+
},
15+
interpretation: interpret_ivs,
16+
},
17+
chime: {
18+
channel_arn: 'arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395/channel/392944572afa3858efaf634bc12b511a01a7d3aa1388aa9ab1508dbc9628e693',
19+
caption_channel_arn: 'arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395/channel/f785f9f8f243e58d3566b52958534b87ceeeedae11d4b1906e956e375b538ca5',
20+
},
21+
},
22+
// b: {
23+
// name: '#rubykaigiB',
24+
// slug: 'b',
25+
// ivs: {
26+
// main: {
27+
// arn: 'arn:aws:ivs:us-west-2:005216166247:channel/lxVf1pHuVdbU',
28+
// url: 'https://73c1ba2ff7fa.us-west-2.playback.live-video.net/api/video/v1/us-west-2.005216166247.channel.lxVf1pHuVdbU.m3u8',
29+
// },
30+
// interpretation: interpret_ivs,
31+
// },
32+
// chime: {
33+
// channel_arn: 'arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395/channel/d9542baf3d0c8a6aa3a045ca710f1a301bdbdb82dd456f8f84c7f9166a84db9b',
34+
// caption_channel_arn: 'arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395/channel/9b908e352f5e98f9c2992c3fcf02e2fc78faebbda8db39ded97ecd71092191c6',
35+
// },
36+
// },
37+
},
38+
39+
chime: {
40+
app_arn: 'arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395',
41+
app_user_arn: 'arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395/user/app',
42+
},
43+
ivs: {
44+
region: 'us-west-2',
45+
},
46+
}

‎tf/iam_TakeoutUser.tf

+34-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ data "aws_iam_policy_document" "TakeoutUser" {
3232
statement {
3333
effect = "Allow"
3434
actions = [
35-
"chime:SendChannelMessage",
35+
#"chime:SendChannelMessage",
3636
"chime:ListChannelMessages",
3737
#"chime:CreateChannelMembership",
3838
#"chime:ListChannelMemberships",
@@ -44,8 +44,8 @@ data "aws_iam_policy_document" "TakeoutUser" {
4444
"chime:DescribeChannel",
4545
"chime:ListChannels",
4646
#"chime:DeleteChannel",
47-
"chime:RedactChannelMessage",
48-
"chime:UpdateChannelMessage",
47+
#"chime:RedactChannelMessage",
48+
#"chime:UpdateChannelMessage",
4949
"chime:Connect",
5050
"chime:ListChannelBans",
5151
#"chime:CreateChannelBan",
@@ -55,8 +55,38 @@ data "aws_iam_policy_document" "TakeoutUser" {
5555

5656
resources = [
5757
// rk_takeout_user_id is expected to be given on sts:AssumeRole
58+
"arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395/user/$${aws:PrincipalTag/rk_takeout_user_id}",
59+
"arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395/channel/*",
60+
]
61+
}
62+
# chat channel
63+
statement {
64+
effect = "Allow"
65+
actions = [
66+
"chime:SendChannelMessage",
67+
"chime:RedactChannelMessage",
68+
"chime:UpdateChannelMessage",
69+
]
70+
71+
resources = [
72+
"arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395/user/$${aws:PrincipalTag/rk_takeout_user_id}",
73+
"arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395/channel/392944572afa3858efaf634bc12b511a01a7d3aa1388aa9ab1508dbc9628e693",
74+
"arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395/channel/d9542baf3d0c8a6aa3a045ca710f1a301bdbdb82dd456f8f84c7f9166a84db9b",
75+
]
76+
}
77+
78+
# caption channel
79+
statement {
80+
effect = "Allow"
81+
actions = [
82+
"chime:CreateChannelMembership",
83+
"chime:DeleteChannelMembership",
84+
]
85+
86+
resources = [
5887
"arn:aws:chime:us-east-1:${local.aws_account_id}:app-instance/0e09042d-8e87-4b2f-a25b-d71a0e604443/user/$${aws:PrincipalTag/rk_takeout_user_id}",
59-
"arn:aws:chime:us-east-1:005216166247:app-instance/0e09042d-8e87-4b2f-a25b-d71a0e604443/channel/*",
88+
"arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395/channel/f785f9f8f243e58d3566b52958534b87ceeeedae11d4b1906e956e375b538ca5",
89+
"arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395/channel/9b908e352f5e98f9c2992c3fcf02e2fc78faebbda8db39ded97ecd71092191c6",
6090
]
6191
}
6292
}

‎tf/iam_heroku-takeout-prd.tf

+15-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ resource "aws_iam_user" "heroku-takeout-prd" {
22
name = "heroku-takeout-prd"
33
}
44

5-
data "aws_iam_policy_document" "heroku-takeout-prd" {
5+
data "aws_iam_policy_document" "takeout-prd" {
66
statement {
77
effect = "Allow"
88
actions = [
@@ -70,6 +70,7 @@ data "aws_iam_policy_document" "heroku-takeout-prd" {
7070

7171
resources = [
7272
"arn:aws:chime:us-east-1:${local.aws_account_id}:app-instance/0e09042d-8e87-4b2f-a25b-d71a0e604443/*", #dev
73+
"arn:aws:chime:us-east-1:005216166247:app-instance/11029a8c-c09e-47c2-aff6-db9515482395/*", #prd
7374
]
7475
}
7576

@@ -79,7 +80,11 @@ data "aws_iam_policy_document" "heroku-takeout-prd" {
7980
"ivs:PutMetadata",
8081
]
8182
resources = [
82-
"arn:aws:ivs:us-west-2:005216166247:channel/oTssPyKzhjoS",
83+
"arn:aws:ivs:us-west-2:005216166247:channel/oTssPyKzhjoS", # dev
84+
85+
"arn:aws:ivs:us-west-2:005216166247:channel/VvM44QACk0cP", # prd a
86+
"arn:aws:ivs:us-west-2:005216166247:channel/lxVf1pHuVdbU", # prd b
87+
"arn:aws:ivs:us-west-2:005216166247:channel/BqJ6JEV7iJUt", # prd interpret
8388
]
8489
}
8590

@@ -105,7 +110,12 @@ data "aws_iam_policy_document" "heroku-takeout-prd" {
105110

106111
}
107112

108-
resource "aws_iam_user_policy" "heroku-takeout-prd" {
109-
user = aws_iam_user.heroku-takeout-prd.name
110-
policy = data.aws_iam_policy_document.heroku-takeout-prd.json
113+
resource "aws_iam_policy" "heroku-takeout-prd" {
114+
name = "takeout-prd"
115+
policy = data.aws_iam_policy_document.takeout-prd.json
116+
}
117+
118+
resource "aws_iam_user_policy_attachment" "heroku-takeout-prd" {
119+
user = aws_iam_user.heroku-takeout-prd.name
120+
policy_arn = aws_iam_policy.heroku-takeout-prd.arn
111121
}

‎tf/s3.tf

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ data "aws_iam_policy_document" "s3-rk-takeout-app" {
2525
"${aws_s3_bucket.rk-takeout-app.arn}/prd/packs/*",
2626
"${aws_s3_bucket.rk-takeout-app.arn}/dev/assets/*",
2727
"${aws_s3_bucket.rk-takeout-app.arn}/prd/assets/*",
28+
"${aws_s3_bucket.rk-takeout-app.arn}/tmp/*",
2829
]
2930
principals {
3031
type = "AWS"

0 commit comments

Comments
 (0)