Page MenuHomePhabricator
Differential D12324

[terraform] Replace all config options with terraform variables and remove sops
ClosedPublic
Actions

Authored by will on Jun 5 2024, 5:06 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 6, 5:59 AM
Unknown Object (File)
Thu, Mar 6, 4:44 AM
Unknown Object (File)
Thu, Mar 6, 2:04 AM
Unknown Object (File)
Wed, Mar 5, 10:35 PM
Unknown Object (File)
Wed, Mar 5, 6:13 AM
Unknown Object (File)
Tue, Mar 4, 3:09 PM
Unknown Object (File)
Feb 22 2025, 9:19 AM
Unknown Object (File)
Feb 22 2025, 9:19 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
bartek
varun
ashoat
Commits
rCOMMa413bd61cbd9: [terraform] Replace all config options with terraform variables and remove sops
Summary

Bartek pointed out that SOPS was overkill for self-hosting. Additionally, several configuration options required the user to make terraform changes.

In this diff, I introduce the usage of terraform variables to

  1. configure mariadb username/password that was previously configured through sops
  2. configure the aws region, subnets, and user ip

Depends on D12323

Test Plan

terraform apply and successfully connected mysql client to rds endpoint

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

will created this revision.Jun 5 2024, 5:06 PM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptJun 5 2024, 5:06 PM
will retitled this revision from [terraform] Replace all config options with .tfvars and remove sops to [terraform] Replace all config options with terraform variables and remove sops.Jun 5 2024, 5:07 PM
will added inline comments.
services/terraform/self-host/aws_vpc.tf
9 ↗(On Diff #41000)

Changed to numbers to avoid possible confusion with the letters used by availability zones

Harbormaster completed remote builds in B29465: Diff 41000.Jun 5 2024, 5:23 PM
will requested review of this revision.Jun 5 2024, 5:23 PM
will edited the summary of this revision. (Show Details)EditedJun 5 2024, 5:49 PM
will added a parent revision: D12323: [terraform] remove usage of s3 bucket for terraform config.

Was thinking similar to the dev folder, we can create a simple run.sh script with:

terraform init

terraform apply -var-file="secrets.tfvars"
will added inline comments.Jun 5 2024, 5:52 PM
services/terraform/self-host/aws_vpc.tf
33 ↗(On Diff #41000)

32 as the mask means the block resolves to a single exact ip address

will added a reviewer: ashoat.Jun 5 2024, 5:52 PM
bartek added a comment.Jun 6 2024, 12:31 AM

Two comments here:

  • When using one of "default" filenames (I recall terraform.tfvars), you don't have to use the -var-file="secrets.tfvars" arg
  • It's a good practice to commit terraform.tfvars.example (while gitignoring actual terraform.tfvars) with example variables (usually required ones, that don't have defaults in variables.tf). This file can be copied and renamed by individual users.

What do you think?

ashoat resigned from this revision.Jun 6 2024, 10:20 AM

I like @bartek's suggestions. I'm probably a bad reviewer for Terraform stuff since I'm not familiar

will added a comment.Jun 6 2024, 11:46 AM
In D12324#350437, @bartek wrote:

Two comments here:

  • When using one of "default" filenames (I recall terraform.tfvars), you don't have to use the -var-file="secrets.tfvars" arg
  • It's a good practice to commit terraform.tfvars.example (while gitignoring actual terraform.tfvars) with example variables (usually required ones, that don't have defaults in variables.tf). This file can be copied and renamed by individual users.

What do you think?

Really good ideas. Adding to new next rebase and modified the notion doc to use terraform.tfvars
https://www.notion.so/commapp/Moving-local-Keyserver-MariaDB-data-to-a-Self-hosted-AWS-RDS-instance-ed4fd1b02f944e3ab1ea074c65f553f3

will updated this revision to Diff 41069.Jun 6 2024, 11:47 AM

review feedback

bartek accepted this revision.Jun 6 2024, 12:02 PM
This revision is now accepted and ready to land.Jun 6 2024, 12:02 PM
Harbormaster completed remote builds in B29496: Diff 41069.Jun 6 2024, 12:03 PM
will added a child revision: D12339: [terraform] Use default vpc, subnets, and internet gateway for self-host.Jun 6 2024, 8:37 PM
will updated this revision to Diff 41078.Jun 6 2024, 8:59 PM

to be removed but zones should be included in the terraform variables for this diff

will updated this revision to Diff 41081.Jun 6 2024, 9:12 PM

rebase

Harbormaster completed remote builds in B29505: Diff 41078.Jun 6 2024, 9:23 PM
Harbormaster completed remote builds in B29508: Diff 41081.Jun 6 2024, 9:30 PM
Closed by commit rCOMMa413bd61cbd9: [terraform] Replace all config options with terraform variables and remove sops (authored by will). · Explain WhyJun 7 2024, 11:10 AM
This revision was automatically updated to reflect the committed changes.
will added a commit: rCOMMa413bd61cbd9: [terraform] Replace all config options with terraform variables and remove sops.

Revision Contents
Changeset List

PathSize
services/
terraform/
self-host/
4 lines
6 lines
20 lines
12 lines
5 lines
4 lines
34 lines

Diff 41069

View Options

services/terraform/self-host/.gitignore

Show All 40 Linesfunction ManagePublicLinkScreen(props: Props): React.Node {
let errorComponent = null; let errorComponent = null;
if (error) { if (error) {
errorComponent = <Text style={styles.error}>{error}</Text>; errorComponent = <Text style={styles.error}>{error}</Text>;
} }
const onDisableButtonClick = React.useCallback(() => { const onDisableButtonClick = React.useCallback(() => {
Alert.alert( Alert.alert(
'Disable public link', 'Disable public link',
'Are you sure you want to disable your public link? Members who have your community’s public link but have not joined will not able to with the disabled link. \n' + 'Are you sure you want to disable your public link?\n' +
'\n' + '\n' +
'Other communities may also claim your previous public link url.', 'Other communities will be able to claim the same URL.',
[ [
{ {
text: 'Confirm disable', text: 'Confirm disable',
style: 'destructive', style: 'destructive',
onPress: disableInviteLink, onPress: disableInviteLink,
}, },
{ {
text: 'Cancel', text: 'Cancel',
Show All 18 Lines disablePublicLinkButton = (
</View> </View>
); );
} }
return ( return (
<View> <View>
<View style={styles.section}> <View style={styles.section}>
<Text style={styles.sectionText}> <Text style={styles.sectionText}>
Let your community be more accessible with your own unique public Invite links make it easy for your friends to join your community.
link. By enabling a public link, you are allowing anyone who has your Anybody who knows your community’s invite link will be able to join
link to join your community.{'\n\n'} it. Note that if you change your public link’s URL, other communities
Editing your community’s public link allows other communities to claim will be able to claim the old URL.
ashoatUnsubmitted
Not Done
Inline Actions

From the screenshot, this looks like too much text in a row. We could try separating out the third sentence into its own paragraph. We could also try showing the three sentences as three bullet points. @ted, any thoughts?

ashoat: From the screenshot, this looks like too much text in a row. We could try separating out the…
tomekAuthorUnsubmitted
Done
Inline Actions

In the original design, the last sentence was separated by an empty line. It probably makes sense to do the same here.

native-manage-newline.png (497×407 px, 38 KB)

tomek: In the original design, the last sentence was separated by an empty line. It probably makes…
your previous URL.
</Text> </Text>
</View> </View>
<Text style={styles.sectionTitle}>INVITE URL</Text> <Text style={styles.sectionTitle}>INVITE URL</Text>
<View style={styles.section}> <View style={styles.section}>
<View style={styles.inviteLink}> <View style={styles.inviteLink}>
<Text style={styles.inviteLinkPrefix}>{inviteLinkUrl('')}</Text> <Text style={styles.inviteLinkPrefix}>{inviteLinkUrl('')}</Text>
<TextInput <TextInput
style={styles.input} style={styles.input}
▲ Show 20 Lines • Show All 108 Lines • Show Last 20 Lines
View Options

services/terraform/self-host/aws_db.tf

Show All 40 Linesfunction ManagePublicLinkScreen(props: Props): React.Node {
let errorComponent = null; let errorComponent = null;
if (error) { if (error) {
errorComponent = <Text style={styles.error}>{error}</Text>; errorComponent = <Text style={styles.error}>{error}</Text>;
} }
const onDisableButtonClick = React.useCallback(() => { const onDisableButtonClick = React.useCallback(() => {
Alert.alert( Alert.alert(
'Disable public link', 'Disable public link',
'Are you sure you want to disable your public link? Members who have your community’s public link but have not joined will not able to with the disabled link. \n' + 'Are you sure you want to disable your public link?\n' +
'\n' + '\n' +
'Other communities may also claim your previous public link url.', 'Other communities will be able to claim the same URL.',
[ [
{ {
text: 'Confirm disable', text: 'Confirm disable',
style: 'destructive', style: 'destructive',
onPress: disableInviteLink, onPress: disableInviteLink,
}, },
{ {
text: 'Cancel', text: 'Cancel',
Show All 18 Lines disablePublicLinkButton = (
</View> </View>
); );
} }
return ( return (
<View> <View>
<View style={styles.section}> <View style={styles.section}>
<Text style={styles.sectionText}> <Text style={styles.sectionText}>
Let your community be more accessible with your own unique public Invite links make it easy for your friends to join your community.
link. By enabling a public link, you are allowing anyone who has your Anybody who knows your community’s invite link will be able to join
link to join your community.{'\n\n'} it. Note that if you change your public link’s URL, other communities
Editing your community’s public link allows other communities to claim will be able to claim the old URL.
ashoatUnsubmitted
Not Done
Inline Actions

From the screenshot, this looks like too much text in a row. We could try separating out the third sentence into its own paragraph. We could also try showing the three sentences as three bullet points. @ted, any thoughts?

ashoat: From the screenshot, this looks like too much text in a row. We could try separating out the…
tomekAuthorUnsubmitted
Done
Inline Actions

In the original design, the last sentence was separated by an empty line. It probably makes sense to do the same here.

native-manage-newline.png (497×407 px, 38 KB)

tomek: In the original design, the last sentence was separated by an empty line. It probably makes…
your previous URL.
</Text> </Text>
</View> </View>
<Text style={styles.sectionTitle}>INVITE URL</Text> <Text style={styles.sectionTitle}>INVITE URL</Text>
<View style={styles.section}> <View style={styles.section}>
<View style={styles.inviteLink}> <View style={styles.inviteLink}>
<Text style={styles.inviteLinkPrefix}>{inviteLinkUrl('')}</Text> <Text style={styles.inviteLinkPrefix}>{inviteLinkUrl('')}</Text>
<TextInput <TextInput
style={styles.input} style={styles.input}
▲ Show 20 Lines • Show All 108 Lines • Show Last 20 Lines
View Options

services/terraform/self-host/aws_vpc.tf

Show All 40 Linesfunction ManagePublicLinkScreen(props: Props): React.Node {
let errorComponent = null; let errorComponent = null;
if (error) { if (error) {
errorComponent = <Text style={styles.error}>{error}</Text>; errorComponent = <Text style={styles.error}>{error}</Text>;
} }
const onDisableButtonClick = React.useCallback(() => { const onDisableButtonClick = React.useCallback(() => {
Alert.alert( Alert.alert(
'Disable public link', 'Disable public link',
'Are you sure you want to disable your public link? Members who have your community’s public link but have not joined will not able to with the disabled link. \n' + 'Are you sure you want to disable your public link?\n' +
'\n' + '\n' +
'Other communities may also claim your previous public link url.', 'Other communities will be able to claim the same URL.',
[ [
{ {
text: 'Confirm disable', text: 'Confirm disable',
style: 'destructive', style: 'destructive',
onPress: disableInviteLink, onPress: disableInviteLink,
}, },
{ {
text: 'Cancel', text: 'Cancel',
Show All 18 Lines disablePublicLinkButton = (
</View> </View>
); );
} }
return ( return (
<View> <View>
<View style={styles.section}> <View style={styles.section}>
<Text style={styles.sectionText}> <Text style={styles.sectionText}>
Let your community be more accessible with your own unique public Invite links make it easy for your friends to join your community.
link. By enabling a public link, you are allowing anyone who has your Anybody who knows your community’s invite link will be able to join
link to join your community.{'\n\n'} it. Note that if you change your public link’s URL, other communities
Editing your community’s public link allows other communities to claim will be able to claim the old URL.
ashoatUnsubmitted
Not Done
Inline Actions

From the screenshot, this looks like too much text in a row. We could try separating out the third sentence into its own paragraph. We could also try showing the three sentences as three bullet points. @ted, any thoughts?

ashoat: From the screenshot, this looks like too much text in a row. We could try separating out the…
tomekAuthorUnsubmitted
Done
Inline Actions

In the original design, the last sentence was separated by an empty line. It probably makes sense to do the same here.

native-manage-newline.png (497×407 px, 38 KB)

tomek: In the original design, the last sentence was separated by an empty line. It probably makes…
your previous URL.
</Text> </Text>
</View> </View>
<Text style={styles.sectionTitle}>INVITE URL</Text> <Text style={styles.sectionTitle}>INVITE URL</Text>
<View style={styles.section}> <View style={styles.section}>
<View style={styles.inviteLink}> <View style={styles.inviteLink}>
<Text style={styles.inviteLinkPrefix}>{inviteLinkUrl('')}</Text> <Text style={styles.inviteLinkPrefix}>{inviteLinkUrl('')}</Text>
<TextInput <TextInput
style={styles.input} style={styles.input}
▲ Show 20 Lines • Show All 108 Lines • Show Last 20 Lines
View Options

services/terraform/self-host/main.tf

Show All 40 Linesfunction ManagePublicLinkScreen(props: Props): React.Node {
let errorComponent = null; let errorComponent = null;
if (error) { if (error) {
errorComponent = <Text style={styles.error}>{error}</Text>; errorComponent = <Text style={styles.error}>{error}</Text>;
} }
const onDisableButtonClick = React.useCallback(() => { const onDisableButtonClick = React.useCallback(() => {
Alert.alert( Alert.alert(
'Disable public link', 'Disable public link',
'Are you sure you want to disable your public link? Members who have your community’s public link but have not joined will not able to with the disabled link. \n' + 'Are you sure you want to disable your public link?\n' +
'\n' + '\n' +
'Other communities may also claim your previous public link url.', 'Other communities will be able to claim the same URL.',
[ [
{ {
text: 'Confirm disable', text: 'Confirm disable',
style: 'destructive', style: 'destructive',
onPress: disableInviteLink, onPress: disableInviteLink,
}, },
{ {
text: 'Cancel', text: 'Cancel',
Show All 18 Lines disablePublicLinkButton = (
</View> </View>
); );
} }
return ( return (
<View> <View>
<View style={styles.section}> <View style={styles.section}>
<Text style={styles.sectionText}> <Text style={styles.sectionText}>
Let your community be more accessible with your own unique public Invite links make it easy for your friends to join your community.
link. By enabling a public link, you are allowing anyone who has your Anybody who knows your community’s invite link will be able to join
link to join your community.{'\n\n'} it. Note that if you change your public link’s URL, other communities
Editing your community’s public link allows other communities to claim will be able to claim the old URL.
ashoatUnsubmitted
Not Done
Inline Actions

From the screenshot, this looks like too much text in a row. We could try separating out the third sentence into its own paragraph. We could also try showing the three sentences as three bullet points. @ted, any thoughts?

ashoat: From the screenshot, this looks like too much text in a row. We could try separating out the…
tomekAuthorUnsubmitted
Done
Inline Actions

In the original design, the last sentence was separated by an empty line. It probably makes sense to do the same here.

native-manage-newline.png (497×407 px, 38 KB)

tomek: In the original design, the last sentence was separated by an empty line. It probably makes…
your previous URL.
</Text> </Text>
</View> </View>
<Text style={styles.sectionTitle}>INVITE URL</Text> <Text style={styles.sectionTitle}>INVITE URL</Text>
<View style={styles.section}> <View style={styles.section}>
<View style={styles.inviteLink}> <View style={styles.inviteLink}>
<Text style={styles.inviteLinkPrefix}>{inviteLinkUrl('')}</Text> <Text style={styles.inviteLinkPrefix}>{inviteLinkUrl('')}</Text>
<TextInput <TextInput
style={styles.input} style={styles.input}
▲ Show 20 Lines • Show All 108 Lines • Show Last 20 Lines
View Options

services/terraform/self-host/providers.tf

Loading...
View Options

services/terraform/self-host/terraform.tfvars.example

Loading...
View Options

services/terraform/self-host/variables.tf

Loading...