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.

Sign up for GitHub

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

Jump to bottom

Unchangable Pulumi workspace configuration #2237

Merged
merged 5 commits into from
Oct 22, 2024
Merged

Unchangable Pulumi workspace configuration #2237

merged 5 commits into from
Oct 22, 2024

Conversation

JimMadge
Copy link
Member

@JimMadge JimMadge commented Oct 16, 2024 •
edited
Loading

✅ Checklist

  • You have given your pull request a meaningful title (e.g. Enable foobar integration rather than 515 foobar).
  • You are targeting the appropriate branch. If you're not certain which one this is, it should be develop.
  • Your branch is up-to-date with the target branch (it probably was when you started, but it may have changed since then).

🚦 Depends on

#2241

⤴️ Summary

Protects against changing values which we have declared shouldn't be updated in the Pulumi workspace.

🌂 Related issues

closes #2199

🔬 Tests

❯ hatch run dsh sre deploy hojo
You are logged into the Azure CLI as:
        user: Jim Madge (…)
        tenant: turing.ac.uk (…)
Are these details correct? [y/n] (y): y
You are logged into the Microsoft Graph API as:
        user: [email protected]
(…)
        tenant: green.develop.turingsafehaven.ac.uk (…)
Are these details correct? [y/n] (y): y
SRE will be deployed to subscription 'Data Safe Haven Development 2'
('…')
SRE will be registered in SHM 'daimyo.develop.turingsafehaven.ac.uk'
SHM subscription '…'
Loaded stack shm-daimyo-sre-hojo.
Unchangeable configuration variable 'azure-native:subscriptionId' not consistent, your configuration: '…', Pulumi workspace: '…'.
Applying Pulumi configuration options failed..
Pulumi deployment failed.
Could not deploy Secure Research Environment 'hojo'.

@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 16, 2024 •
edited
Loading

Coverage report

Click to see where and how coverage changed

FileStatementsMissingCoverageCoverage
(new stmts)		Lines missing
  data_safe_haven/infrastructure
  project_manager.py
Project Total  

This report was generated by python-coverage-comment-action

@JimMadge JimMadge marked this pull request as ready for review October 17, 2024 12:51
@JimMadge JimMadge requested a review from a team as a code owner October 17, 2024 12:51
@JimMadge JimMadge changed the base branch from develop to release-v5.0.1rc1 October 18, 2024 13:34
@JimMadge JimMadge requested a review from a team as a code owner October 18, 2024 13:34
@jemrobinson jemrobinson changed the base branch from release-v5.0.1rc1 to develop October 22, 2024 10:01
@jemrobinson jemrobinson changed the base branch from develop to release-v5.0.1rc1 October 22, 2024 10:01
jemrobinson
jemrobinson approved these changes Oct 22, 2024
View reviewed changes
Copy link
Member

@jemrobinson jemrobinson left a comment

Choose a reason for hiding this comment

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

LGTM

@JimMadge JimMadge merged commit 2e837a9 into release-v5.0.1rc1 Oct 22, 2024
11 checks passed
@JimMadge JimMadge deleted the sub_id_change branch October 22, 2024 10:03
jemrobinson
jemrobinson reviewed Oct 22, 2024
View reviewed changes
data_safe_haven/infrastructure/project_manager.py
@@ -286,12 +286,29 @@ def destroy(self) -> None:
raise DataSafeHavenPulumiError(msg) from exc

def ensure_config(self, name: str, value: str, *, secret: bool) -> None:
Copy link
Member

Choose a reason for hiding this comment

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

Just wondering whether ensure is still the best verb for this. Can you think of a better one @JimMadge ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ensure is what I would choose, so I might not be the best person to ask 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jemrobinson jemrobinson jemrobinson approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Changing SRE subscription ID
2 participants
@JimMadge @jemrobinson