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

Terraform and setup.sh #93

Merged
merged 45 commits into from
Jul 16, 2021
Merged

Terraform and setup.sh #93

merged 45 commits into from
Jul 16, 2021

Conversation

dinagraves
Copy link
Contributor

@dinagraves dinagraves commented Jul 3, 2021

  • Creates 3 projects: ops, stage, prod
  • Builds and deploys the website and content-api to Cloud Run in staging and prod
  • Beginnings of a CI/CD setup

Outstanding issues / questions:

  • The terraform files could maybe use better organization? Maybe move out all the permissions stuff into its own file?
  • The way I set up the CI/CD in our project was to have the stage and prod projects handle their own rollouts. By which I mean, the cloud build triggers that ramped up traffic lived in these projects. Now, I'm thinking it would be a lot easier from a setup perspective to have the ops project house all the CI/CD triggers. What do you think? Otherwise, the user will have to connect the same repo to 3 projects.
  • I wasn't sure where to put setup.sh

[Ignore the messy history of git commits. I should have started from a fresh branch.]

@grayside grayside added component: content-api Related to the Content API. component: delivery Related to automation, testing, deployment of the application. component: website Related to the application frontend. needs decision record This issue or change is significant and we should create a decision record. persona: maintainer [meta] Related to project maintenance. labels Jul 9, 2021
terraform/ops.tf Outdated Show resolved Hide resolved
terraform/ops.tf Outdated Show resolved Hide resolved
terraform/ops.tf Outdated Show resolved Hide resolved
terraform/ops.tf Outdated Show resolved Hide resolved
terraform/ops.tf Outdated Show resolved Hide resolved
terraform/prod.tf Outdated Show resolved Hide resolved
terraform/prod.tf Outdated Show resolved Hide resolved
terraform/stage.tf Outdated Show resolved Hide resolved
terraform/stage.tf Outdated Show resolved Hide resolved
terraform/variables.tf Outdated Show resolved Hide resolved
terraform/ops.tf Outdated Show resolved Hide resolved
terraform/ops.tf Show resolved Hide resolved
terraform/ops.tf Show resolved Hide resolved
terraform/ops.tf Show resolved Hide resolved
terraform/variables.tf Outdated Show resolved Hide resolved
terraform/ops.tf Outdated Show resolved Hide resolved
terraform/ops.tf Show resolved Hide resolved
terraform/ops.tf Show resolved Hide resolved
terraform/ops.tf Outdated Show resolved Hide resolved
Copy link
Collaborator

@grayside grayside left a comment

Choose a reason for hiding this comment

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

After further discussion, we've decided to proceed with landing this PR so we have something in place, with the intention of significantly overhauling it in coming weeks to cover more of our requirements. In particular, we want to support multi-environment OR single-project deployments.

@dinagraves dinagraves merged commit 8e92d8d into main Jul 16, 2021
@dinagraves dinagraves deleted the cicd branch July 16, 2021 22:58
engelke added a commit that referenced this pull request Jul 16, 2021
* Api cleanup (#92)

* Markdown API docs

* Refactored all resource methods to one package

* Restored accidentally deleted resources/base

* Partial separation of db access from methods

* DB separated from method handlers

* Added first test

* More tests

* API functionally complete per current spec

* Reformatted by black

* Delete ,

Inadvertent rename, later restored

* Address PR #92 comments

* Used existing helper method more often

* Respond to PR review

* Unit tests (#94)

* Unit tests

* Adding directory

* Using alpine image and installing pytest

* Using slim image instead

* Adding descriptive ID's for the steps

* productivity(terraform): correct terraform violations via PR suggestions (#98)

* productivity(terraform): correct terraform violations via PR suggestions (fixes #50)

* Switch to secrets.GITHUB_TOKEN

Co-authored-by: Dina Graves Portman <dinagraves@google.com>

Co-authored-by: Dina Graves Portman <dinagraves@google.com>

* Update decisions.md (#108)

New decision record

* Terraform and setup.sh (#93)

Initial terraform setup.

Co-authored-by: Dina Graves Portman <dinagraves@google.com>
Co-authored-by: Adam Ross <adamross@google.com>
engelke added a commit that referenced this pull request Jul 16, 2021
* OpenAPI spec and generated Python library

* More operations in spec

* Api cleanup (#92) (#101)

* Markdown API docs

* Refactored all resource methods to one package

* Restored accidentally deleted resources/base

* Partial separation of db access from methods

* DB separated from method handlers

* Added first test

* More tests

* API functionally complete per current spec

* Reformatted by black

* Delete ,

Inadvertent rename, later restored

* Address PR #92 comments

* Used existing helper method more often

* Respond to PR review

* OpenAPI complete, not finished

* Client library generated

* Update branch to match main (#113)

* Api cleanup (#92)

* Markdown API docs

* Refactored all resource methods to one package

* Restored accidentally deleted resources/base

* Partial separation of db access from methods

* DB separated from method handlers

* Added first test

* More tests

* API functionally complete per current spec

* Reformatted by black

* Delete ,

Inadvertent rename, later restored

* Address PR #92 comments

* Used existing helper method more often

* Respond to PR review

* Unit tests (#94)

* Unit tests

* Adding directory

* Using alpine image and installing pytest

* Using slim image instead

* Adding descriptive ID's for the steps

* productivity(terraform): correct terraform violations via PR suggestions (#98)

* productivity(terraform): correct terraform violations via PR suggestions (fixes #50)

* Switch to secrets.GITHUB_TOKEN

Co-authored-by: Dina Graves Portman <dinagraves@google.com>

Co-authored-by: Dina Graves Portman <dinagraves@google.com>

* Update decisions.md (#108)

New decision record

* Terraform and setup.sh (#93)

Initial terraform setup.

Co-authored-by: Dina Graves Portman <dinagraves@google.com>
Co-authored-by: Adam Ross <adamross@google.com>

Co-authored-by: Dina Graves Portman <dinagraves@google.com>
Co-authored-by: Adam Ross <adamross@google.com>
@grayside grayside added this to the v0.5.0 milestone Jul 19, 2021
@grayside
Copy link
Collaborator

Initial fix for #78

grayside pushed a commit that referenced this pull request Jul 22, 2021
Initial terraform setup.
grayside added a commit that referenced this pull request Jul 22, 2021
* OpenAPI spec and generated Python library

* More operations in spec

* Api cleanup (#92) (#101)

* Markdown API docs

* Refactored all resource methods to one package

* Restored accidentally deleted resources/base

* Partial separation of db access from methods

* DB separated from method handlers

* Added first test

* More tests

* API functionally complete per current spec

* Reformatted by black

* Delete ,

Inadvertent rename, later restored

* Address PR #92 comments

* Used existing helper method more often

* Respond to PR review

* OpenAPI complete, not finished

* Client library generated

* Update branch to match main (#113)

* Api cleanup (#92)

* Markdown API docs

* Refactored all resource methods to one package

* Restored accidentally deleted resources/base

* Partial separation of db access from methods

* DB separated from method handlers

* Added first test

* More tests

* API functionally complete per current spec

* Reformatted by black

* Delete ,

Inadvertent rename, later restored

* Address PR #92 comments

* Used existing helper method more often

* Respond to PR review

* Unit tests (#94)

* Unit tests

* Adding directory

* Using alpine image and installing pytest

* Using slim image instead

* Adding descriptive ID's for the steps

* productivity(terraform): correct terraform violations via PR suggestions (#98)

* productivity(terraform): correct terraform violations via PR suggestions (fixes #50)

* Switch to secrets.GITHUB_TOKEN

Co-authored-by: Dina Graves Portman <dinagraves@google.com>

Co-authored-by: Dina Graves Portman <dinagraves@google.com>

* Update decisions.md (#108)

New decision record

* Terraform and setup.sh (#93)

Initial terraform setup.

Co-authored-by: Dina Graves Portman <dinagraves@google.com>
Co-authored-by: Adam Ross <adamross@google.com>

Co-authored-by: Dina Graves Portman <dinagraves@google.com>
Co-authored-by: Adam Ross <adamross@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes This human has signed the Contributor License Agreement. component: content-api Related to the Content API. component: delivery Related to automation, testing, deployment of the application. component: website Related to the application frontend. needs decision record This issue or change is significant and we should create a decision record. persona: maintainer [meta] Related to project maintenance.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants