Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AWS for all sources in single example #293

Merged
merged 21 commits into from
Mar 22, 2023
Merged

Conversation

eschultink
Copy link
Member

@eschultink eschultink commented Mar 17, 2023

Features

  • AWS example that includes ALL sources, just to reduce friction of having customers choose between 2 (and reduce maintaining 2 variants of very similar things)

Change implications

  • dependencies added/changed? no

@eschultink eschultink changed the base branch from rc-v0.4.14 to rc-v0.4.15 March 17, 2023 22:27
@eschultink eschultink marked this pull request as ready for review March 22, 2023 17:16
@eschultink eschultink requested review from aperez-worklytics and jlorper and removed request for aperez-worklytics March 22, 2023 17:16
Copy link
Member

@jlorper jlorper left a comment

Choose a reason for hiding this comment

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

OK, some suggestions. Found the init-tfvars.sh script a bit hard to follow, probably easier to manage in JSON format.

@@ -0,0 +1,23 @@
#!/bin/bash
Copy link
Member

Choose a reason for hiding this comment

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

this file seen 3 times so far. Could be a symlink, but for what I've read quickly needs git config core.symlinks=true to work well, and not supported in Windows I believe. Maybe worth to play with to reduce duplication

version = "~> 4.12"
}

# for the API connections to Google Workspace
Copy link
Member

Choose a reason for hiding this comment

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

missing azure provider?

@@ -0,0 +1 @@
../../../tools/az-auth.sh
Copy link
Member

Choose a reason for hiding this comment

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

is this a symlink??? looks like, the icon is different. Then use it in build too

Comment on lines 39 to 41
locals {
msft_365_enabled = length(module.worklytics_connector_specs.enabled_msft_365_connectors) > 0
}
Copy link
Member

Choose a reason for hiding this comment

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

move this local to the MSFT section where it is used

@@ -0,0 +1,82 @@
#!/bin/bash

# fills a terraform vars file with values that are required for the Terraform configuration to work
Copy link
Member

Choose a reason for hiding this comment

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

idea:
https://developer.hashicorp.com/terraform/language/values/variables#variable-definitions-tfvars-files

maybe use a node script that outputs the terraform vars in json
probably simpler to manage and don't really need to parse the terraform state/providers.

so it can read the enabled_connectors variable and generate the missing values if non-existent
so adding a new connector will just be enabling it and run this on top, it may complement existing config

@@ -0,0 +1,553 @@
terraform {
Copy link
Member

Choose a reason for hiding this comment

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

I understand that this should be the only main.tf to exist for aws from now on

Copy link
Member

Choose a reason for hiding this comment

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

aren't these folders - aws-google-workspace, aws-msft-365 deprecated?? now everything should be just aws, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah, but people who set-up using current modular-examples will still main.tfs that are equivalent to these. so I prefer not to fully drop them at this point (we can't drop the modular-example versions, and I like have dev examples that use those)

@eschultink eschultink merged commit 674bb3c into rc-v0.4.15 Mar 22, 2023
@eschultink eschultink deleted the s144-aws-for-all branch March 22, 2023 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants