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

repos: add govuk-display-screen to repos yml #1537

Merged
merged 3 commits into from
Dec 2, 2024

Conversation

guilhem-fry
Copy link
Contributor

@guilhem-fry guilhem-fry commented Nov 27, 2024

Our team #govuk-insights-and-analytics-team now owns the govuk-display-screen repository.

In order to be able to push and merge PRs, and entry must be added to repos.yml in accordance with the developer docs.

Question

The goal is to give our github team @alphagov/gov-uk-data the permissions to perform push and merge on this repository.
Will these changes allow that? It's not clear to me how this yml file works.

Copy link
Contributor

@AgaDufrat AgaDufrat left a comment

Choose a reason for hiding this comment

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

I think we'll also need to import this repo to Terraform state so Terraform doesn't try to create it again. See an example: https://github.com/alphagov/govuk-infrastructure/pull/1466/files

Before merging please review the Terraform plan carefully for any unexpected changes.

terraform/deployments/github/repos.yml Show resolved Hide resolved
@guilhem-fry
Copy link
Contributor Author

I think we'll also need to import this repo to Terraform state so Terraform doesn't try to create it again. See an example: https://github.com/alphagov/govuk-infrastructure/pull/1466/files

Before merging please review the Terraform plan carefully for any unexpected changes.

Gotcha, the latest commit imports the repo into the TF state.

@guilhem-fry
Copy link
Contributor Author

guilhem-fry commented Nov 27, 2024

Unfortunately I am not able to run terraform plan as I don't have HCP credentials to perform the tf init.
Our team doesn't use the usual TF / AWS tech stack.
however I do have access to govuk AWS with MFA, if that helps

@AgaDufrat
Copy link
Contributor

@samsimpson1 can you please have another look with your SRE eyes (given a recent TF hiccup 😬)? The changes to aws_codecommit_repositorys seem strange but correct (making main a default branch). It's also adding govuk_web_banners.

Unfortunately I am not able to run terraform plan as I don't have HCP credentials to perform the tf init.
Our team doesn't use the usual TF / AWS tech stack.
however I do have access to govuk AWS with MFA, if that helps

@guilhem-fry The plan also runs in TF Cloud (not sure if you have access to that): https://app.terraform.io/app/govuk/workspaces/GitHub/runs/run-B7DVJNexv3MDGxZJ
I asked Sam (our terraform expert) to have a look as well.

Copy link
Member

@samsimpson1 samsimpson1 left a comment

Choose a reason for hiding this comment

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

Looks good, FYI you might run into an issue if branch protection is already enabled. If so, just delete the rule in the github UI and re-run the terraform.

@guilhem-fry
Copy link
Contributor Author

Thanks @AgaDufrat @samsimpson1
I don't have access to TF Cloud. What's the next step?

@guilhem-fry
Copy link
Contributor Author

Thanks @AgaDufrat @samsimpson1 I don't have access to TF Cloud. What's the next step?

Hey @AgaDufrat @samsimpson1 am I supposed to run the TF apply? Unfortunately I don't have access. If someone else who already has access could run it that'd be ideal 👍

@AgaDufrat AgaDufrat merged commit a936ef8 into main Dec 2, 2024
2 checks passed
@AgaDufrat AgaDufrat deleted the repos/add-govuk-display-screen-to-repos-yml branch December 2, 2024 10:04
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.

3 participants